Adam Dunkels
19c7ae0dcd
Avoid compiler warning about unused variable
2014-12-02 17:11:15 +01:00
Adam Dunkels
769a2f832e
Fix for CERT VU#210620: randomize DNS request IDs for every request
2014-12-02 17:10:50 +01:00
Simon Duquennoy
bd4233a953
Cleanup packetbuf: use rime attributes and addresses only when rime is enabled. Saves 32 byte per queuebuf in the non-rime case.
2014-12-02 16:54:58 +01:00
Nicolas Tsiftes
397b15f6db
Merge pull request #864 from simonduq/cleanup-network-config
...
Cleanup network config
2014-12-02 16:40:14 +01:00
Adam Dunkels
ad744c6218
Randomize source ports for all outgoing connections. Fix for CERT VU#210620.
2014-12-02 16:08:56 +01:00
Nicolas Tsiftes
3c7268c979
Merge pull request #859 from simonduq/move-packetqueue
...
Moved packetqueue to core/net/rime, as it is only used by the Rime colle...
2014-12-02 13:17:58 +01:00
Simon Duquennoy
415506c3f6
Doxygen fixes
2014-12-02 12:39:16 +01:00
Simon Duquennoy
c2ca3e9fdb
Cleanup UIP_CONF_IPV6_RPL configuration
2014-12-02 12:38:55 +01:00
Simon Duquennoy
6891bcdd20
Remove unneeded module inclusion from avr and seedeye platforms
2014-12-01 21:06:01 +01:00
Simon Duquennoy
0d9815e08b
WITH_UIP6 -> NETSTACK_CONF_WITH_IPV6
2014-12-01 21:04:54 +01:00
Simon Duquennoy
74f6ae3751
slip-radio: remove unneeded definition of NETSTACK_CONF_WITH_RPL (now set from makefile with CONTIKI_WITH_RPL)
2014-12-01 21:04:25 +01:00
Simon Duquennoy
a9cc909794
Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*
2014-12-01 21:02:57 +01:00
Simon Duquennoy
229c53a2e6
Cooja platform: do not include the rime module by default
2014-12-01 20:13:10 +01:00
Simon Duquennoy
e6d758e6f5
Remove now unneeded UIP_CONF_IPV6 guards in net/ipv6 and net/rpl code
2014-12-01 20:13:09 +01:00
Simon Duquennoy
e85f41ffa0
Get IPv6 to fit in micaz platform again
2014-12-01 20:13:09 +01:00
Simon Duquennoy
722b3258d1
Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack.
2014-12-01 20:13:09 +01:00
Nicolas Tsiftes
d3d33c5699
Merge pull request #836 from lebrush/nbr-ll-nup
...
uip-ds6-nbr: consider reachable node if LL-NUD
2014-12-01 18:12:33 +01:00
Simon Duquennoy
1b73695c75
Moved packetqueue to core/net/rime, as it is only used by the Rime collect protocol
2014-12-01 17:47:00 +01:00
Nicolas Tsiftes
63563ed8df
Merge pull request #652 from cetic/pr-rpl-rank-and-fw-errors
...
RPL rank and forward errors
2014-12-01 17:41:51 +01:00
Víctor Ariño
0f394b220b
uip-ds6-nbr: consider reachable node if LL-NUD
...
The reachable state might also be considered to keep the reachable
state since we are already not standard complaint. This reduces the
nbr discovery messages if nodes talk to each other periodically.
2014-12-01 17:06:14 +01:00
Adam Dunkels
d0f475de85
Merge pull request #882 from nfi/dao-lifetime-timer
...
Stop the DAO lifetime timer in RPL instances when released.
2014-12-01 13:17:34 +01:00
Niclas Finne
d160943f16
Bug fix: Stop the DAO lifetime timer in RPL instances when released.
...
Clearing the memory for an active etimer/ctimer might corrupt the
timer list and cause other timers to be lost or infinite loops. The
DAO lifetime timer is only used when RPL route lifetime is not
infinite but then the timer will cause problems if not stopped.
2014-11-29 00:22:34 +01:00
Nicolas Tsiftes
61ec5bf896
Merge pull request #514 from BastianPoe/contiki-mmem1
...
mmem: Prevent duplicate init of mmem
2014-11-28 19:57:17 +01:00
Nicolas Tsiftes
2a29214683
Merge pull request #698 from sieben/scan_build
...
Adding static analysis through the scan-build command
2014-11-28 19:52:55 +01:00
Nicolas Tsiftes
d820feadd6
Merge pull request #792 from wchyan/master
...
atmega128rfa1: Fix the default build error
2014-11-28 19:23:26 +01:00
Nicolas Tsiftes
69c76c9f2f
Merge pull request #872 from Bocci83/master
...
Seedeye platform: add the explicit list of modules
2014-11-28 19:21:52 +01:00
Nicolas Tsiftes
9b90c378e8
Merge pull request #812 from kkrentz/packetbuf-holds-broadcast
...
packetbuf_holds_broadcast()
2014-11-28 19:15:19 +01:00
Nicolas Tsiftes
47096a1bae
Merge pull request #816 from kkrentz/contikimac-framer-fix
...
ContikiMAC framer fix
2014-11-28 19:12:55 +01:00
Nicolas Tsiftes
713d60435a
Merge pull request #875 from joakimeriksson/rtablefix
...
Changed sorting order of routing list (optimization).
2014-11-28 19:09:38 +01:00
Nicolas Tsiftes
bb645b6287
Merge pull request #877 from gebart/for-upstream/rpl-border-router-webserver-tcp
...
examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
2014-11-28 19:00:46 +01:00
Nicolas Tsiftes
4a41f147d3
Merge pull request #879 from alignan/fix_rssi_app
...
Fixed rssi scanner application and moved into single example
2014-11-28 19:00:23 +01:00
Harald Pichler
9c90608d3c
bugfix hum temp
2014-11-28 14:04:39 +01:00
Antonio Lignan
4f744d858a
Fixed rssi scanner application and moved into single example
2014-11-28 13:07:26 +01:00
Nicolas Tsiftes
cd76d4c730
Merge pull request #876 from gebart/for-upstream/webserver-with-tcp
...
examples/webserver-ipv6: Add UIP_CONF_TCP=1 to DEFINES.
2014-11-28 10:16:34 +01:00
Nicolas Tsiftes
560b0a3b50
Merge pull request #878 from jlusticky/avr-clock-fix
...
avr: fix divide when CLOCK_SECOND is not a power of two
2014-11-28 10:06:11 +01:00
Harald Pichler
730d9e2d11
add battery
2014-11-27 15:01:07 +01:00
Harald Pichler
1dacefce01
add coap18
2014-11-27 14:07:14 +01:00
Harald Pichler
41f8a9c661
add coap18
2014-11-27 09:30:36 +01:00
Josef Lusticky
c6bea7d0e7
avr: fix divide when CLOCK_SECOND is not a power of two
2014-11-26 22:47:50 +01:00
Harald Pichler
698d8dce90
add coap18
2014-11-26 21:47:00 +01:00
Joakim Gebart
1e03cdd553
examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
...
The example used to rely on the default value being set to 1 which
caused build failures on platforms which have a default UIP_CONF_TCP=0
Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:05:32 +01:00
Joakim Gebart
64a4755354
examples/webserver-ipv6: Add UIP_CONF_TCP=1 to DEFINES.
...
TCP is mandatory for this HTTP server.
Fixes builds for platforms which have TCP turned off by default (mulle)
Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:03:51 +01:00
Harald Pichler
824eca3b61
cleanup code, move ds1820 to resources
2014-11-26 17:12:34 +01:00
Harald Pichler
7a666307cf
add coap 18
2014-11-26 16:46:13 +01:00
Harald Pichler
079e46f427
Merge branch 'contiki' into osd
2014-11-26 13:04:26 +01:00
kkrentz
7b63217a32
ContikiMAC: Default to contikimac_framer when using Rime over ContikiMAC
2014-11-25 04:56:09 -08:00
kkrentz
6ecbf8af34
ContikiMAC: Retain original copyright
2014-11-25 04:56:09 -08:00
kkrentz
18ee5ce294
ContikiMAC: Added missing length function to contikimac-framer.c
2014-11-25 04:56:09 -08:00
Fredrik Österlind
ce49276e80
Merge pull request #874 from marcas756/PullReq-MT_STATES
...
Enhancement : Moved thread states from module to header
2014-11-25 08:31:47 +01:00
Joakim Eriksson
8e1c52b0ba
Changed sorting order of routing list (optimization).
2014-11-24 09:36:54 +01:00