deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
13020 commits 6 branches 13 tags 80 MiB
Commit graph

13020 commits

This branch
This branch
All branches
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 6e3387c830 Merge pull request #2244 from contiki-os/revert-2213-mqtt-html-sanitize 
Revert "Validate MQTT broker IP and escape quotes when displaying"
 2017-06-03 00:00:22 +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
George Oikonomou 007f9c9798 Merge pull request #2213 from alexstanoev/mqtt-html-sanitize 
Validate MQTT broker IP and escape quotes when displaying
 2017-06-02 22:37:53 +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 bb5d5546ce Atmel radio bug fix when setting tx-power. Spotted by Voravit Tanyingyong 2017-06-02 08:42:43 +02:00
Robert Olsson bb90d50ba1 RADIO_PARAM_POWER_MODE for Atmel radio 
modified:   cpu/avr/radio/rf230bb/rf230bb.c
	modified:   cpu/avr/radio/rf230bb/rf230bb.h
 2017-06-01 17:30:30 +02:00
Simon Duquennoy ed47d47155 Merge pull request #2217 from g-oikonomou/doxy 
Fix Doxygen PPA location
 2017-06-01 14:22:08 +02: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
George Oikonomou 9ed56b1485 Fix Doxygen PPA location 2017-05-09 09:11:20 +01: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
Robert Olsson c2560498b6 Atmel radio; Support for RADIO_PARAM_CCA_THRESHOLD added 2017-05-05 12:55:03 +02:00
Harald Pichler 5e15ec6488 bugfix store value to d_temp_s and enable debug prints as degfault 2017-05-04 16:29:55 +02:00
George Oikonomou 3c150a5e99 Merge pull request #2150 from posjodin/PR2 
Several changes to fix and harden mqtt code.
 2017-04-24 16:04:56 +01:00
George Oikonomou 3cc5505b69 Merge pull request #1787 from g-oikonomou/contrib/cc26xx/improve-cca-monitoring 
Use `ccaInfo.ccaState` to decide whether CCA is complete
 2017-04-24 16:02:47 +01: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
George Oikonomou 6a36a398bd Merge pull request #1931 from g-oikonomou/contrib/cc26xx-cc13xx/update-rf-api 
Use TI-Provided CC13xx/CC26xx RF API
 2017-04-24 15:33:14 +01:00
Robert Olsson e9aed001bc Example project for Atmel radio AES128 cryto engine 2017-04-24 14:40:33 +02:00
Robert Olsson 58517dfcbd AES128 HW crypto engine support for Atmel radios 
modified:   cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
modified:   cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
modified:   cpu/avr/radio/rf230bb/rf230bb.c
modified:   cpu/avr/radio/rf230bb/rf230bb.h
 2017-04-24 14:34:01 +02:00
Nicolas Tsiftes ddf723f88d Merge pull request #2180 from atiselsts/bugfix/coap-observe-option 
Keep CoAP 'observe' option length <= 3 bytes
 2017-04-21 17:59:40 +02:00
Nicolas Tsiftes 66fe7abf79 Merge pull request #2188 from tonnenpinguin/pr/uninitialized_variables 
Fix several uninitialized variables
 2017-04-21 17:59:12 +02:00
Bernhard Hackl 848f801460 Fix several uninitialized variables 2017-04-19 01:55:27 -07:00
Nicolas Tsiftes 38b82aeeeb Merge pull request #2189 from tonnenpinguin/pr/unterminated_strings 
Fix potentially unterminated strings
 2017-04-18 16:39:34 +02:00
Nicolas Tsiftes 52c709bdb7 Merge pull request #2101 from yatch/pr/bugfix-rpl-icmp6 
RPL: fix a bug accessing an uninitialized pointer
 2017-04-18 16:09:06 +02: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
Bernhard Hackl ae91d6b4b1 Fix potentially unterminated strings 2017-04-14 08:33:40 -07:00
Peter Sjödin a08adccfd5 Untabify mqtt.c 2017-04-11 17:19:43 +02:00
Peter 1fa9dde049 Merge remote-tracking branch 'contiki/master' into PR2 2017-04-11 17:00:38 +02:00
Oliver Schmidt 078359127b Merge pull request #2182 from oliverschmidt/master 
Adjusted cc65 compiler options to recent cc65 option handling change.
 2017-04-10 11:46:08 +02:00
Oliver Schmidt fa618ad86c Adjusted cc65 compiler options to recent cc65 option handling change. 2017-04-10 11:09:28 +02:00
Atis Elsts f83f035855 Keep CoAP 'observe' option length <= 3 bytes 2017-04-08 15:02:52 +01:00
George Oikonomou d0ddb7221e Merge pull request #2176 from atiselsts/bugfix/hdc_sensor 
Fix HDC sensor reading conversion
 2017-04-08 00:11:05 +01:00
Nicolas Tsiftes 0b85b76778 Merge pull request #2173 from simonduq/pr/tsch-readme 
Updating TSCH readme file
 2017-04-06 16:06:29 +02:00
Atis Elsts f6a2c4ea3f Fix HDC sensor reading conversion 2017-04-05 12:23:26 +01:00
Simon Duquennoy a330f59b8e TSCH readme: update with 802.15.4-2015 and 6TiSCH 2017-04-04 14:15:48 +02:00
Simon Duquennoy 51205eb809 TSCH readme: link to reference paper on implem and eval 2017-04-04 14:12:35 +02:00
George Oikonomou fbffcc2dfc Merge pull request #2109 from chenek/cc26xx-web-demo-adc-demo 
add ADC example to cc26xx-web-demo
 2017-04-03 12:21:03 +01:00
Yasuyuki Tanaka faeb71de00 RPL: fix a bug accessing an uninitialized pointer 
This bug is uncovered when RPL_WITH_MULTICAST is enabled.
 2017-04-03 17:54:25 +09:00
Yasuyuki Tanaka 3559402781 RPL: add regression test for multicast 
This test aims to reproduce the issue #2031:

  https://github.com/contiki-os/contiki/issues/2031

Test nodes are built from the code under example/ipv6/multicast with
WITH_SMRF=1 and WITH_DAO_ACK=1.

If the simulation runs through for one hour, the test is regarded as
success. Otherwise, when it crashes, the test fails.
 2017-04-03 17:54:18 +09:00
Yasuyuki Tanaka b7b23b712f RPL: fix indentation (rpl-icmp6.c) 2017-04-03 17:52:58 +09:00
George Oikonomou e9ee15efde Merge pull request #2166 from posjodin/TSCH-N1 
Updates for Atmel radio part II
 2017-04-02 21:31:59 +01: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