Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-21 19:29:18 +00:00
Code Issues Projects Releases Wiki Activity
12,302 Commits 1 Branch 17 Tags 75 MiB
3a53d96526
Commit Graph

1327 Commits

Author SHA1 Message Date
alexstanoev
3a53d96526 Validate MQTT broker IP and escape quotes when displaying 
This commit implements address validation for the broker address in the MQTT configuration page of the CC26XX web demo example. Additionally, the Type ID, Org ID, Auth Token, Command Type and Event Type ID fields have quotes escaped (" -> ") to prevent XSS/broken page issues when displaying user-sourced input in HTML input fields.
 2017-06-03 00:04:01 +01:00
George Oikonomou
c558e1a559 Revert "Validate MQTT broker IP and escape quotes when displaying" 2017-06-02 23:02:54 +01:00
George Oikonomou
3800cb18a9 Merge pull request #2216 from herjulf/CCA 
Atmel radio; Support for RADIO_PARAM_CCA_THRESHOLD plus rf_environment example
 2017-06-02 22:40:27 +01:00
alexstanoev
6b78ee9a4e MQTT: Validate broker IP and escape quotes when displaying 
This commit implements address validation for the broker address in the
MQTT configuration page. Additionally, the Type ID, Org ID, Auth Token,
Command Type and Event Type ID fields have quotes escaped (" -> ")
to prevent XSS issues when displaying user-sourced input.
 2017-06-02 15:13:58 +01:00
Robert Olsson
b4ef18b2fa Keep cca scan function separated 
modified:   examples/rf_environment/rf_environment.c
 2017-05-23 21:07:59 +02:00
Robert Olsson
18cfaf7fa2 Reformat of table text for README 
modified:   examples/rf_environment/README.md
 2017-05-19 09:28:46 +02:00
Robert Olsson
ef9b00103e Optimizing channel table size for CCA in rf_environment example 
modified:   examples/rf_environment/rf_environment.c
 2017-05-11 14:20:12 +02:00
Robert Olsson
71167f0ba6 Retrigger PR after Doxigen fix 2017-05-09 15:26:14 +02:00
Robert Olsson
4040005056 Retrigger regression test 
modified:   examples/rf_environment/README.md
 2017-05-08 14:25:59 +02:00
Robert Olsson
91928592d0 Updated README for rf_environment example 2017-05-08 13:11:22 +02:00
Robert Olsson
22975df423 examples/rf_environment for rf CCA (non-intrusive) monitoring added 2017-05-05 12:57:18 +02:00
George Oikonomou
7b193ee014 Merge pull request #1932 from g-oikonomou/contrib/cc1350/lp-and-st 
Add support for the CC1350 LP and Sensortag
 2017-04-24 15:34:22 +01:00
Nicolas Tsiftes
391a84726f Merge pull request #2148 from niziak/master 
native-border-router: fix for disappearing timer 'uip_ds6_timer_perio…
 2017-04-18 15:19:57 +02:00
George Oikonomou
e823ead4b0 Tidy up web demo ADC code style 2017-04-02 13:44:02 +01:00
George Oikonomou
474dc33e12 Wrap web demo ADC functionality inside #if blocks 2017-04-02 13:43:21 +01:00
chenek
22b262ce73 Add ADC example to cc26xx-web-demo 2017-04-02 13:43:12 +01:00
George Oikonomou
e4da7c66e0 Merge pull request #2165 from alexandruioanp/check-ipv6addrconv-mqtt 
Check broker IP conversion. Adjust state machine accordingly
 2017-04-02 00:33:43 +01:00
George Oikonomou
6eac73103d Merge pull request #2164 from alexstanoev/web-demo-crash-fix 
Zero out httpd_state before deallocating
 2017-04-02 00:32:53 +01:00
Robert Olsson
417f32c65d Adding sensniff support for Atmel via avr-rss2 platform 2017-03-31 20:00:20 +02:00
Alexandru-Ioan Pop
f15b86158b Check broker IP conversion. Adjust state machine accordingly 
The result of converting the IP address of the broker wasn't checked. As a result, the pointer was left uninitialised and the IPv6 address used for connecting was some random data. The function now returns an error. Before connect_to_broker is called, mqtt_register is executed, which memsets conn to 0, making its state 0 (MQTT_CONN_STATE_ERROR). In order to recover from this error state, the extra check was added in the MQTT_CLIENT_STATE_NEWCONFIG state.

