Commit graph

37 commits

Author SHA1 Message Date
Ralf Schlatterbeck 7d63a0f487 Merge branch 'osd' into ico
Conflicts resolved:
	core/net/mac/contikimac/contikimac.c
2016-06-30 09:28:54 +02:00
Ralf Schlatterbeck d7e6935ec2 Channel check interval is clock_time_t
Fix channel_check_interval routine in struct rdc_driver to be of type
clock_time_t -- otherwise this may overflow on some architectures.
2016-05-07 11:46:27 +02:00
Bernhard Hackl 2ad3d85d41 Fix slip config switch statement 2016-04-20 08:14:08 +00:00
Simon Duquennoy dea04c67d7 Change the default IPv6 prefix from aaaa::/64 to fd00::/64 2016-03-07 17:47:44 +01:00
Víctor Ariño 76e293c289 Fixes ret value for output fallback iface in tun-bridge.c 2015-09-22 12:53:04 +02:00
Víctor Ariño 561e70b18e Updated current fallback_interface(s) to return int. 2015-09-22 12:53:04 +02:00
Michael Richardson 5699127c9a additional edits to further clarify interface between native-border-router and slip-radio 2015-02-07 10:51:41 -05:00
Michael Richardson a0ac6bceb6 added some documentation of native-border-router and slip-radio relationship 2015-02-03 11:05:13 -05: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
George Oikonomou a9e7bea675 Make DODAG ID selection RFC 6550-compliant
Some calls to `rpl_set_root` select a hardcoded DODAG ID
(0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011)

This is against what RFC 6550 says. We change these calls
to select a DODAG ID corresponding to a routable v6 address
corresponding to the root
2014-06-12 00:09:53 +01:00
Adam Dunkels 45265249fc Changed the name of the rimeaddr module to linkaddr 2014-01-29 20:12:24 +01:00
Adam Dunkels 5f3fe7f7c7 Updated include paths for the moved files under net/ 2014-01-26 23:20:23 +01:00
Adam Dunkels 0d04db2b03 Merge pull request #428 from g-oikonomou/config-sanity
Remove unnecessary stuff from various Makefiles (Config Sanity, Pt 1)
2013-11-26 15:05:08 -08:00
Adam Dunkels bb2dcaa057 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
George Oikonomou 58ef2342c2 Stop setting WITH_UIP6=1 in example Makefiles
It achieves exactly nothing other than generate confusion
2013-11-20 14:52:32 +00:00
Giovanni evilaliv3 Pellerano 7fa2ce1329 fixed a C error "della madonna"
http://it.wikipedia.org/wiki/Jerry_Cal%C3%A0
2013-10-23 15:21:07 +02:00
Simon Duquennoy 5dc05e7913 Port apps, examples, platforms and tools so they use the new neighbor and route API. 2013-08-19 17:48:30 +02:00
Joakim Eriksson a096ace73e fixed bug causing lots of packet loss 2013-05-04 13:13:08 -07:00
Joakim Eriksson 26d3359683 make native border router use ipv6 stack and not rime 2013-05-04 13:12:09 -07:00
Adam Dunkels 99f541e8fd Updated to the latest uip-ds6-route API 2012-11-27 23:04:34 +01:00
Niclas Finne 16bb9295f3 Added configurable delay between slip packets to avoid losing data 2012-04-20 22:40:45 +02:00
Niclas Finne 1733f3b6bc Added command context. Patch by Joakim Eriksson 2012-04-20 22:31:37 +02:00
Joakim Eriksson 90e969344a added config for serializing attributes 2012-03-16 03:08:47 -07:00
Joakim Eriksson adff634b88 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-09 01:11:21 -08:00
Joakim Eriksson ae3ff57c39 replaced inet6 with inet for linux to get tunbridge working. 2012-03-09 01:09:56 -08:00
Ilya Dmitrichenko b67e49051c Use __APPLE__ instead of __MACH__. 2012-03-02 15:15:46 -05:00
Ilya Dmitrichenko 7621bdfc77 Fixed ifconfig for Darwin 2012-03-02 15:15:45 -05:00
Ilya Dmitrichenko 70d3acf9af Fixed baudrate issue on Darwin. 2012-03-02 15:15:44 -05:00
Niclas Finne 40c32990e3 Added missing arguments to usage information 2012-03-06 12:33:16 +01:00
Joakim Eriksson 417a2b691f increase uip buffer size for native border router 2012-02-23 13:59:39 -08:00
Niclas Finne 5fdcd6bc13 Fixed typo, added option to run without slip connection 2012-02-21 14:42:05 +01:00
Niclas Finne 23a70177b2 Added option to connect to server instead of serial device 2012-02-21 11:05:52 +01:00
Niclas Finne aceb36c66b Replaced SELECT_CALLBACK with an API that supports multiple select callbacks 2012-01-19 17:52:01 +01:00
David Kopf b251619a2f Add wpcap for cygwin/Windows native border router 2012-01-08 13:37:56 -05:00
David Kopf 777cc88872 Add 921600 baud to slip options, fix compiler warnings 2012-01-08 13:33:40 -05:00
Niclas Finne 8b83ffec67 Added native-border-router and slip-radio 2012-01-01 09:29:33 +01:00
Joakim Eriksson 65163a9b57 Changed FRAMER to return negative values for error to allow 0 size headers. 2012-01-01 09:10:56 +01:00