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,288 Commits 1 Branch 17 Tags 75 MiB
007f9c9798
Commit Graph

12288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Duquennoy
ed47d47155 Merge pull request #2217 from g-oikonomou/doxy 
Fix Doxygen PPA location
 2017-06-01 14:22:08 +02:00
George Oikonomou
9ed56b1485 Fix Doxygen PPA location 2017-05-09 09:11:20 +01: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
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
George Oikonomou
55f3a92211 Merge pull request #2168 from tarakanov/sensortag-spi 
Correct SPI pins
 2017-04-02 13:26:30 +01:00
Robert Olsson
aed5457332 Correct names for Atmel previous radio fixes plus static declarations. 2017-04-02 11:32:52 +02:00
tarakanov
f564e6bb5f Correct SPI pins 2017-04-02 13:14:09 +05: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
George Oikonomou
12f17211e6 Merge pull request #2167 from posjodin/sensniff-new 
Adding sensniff support for Atmel via avr-rss2 platform
 2017-04-02 00:29:09 +01:00
Robert Olsson
417f32c65d Adding sensniff support for Atmel via avr-rss2 platform 2017-03-31 20:00:20 +02:00
Robert Olsson
093550ecbf Update for Atmel radio part II 
modified:   cpu/avr/radio/rf230bb/halbb.c
	modified:   cpu/avr/radio/rf230bb/rf230bb.c
 2017-03-31 18:38:27 +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
George Oikonomou
4425a67433 Merge pull request #2162 from posjodin/PR4 
Updates for  Atmel radio
 2017-03-31 12:24:55 +01:00
Nicolas Tsiftes
69c2e7e2b6 Merge pull request #2159 from posjodin/PR3 
avr-rss2 platform fixes
 2017-03-30 16:30:46 +02:00
Robert Olsson
399150b142 Minor spell fix in ANNOUNCE_BOOT 
modified:   platform/avr-rss2/contiki-main.c
 2017-03-30 15:24:19 +02:00
Nicolas Tsiftes
9d003fe52f Merge pull request #2155 from iot-lab/pr/er-coap/stylecleanup 
er-coap: Fix style and add missing `addr` argument
 2017-03-30 14:14:03 +02:00
Robert Olsson
d6128852b2 Added missing register definitions in at86rf230_registermap.h 
modified:   cpu/avr/radio/rf230bb/at86rf230_registermap.h
 2017-03-29 11:32:39 +02:00
Robert Olsson
55daec98dc Added missing registers in 
modified:   cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
 2017-03-28 22:16:50 +02:00
Robert Olsson
94defe6ba2 Updates for Atmel RF233 radio in AtMega256rfr2 including register 
update for MAC symbol counter. Basic functions for get/set-value
parameter setting added. SPI radios needs to be tested.

	modified:   cpu/avr/radio/rf230bb/atmega256rfr2_registermap.h
	modified:   cpu/avr/radio/rf230bb/rf230bb.c
 2017-03-28 18:53:56 +02:00