This was discovered using [CodeSonar](https://www.grammatech.com/products/codesonar)
 2017-03-31 17:33:29 +01:00
alexstanoev
a30364189a Zero out httpd_state before deallocating 
When a connection is aborted by the HTTP server while it's still being processed it is possible to hit a null pointer dereference issue by jumping back to a protothread (outputpt) after its httpd_state has been freed. This can be triggered by sending a POST to any form in the CC26xx web demo server using Firefox.
This patch prevents that by zeroing out httpd_state structs before freeing them, thus also clearing the httpd_state->outputpt field.
Tested using Firefox 55.0a1 on a CC2650 LaunchPad.
 2017-03-31 16:44:11 +01:00
Wojciech Nizinski
5a0d085451 native-border-router: fix for disappearing timer 'uip_ds6_timer_periodic' 
When UIP_ND6_SEND_NS is enabled, I've noticed that unreachable
neighbours still remains in REACHABLE state even if lifetime
(nbr->reachable) expired.

During network init 'tcpip_process' is scheduling
'uip_ds6_timer_periodic' is to tick every 100ms and make necessary
expirations.

When MAC addres is received from slip-radio (from 'etimer_process'
context), network is "reinitialized" and timer 'uip_ds6_timer_periodic'
is set again with wrong process.
 2017-03-21 13:13:10 +01:00
Nicolas Tsiftes
5eb2ac15ff Merge pull request #2073 from cetic/pr-fix-send-na 
Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS
 2017-01-20 13:18:43 +01:00
Yasuyuki Tanaka
2d44b47050 Print an entry for the root node as well as other entries 2017-01-19 14:36:59 +01:00
Laurent Deru
12c930893c Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
George Oikonomou
82fd325b7a Merge pull request #2069 from alignan/pull/light-example-verbatim 
Explicitly specify light sensor model in example
 2017-01-15 11:52:09 +00:00
Antonio Lignan
999b246fd2 Explicitly specify light sensor model in example 2017-01-14 22:57:08 +01:00
Michael Karlsson
22d10ba03a Added Cooja target config to rime-tsch example 2017-01-11 16:35:16 +01:00
Yasuyuki Tanaka
667dd6a210 TSCH: put tsch_ prefix to definitions in the global scope 
struct asn_t         -> struct tsch_asn_t
  struct asn_divisor_t -> tsch_asn_divisor_t
  ASN_ macros          -> TSCH_ASN_ macros
  current_asn          -> tsch_current_asn
 2017-01-10 11:45:59 +01:00
George Oikonomou
960b81d484 Merge pull request #2024 from alignan/pull/eth-gw 
Zolertia Orion ethernet router with active POE support
 2017-01-09 21:03:45 +00:00
Thanos Tsakiris
92ad29ab33 Minor typo change 2016-12-30 13:13:53 +02:00
Antonio Lignan
579620ce0e Added Zolertia Orion ethernet router with active POE support 2016-12-29 13:07:53 +01:00
Antonio Lignan
2464cdadc9 Merge pull request #1973 from g-oikonomou/contrib/sensniff-submodule 
Add sensniff as a submodule
 2016-12-25 19:42:18 +01:00
Yasuyuki Tanaka
8b3f29325d Update example-collect.c 
- bugfix: more frequent transmissions than expected (every 30 seconds)
- indentation: replace tabs with spaces
 2016-12-14 12:38:55 +01:00
George Oikonomou
a6b14a0731 Add documentation for the new boards 2016-12-11 20:44:26 +00:00
Antonio Lignan
ac2a31455e Merge pull request #1957 from alignan/pull/bme280-sensor 
sensors: bme280 weather sensor
 2016-12-10 18:37:21 +01:00
Antonio Lignan
bd3f8fa3c5 Merge pull request #1939 from bthebaudeau/re-mote-sd-fat 
Add global SD/MMC and FAT support, with RE-Mote as an example
 2016-12-10 18:32:39 +01:00
Nicolas Tsiftes
f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote 
Miscellaneous updates for tsch-cooja-mote
 2016-12-05 18:40:28 +01:00
Antonio Lignan
95f69d92a8 Merge pull request #1918 from adamdunkels/pr-websocket-2 
Contiki websocket client
 2016-12-05 06:46:43 +01:00
George Oikonomou
bad3384365 Update sensniff example documentation 2016-12-04 19:07:40 +00:00
George Oikonomou
aaf0d1eb86 Automatically specify a correct baudrate for jn516x 2016-12-04 19:07:40 +00:00
George Oikonomou
7ef5902c3d Add the sniff make target 
We can now run make sniff and this will provide correct command line arguments for all supported devices.
 2016-12-04 18:51:57 +00:00
George Oikonomou
44edc187bc Specify default baudrate for CC2538DK 2016-12-04 18:43:41 +00:00
Mohamed seliem
452666b43e add missing include 2016-12-04 03:29:49 +02:00
Mohamed Seliem
82b5fb5073 Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00) 2016-12-04 03:29:49 +02:00
Antonio Lignan
94854177e2 Merge pull request #1961 from jdede/uart-init 
Do not initialize and use the wrong UART (z1)
 2016-12-02 15:41:32 +01:00
Jens Dede
0d3ff7b785 Rm unnecessary uart commands 2016-12-01 15:12:23 +01:00
Pablo Corbalán
983d858570 Remove definitions of outdated RPL_CONF_OF 2016-12-01 13:13:41 +01:00
Antonio Lignan
5e7acd4dc2 Merge pull request #1643 from akshaypm/zoul-uart-example 
Zoul UART example
 2016-12-01 11:42:44 +01:00
akshaypm
cd75e50c28 cc2538 uart example 2016-12-01 12:45:10 +05:30