Marco Casaroli
19e08de0e2
use memchr instead of strchr for checking if host is ipv6
2016-06-03 12:12:24 -03:00
Marco Casaroli
e657ca40e9
return error if host does not fit in host string
2016-06-03 12:11:51 -03:00
Marco Casaroli
cade3c7699
Merge branch 'master' of https://github.com/contiki-os/contiki into fixes
2016-06-03 11:49:04 -03:00
Simon Duquennoy
d008bf8a76
Fix rpl_select_parent in the non-probing case
2016-06-03 16:44:14 +02:00
Simon Duquennoy
43b01b3236
RPL: if the best parent is not fresh, use the best fresh instead and utilize urgent probing to update link estimates
2016-06-03 16:44:14 +02:00
Simon Duquennoy
b42b12d7c8
Adsjut dao_ack_callback to new OFs
2016-06-03 16:44:13 +02:00
Simon Duquennoy
bddf8207ed
Link-stats: use new nbr table API
2016-06-03 16:44:12 +02:00
Simon Duquennoy
f18a4fdd7b
Adjust RPL neighbor policy to new OF interface
2016-06-03 16:44:12 +02:00
Simon Duquennoy
75967438e3
RPL ext header: check if sender is closer only after updating its rank
2016-06-03 16:44:11 +02:00
Simon Duquennoy
36dd282eb7
RPL: reset Trickle timer on incoming DIOs with INFINITE_RANK only if the DIO is from the preferred parent
2016-06-03 16:44:10 +02:00
Simon Duquennoy
65b854fcee
RPL: trigger a local repair only the first time no parent is found in a DODAG
2016-06-03 16:44:09 +02:00
Simon Duquennoy
b176991a06
Compile out code related to RPL probing when probing is disabled
2016-06-03 16:44:09 +02:00
Simon Duquennoy
6349019384
Fine tuning of link stats and RPL OFs
2016-06-03 16:44:08 +02:00
Simon Duquennoy
0d7e1e8be4
Fix PRINTF statement in rpl-timers.c
2016-06-03 16:44:07 +02:00
Simon Duquennoy
62de6548ca
Regression test 06-rpl-temporary-root-loss: give extra time for recovery, as the previous settings led to occasional stochastic failures
2016-06-03 16:44:07 +02:00
Simon Duquennoy
64679642f2
Saving ROM and RAM
2016-06-03 16:44:06 +02:00
Simon Duquennoy
7855ba20ba
RPL: Check acceptable_rank even after first obtaining a parent. Added comment on a slight departure from RFC6550.
2016-06-03 16:44:05 +02:00
Simon Duquennoy
d53a3a3df2
RPL: logging fixes
2016-06-03 16:43:58 +02:00
Simon Duquennoy
cd76b4b1c2
RPL: support for run-time selection of the OF. RPL_OF_OCP defines the OF to be advertised at the root, while RPL_SUPPORTED_OFS defines the set of supported OFs
2016-06-03 15:46:08 +02:00
Simon Duquennoy
c5cf8608e9
RPL probing: now using link-stats to first prioritize probing of non-fresh parents, and to support urgent probing (fast probing of a potential new preferred parent
2016-06-03 15:46:07 +02:00
Simon Duquennoy
426e10c3ed
Rehauling of RPL OFs, both MRHOF and OF0. Fixed compliance with RFC6551, 6552, 6719. Now using the link-stats module.
2016-06-03 15:46:06 +02:00
Simon Duquennoy
752fef9e42
Added link-stats and nbr-table to avr-ravenusb makefile
2016-06-03 15:46:05 +02:00
Simon Duquennoy
2fa239ee8d
Added link-stats module to keep strack of link statistics and their freshness
2016-06-03 15:46:04 +02:00
Simon Duquennoy
4e9b027141
rpl.h: updated constants and comments to match the standard
2016-06-03 15:46:03 +02:00
Oliver Schmidt
0151a7c27e
Merge pull request #1706 from oliverschmidt/master
...
Make use of new cl65 option --print-target-path.
2016-06-03 15:13:08 +02:00
Nicolas Tsiftes
71dcbe0533
Merge pull request #1654 from gebart/pr/lwm2m-json-writer
...
oma-lwm2m: Add JSON writer
2016-06-03 14:53:27 +02:00
Simon Duquennoy
b3ea124958
Merge pull request #1394 from joakimeriksson/nbrtable-nd6-fix
...
Removed memcpy that cause inconsistency in nbr-table when adding nd6 neighbors.
2016-06-03 14:44:54 +02:00
Simon Duquennoy
43c7b43adf
Merge pull request #1679 from tidyjiang8/bug_chameleon_raw_hdrsize
...
fix the bug about chameleon raw hdrsize
2016-06-03 14:40:12 +02:00
Simon Duquennoy
84b51461e9
Merge pull request #1597 from rgrr/remove_static_from_process_c
...
Removed some unnecessary statics in do_event() and process_post().
2016-06-03 14:16:14 +02:00
Simon Duquennoy
1afaae3fd7
nrf52dk: enable 32bit rtimer
2016-06-03 14:14:28 +02:00
Oliver Schmidt
ae0c5f0dd0
Make use of new cl65 option --print-target-path.
...
The new cl65 option --print-target-path allows to get rid of CC65_HOME altogether.
2016-06-03 13:30:25 +02:00
Simon Duquennoy
dca929cd07
Platform nrf52dk: use RTIMER_CLOCK_DIFF instead of RTIMER_CLOCK_LT
2016-06-03 13:26:08 +02:00
Simon Duquennoy
5097842cba
Merge pull request #1688 from tsparber/fix-rssi-scanner
...
Fixed rssi-scanner example
2016-06-03 10:12:02 +02:00
Simon Duquennoy
f5f6d54d59
Merge pull request #1698 from bthebaudeau/fix-21-large-rpl-timeout
...
21-large-rpl: Avoid frequent timeout in Travis CI
2016-06-03 10:10:58 +02:00
Simon Duquennoy
3c9593f3ab
Merge pull request #1692 from pablocorbalan/unicast-sent-cb
...
RIME: Extend unicast example to include a sent callback.
2016-06-03 10:10:36 +02:00
Benoît Thébaudeau
77f93c3b5a
21-large-rpl: Avoid frequent timeout in Travis CI
...
With a timeout set to 40 min, this test often failed at about 95% of the
script, causing many spurious pull request test failures. Increase the
timeout to 50 min.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2016-06-02 22:56:59 +02:00
Simon Duquennoy
26bf33c762
Merge pull request #1550 from thomas-ha/tsch-cc2538-port
...
Port of TSCH for CC2538
2016-06-02 21:33:55 +02:00
Antonio Lignan
b60c22e84a
Merge pull request #1701 from alignan/pull/fix-temp-nordic-ppa
...
Fix broken nrf52dk Travis build
2016-06-02 12:02:50 +02:00
Antonio Lignan
7dd2f1144b
Disabled rtimer redefinition, removed outdated address print and timer-test from regression tests
2016-06-02 10:50:22 +02:00
Antonio Lignan
8cd075f3e5
Moved regression test to new placeholder
2016-06-02 10:02:32 +02:00
Antonio Lignan
688f4aefe0
Updates ARM toolchain to latest launchpad embedded version
2016-06-02 09:32:24 +02:00
Antonio Lignan
34af72c047
Merge pull request #1609 from simonduq/pr/net-debug
...
Added net-debug.[ch] to provide debug functions even in the non-IP case
2016-06-01 23:52:34 +02:00
Antonio Lignan
6fc4e2535c
Merge pull request #1665 from g-oikonomou/contrib/cc26xx-bsl
...
Consolidate .upload for all CC26xx/CC13xx boards and add login make target
2016-06-01 23:37:29 +02:00
Antonio Lignan
c742d07803
Merge pull request #1695 from alignan/pull/fix-remote-pinout
...
Fixed CC2538/PIC labels being swapped
2016-06-01 23:34:42 +02:00
Antonio Lignan
acf13a4e0d
Merge pull request #1606 from OpenMote/master
...
Adapted OpenMote-CC2538 sensor drivers to Contiki sensor API.
2016-06-01 23:15:27 +02:00
Antonio Lignan
9e1c378919
Merge pull request #1469 from wbober/nrf52dk-pr
...
Add support for nRF52 DK platform
2016-06-01 23:11:39 +02:00
Antonio Lignan
f065971efc
Merge pull request #1619 from simonduq/pr/tsch-rtimer16-fix
...
Fix bug in TSCH for platforms with 16-bit rtimer
2016-06-01 23:03:50 +02:00
Antonio Lignan
4334990e16
Merge pull request #1686 from bthebaudeau/unified-cfs-coffee-examples
...
Unified CFS/Coffee examples
2016-06-01 22:00:13 +02:00
thomas-ha
8a7b1f07d1
add cc2538dk
2016-06-01 17:58:57 +02:00
thomas-ha
e537a2ea92
Add CC2538DK
2016-06-01 16:01:58 +02:00