Commit graph

2459 commits

Author SHA1 Message Date
Adam Dunkels
dd3a88e1bf Merge pull request #126 from rgrr/master
Bug fix: add_timer() does not set owning process
2013-03-09 05:48:14 -08:00
Adam Dunkels
e91a2ac78a Merge pull request #142 from malvira/rpl-leaf-debug
Add some debug PRINTFs for RPL_LEAF_ONLY mode.
2013-03-09 05:35:48 -08:00
Oliver Schmidt
4d4b796abb Removed useless register keywords.
Modern compilers (especially GCC) ignore the register keyword anyway and the latest cc65 snapshot generates actually larger code with the register keyword at the locations in question.
2013-03-06 14:32:36 +01:00
Mariano Alvira
03fdb53af1 Add some debug PRINTFs for RPL_LEAF_ONLY mode. 2013-02-20 18:25:32 -05:00
hardy
ae62a0d142 one blank less 2013-02-18 20:34:24 +01:00
Oliver Schmidt
9970a3631a The new POSIX directory access in the CBM C library comes with a d_blocks field too. 2013-02-17 01:03:51 +01:00
rgrr
7cb8148226 add_timer() does not set owning process 2013-02-13 09:15:11 +01:00
Niclas Finne
26fc2fab87 Bug fix: changed the macro RPL_LOLLIPOP_INCREMENT to update the counter instead of returning the new value since this is how the macro is used today. 2013-02-12 16:06:04 +01:00
Oliver Schmidt
1eda821a75 Fixed severe bug in PSOCK_READTO (?)
Either I found and fixed a severe bug in PSOCK_READTO() or I misunderstood something completely. To me PSOCK_READTO() is supposed to return if either the supplied character was read or if the user supplied buffer is exhausted - sor far so good.

However if the latter occurs up to now PSOCK_READTO() was continuing to process characters already read from the network (aka present in the uIP buffer) in order to check if the supplied character was found there and adjust the return value accordingly. But this means that the character processed this way were lost forever for the caller as the next call to PSOCK_READTO() would continue to read past the characters processed this way.

Therefore I removed that character processing altogether. So now if the user supplied buffer is exhausted before the supplied character is found the next call to PSOCK_READTO() starts exactly where previous call left off.
2013-02-10 15:41:34 +01:00
Oliver Schmidt
29391ef9ae Removed uiplib_ip6addrconv() from IPv4 builds.
While it may very well be beneficial to have explict uiplib_ip4addrconv() and uiplib_ip6addrconv() available for IPv6 builds I'm having a hard time to see the point in uiplib_ip6addrconv() for IPv4 builds.

Unrelated to the above the dispatching of uiplib_ipaddrconv() to either uiplib_ip4addrconv() or uiplib_ip6addrconv() can be accomplished by the C preprocessor only thus avoiding the size/speed overhead of an additional callframe.
2013-02-03 23:04:41 +01:00
Sébastien Dawans
95ab192e88 Makes RPL Initial Link Metric configurable 2013-02-01 09:02:31 +01:00
Simon Duquennoy
7c64a114aa Added missing include of contiki-conf.h 2013-01-23 16:11:02 +01:00
Robert Quattlebaum
5afcbf6fff Makefiles: Allow setting UIP_CONF_IPV6=0 to work as expected.
Setting UIP_CONF_IPV6 to zero from the make build command line is
something that seems like it should ensure that IPv6 is disabled, but in
fact it actually *enables* IPv6. This seems counter intuitive, so this
patch changes the behavior of the makefiles to handle this case
properly.
2013-01-14 22:03:42 -08:00
George Oikonomou
68f59113d6 Fix a route lifetime bug
There is a bug in the current route purge routine which would
result in a route's lifetime getting decremented more than once
during the same pass. This commit fixes it

The bug is documented here:
http://thread.gmane.org/gmane.os.contiki.devel/16209
2012-12-20 00:17:33 +00:00
Adam Dunkels
4324d74f12 Check callback pointers to avoid calling a NULL pointer 2012-12-10 01:50:37 +01:00
Adam Dunkels
83eb9a4ec3 Cleanup: removed the old routing table management functions that had previously been removed from compilation with #if 0 2012-11-27 23:04:34 +01:00
Adam Dunkels
edf141046b Clean up of a few missing printf() that were converted into PRINTF()s 2012-11-27 23:04:34 +01:00
Adam Dunkels
43ecad5a99 Call the route callback API functions. 2012-11-27 23:04:33 +01:00
Adam Dunkels
a9cab81d4e Added macros that allow handling IPv4 addresses even when uIP is configured to be an IPv6 stack 2012-11-27 23:04:33 +01:00
Adam Dunkels
afe13b22bc Rewrote the uIP IPv6 route handling code. Instead of being nested deeply inside the uip-ds6.c file, the route management code is now in a separate file, uip-ds6-route.c. This file presents a lib/list.h API for the routes, which makes the route list much easier to use. Additionally, the uip-ds6-route.c file adds a callback API that invokes a callback when routes are added and removed. 2012-11-27 23:04:33 +01:00
Adam Dunkels
b2063953ba Added a configuration option, UIP_SPLIT_CONF_SIZE, for setting the threshold at which point TCP packets get split into two. 2012-11-27 23:04:33 +01:00
Adam Dunkels
f561bfc205 Added a function simple_udp_sendto_port() for sending a UDP packet to a specified port. 2012-11-27 23:04:32 +01:00
Adam Dunkels
5c5545ba7d Code style and debugging updates 2012-11-27 23:04:32 +01:00
Adam Dunkels
289a01b389 Added explicit functions uiplib_ip6addrconv and uiplib_ip4addrconv for converting IPv6 and IPv4 addresses, regardless of whether uIP was configured to run as an IPv4 or an IPv6 stack. 2012-11-27 23:04:32 +01:00
Adam Dunkels
0bad2b1748 Added a configuration option to annotate IP transmissions with red arrows in Cooja. 2012-11-27 23:04:32 +01:00
Adam Dunkels
b24157631f Made nd6 maximum unicast solicitation messages configurable 2012-11-27 23:04:32 +01:00
Adam Dunkels
2a2175a214 Make RPL DIS transmission interval random in the interval [0, INTERVAL/2]. This is needed to avoid synchronization in large RPL networks. 2012-11-27 23:04:31 +01:00
Adam Dunkels
2396f9b8ea Made DIO interval processing a little easier to follow. Explicitly state that the delay is handled as clock timer ticks. 2012-11-27 23:04:31 +01:00
Adam Dunkels
8538aaf655 Made RPL DAO latency configurable 2012-11-27 23:04:31 +01:00
Adam Dunkels
357b13b3d3 Correctly handle upward and downward routes according to Section 1.2 of RFC6550 2012-11-27 23:04:31 +01:00
Adam Dunkels
15deb37e64 Updated DAG version processing to occur even for infinite rank DIOs. This makes it possible for the RPL root to infer the DAG version number from a network that hasn't had a root for a while, and where the rank has increased to infinity. 2012-11-27 23:04:30 +01:00
Adam Dunkels
db7cb567f5 Updated the RPL code to better match the Contiki code style 2012-11-27 23:04:30 +01:00
Adam Dunkels
cb7842bd16 Added support for encryption and decryption of the packetbuf if macros
NETSTACK_ENCRYPT and NETSTACK_DECRYPT are defined. Those are intended
to be called as functions NETSTACK_ENCRYPT() and NETSTACK_DECRYPT() to
encrypt and decrypt the packetbuf, respectively. If needed, an
initialization function by the name NETSTACK_ENCRYPTION_INIT() can
also be defined.
2012-11-25 12:05:00 +01:00
Adam Dunkels
0cd2f48d6e Added NULL pointer guards 2012-11-22 11:55:01 +01:00
Adam Dunkels
d51d3f6b3e Remove conditionals around RPL extension header #defines and typedefs. With the conditional, it wasn't possible to compile the rpl-ext-header.c file. Since #defines and typedefs and 'free' at runtime, we gain nothing by having them conditional. 2012-11-21 20:11:22 +01:00
Adam Dunkels
6ee1f72486 Removed old unused TDMA-based MAC and RDC code 2012-11-20 20:48:34 +01:00
Adam Dunkels
ec8c7e9be0 Cleanup of the node-id.h files. The node-id.h file contains
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
2012-11-20 19:59:46 +01:00
nvt
757a54f63c Added some comments about Antelope and Coffee. 2012-11-19 13:21:59 +01:00
Alexandre Boeglin
3b492cf82f Add missing Doxygen marker 2012-11-07 16:57:27 +01:00
George Oikonomou
713c2e5974 DOS EOL and indentation fixes (core/ apps/ cpu/)
- Removed some DOS EOLs
- Changed some tabs to spaces
- Removed some trailing whitespaces

Part of Pull Request #6
2012-10-30 13:43:51 +00:00
Rémy Léone
e378f171d6 chmod correction 2012-10-29 14:15:38 +01:00
Adam Dunkels
944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
simonduq
74baca91b1 Added sanity check to avoid deleting DS6 neighbor table entry for a default route 2012-10-05 17:55:45 +02:00
simonduq
dbd4f1c579 Force call of subscriber_callback when the ETX of a link is estimated for the first time. Otherwise, it was not called in case of NO_ACK. 2012-10-05 17:24:23 +02:00
Joakim Eriksson
621790f156 fixed read loop to be slightly less CPU speed dependent 2012-10-01 13:14:47 +02:00
Niclas Finne
8053e2c353 Workaround for an odd type inference problem associated with the IAR compiler. Patch by Vilhelm Jutvik. 2012-09-12 14:46:19 +02:00
Antonio Lignan
c5e9d688a5 Fixed sht11 driver, now ensures the i2c bus is disabled when initializing 2012-08-16 14:12:27 +02:00
Adam Dunkels
dd148e1d12 Bumped version number 2012-07-12 11:30:05 +02:00
Fredrik Osterlind
b9f1b9b205 simplified and bugfixed Cooja's IP address interface, added two
variables in uip-ds6.c to allow Cooja to extract addresses from memory
2012-06-01 15:47:22 +02:00
Fredrik Osterlind
076c208b72 avoid gcc optimization bug by extracting struct values 2012-05-30 17:58:45 +02:00
Fredrik Osterlind
f8e0da428a bugfix: transfer did not terminate correctly when last packet was full 2012-05-29 13:46:22 +02:00
David Kopf
e62f2c3977 Ensure MAXDADNS is defined in uip-ds6.h
Set no RPL as webserver6.minimal-net default and update README
2012-05-28 10:01:34 -04:00
Mariano Alvira
65719adc93 Set the R flag in NAs if UIP_CONF_ROUTER 2012-05-10 16:32:55 -04:00
Niclas Finne
d3b4efa06f removed obsolete function declaration 2012-04-24 14:08:40 +02:00
nvt
e4a305d353 Update the last lookup time for a neighbor when actually doing a lookup. Also fixed some coding style issues. 2012-04-22 00:31:56 +02:00
nvt
534c734465 Removed redundant code and improve code style and documentation. 2012-04-22 00:18:07 +02:00
nvt
e94718f95c Separated configuration into a new file called rpl-conf.h. Improved the documentation. 2012-04-22 00:17:10 +02:00
nvt
eda6b7c318 Use LIST_STRUCT macros. Made get_dag a static function. 2012-04-17 23:35:19 +02:00
nvt
3d0d2c284f Changed function names. 2012-04-17 23:34:47 +02:00
nvt
80097f2c65 Removed some redundant code and fixed coding style. 2012-04-17 23:12:47 +02:00
nvt
6071b5aee7 Remove obsolete support for broadcast DAOs. 2012-04-17 23:04:20 +02:00
nvt
ed37e983f6 Refuse to allocate more parents for a specific DAG when the per-DAG limit has been reached. 2012-04-17 22:59:42 +02:00
nvt
d3fee514b3 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-04-12 21:35:02 +02:00
David Kopf
cac4e9a222 Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t.
Remove the troublesome avr/dev/delay.* files.
Add PLATFORM_NAME and combine the confusing *_REVISION defines into a single PLATFORM_TYPE
2012-04-09 15:49:53 -04:00
nvt
26ee7cb5db Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-04-02 20:10:55 +02:00
Niclas Finne
2507ba4e8d Avoid using memcpy on unaligned uint16_t variables, because certain compilers will optimize this code to a direct copy instruction that will result in unaligned memory access. Thanks to Angelo Compagnucci for reporting this problem. 2012-03-31 01:25:27 +02:00
nvt
bef9b2bd36 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-28 22:40:38 +02:00
Niclas Finne
7bf4fa4bff Removed obsolete mac pointer 2012-03-28 21:51:19 +02:00
Ivan Delamer
5c232e7263 Remove compiler warning for remove_ext_header(). 2012-03-27 19:48:26 -06:00
Ivan Delamer
51e3999054 Simplified reachability detections by sending probes only in PROBE
state.
2012-03-27 18:06:48 -06:00
Ivan Delamer
419ffddd0a remove unnecessary stimer call in tcpip_ipv6_output() 2012-03-27 18:04:51 -06:00
Ivan Delamer
f9d5d71fde 6LowPAN: check tx result, if fail then do not send subsequent
fragments. Serves to save energy and also as collision avoidance.
2012-03-26 15:46:49 -06:00
Ivan Delamer
436cbec844 Separated processed_ip_len into processed_ip_in_len and
processed_ip_out_len to avoid corruption, in case we send a packet in
the middle of receiving a fragmented packet.
2012-03-26 15:46:47 -06:00
Ivan Delamer
c6b3a9957d Ignore 6LowPAN fragments which won't fit in UIP_BUFSIZE (in case
UIP_BUFSIZE < 1280). Otherwise we'll have a buffer overrun.
2012-03-26 15:46:45 -06:00
simonduq
63ea562568 base encounter_time on the time before last strobe, remove unused previous_txtime 2012-03-26 22:49:28 +02:00
nvt
3cace20809 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-20 21:23:13 +01:00
simonduq
7784cf7827 stm32w platforms: use 2 cca and default contikimac guard time 2012-03-20 17:30:05 +01:00
simonduq
5da4463236 adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La) 2012-03-20 17:29:58 +01:00
nvt
82ed40651a Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-15 21:47:12 +01:00
George Oikonomou
598dcc110c sicslowpan doesn't need to remember the mac driver 2012-03-14 17:52:50 +00:00
George Oikonomou
e6819effef Fix compile errors with SDCC
Intermingled declarations and code are not yet implemented in sdcc.
2012-03-14 17:52:50 +00:00
nvt
9fb93cd7b7 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-12 19:23:37 +01:00
Matthias Kovatsch
87cd18539b Eliminated RPL_CONF_ADJUST_LLH_LEN correction by using uip_l3_icmp_hdr_len instead of uip_l2_l3_icmp_hdr_len. 2012-03-08 00:48:04 +01:00
Matthias Kovatsch
7eac4393c2 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-07 22:24:02 +01:00
Matthias Kovatsch
dd967e62f5 Applied patch provided by Franck Rousseau restoring UIP_LLH_LEN. 2012-03-07 22:22:58 +01:00
Ivan Delamer
f38962a3c4 Do not remove infinite default routers when PROBE fails. 2012-03-07 13:52:06 -07:00
nvt
c4eeb578a7 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-06 23:23:34 +01:00
nvt
3860e798ac Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-05 01:49:55 +01:00
David Kopf
07f6e10c1c Add display options to border router web page, default now uses stack instead of static buffer.
Turn radio off until prefix is acquired.
2012-03-02 16:01:12 -05:00
nvt
217a4e54ca Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-22 19:28:49 +01:00
Joakim Eriksson
321ecc9fab Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-21 19:07:40 +01:00
Joakim Eriksson
5a65e3cc8b tuned RPL parameters and improved calculation of path etx 2012-02-21 19:06:58 +01:00
David Kopf
745f071c98 Eliminate unused variable warnings. Dummy test of PT_YIELD_FLAG does not change program size. 2012-02-21 11:23:54 -05:00
David Kopf
6e45dfe5ff PROGMEM changes needed for newer avr-gcc compiler 2012-02-21 11:10:57 -05:00
Nicholas J Humfrey
372de7d08a Converted u8_t to uint8_t and u16_t to uint16_t in the rest of core (specifically ctk/vnc, slip and the loader code) 2012-02-21 08:33:24 -05:00
Joakim Eriksson
2752337e69 fixed lollipop counter 2012-02-21 13:20:20 +01:00
Nicholas J Humfrey
3fe55673d3 Converted deprecated uIP types in the network stack to standard C99 names (in stdint.h) 2012-02-17 22:45:13 +00:00
nvt
9d8be775d4 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-11 02:14:20 +01:00
Niclas Finne
99f3d5ada2 Added missing include 2012-03-06 12:33:47 +01:00
Ivan Delamer
27daa94030 Compress UDP header when UIP_CONF_UDP is disabled but we are routing
others' UDP packets.
2012-02-01 13:06:38 -07:00
Ivan Delamer
e7cd04b558 Bug fix: do not overwrite NS or RA messages otherwise generated in the
same uip_ds6_periodic() call.
2012-02-01 09:55:41 -07:00
Joakim Eriksson
729a434d0f always send DAO to refresh routes 2012-02-29 15:01:59 -08:00
Nicolas Tsiftes
d0e2d9b47e Cleaned up code style, comments, and print outs. Set default DAG parameters when the DIO configuration option is missing. 2012-02-29 21:59:50 +01:00
Ivan Delamer
02d3fd4758 Fixes small bug in uip-nd6.c: when a packet is sent before DAD is
completed, DAD-like message is sent that can create a DAD fail in
another node (if it matches the destination of our packet).
2012-01-31 15:44:29 -07:00
nvt
82a7c93b47 Check return value. 2012-01-30 23:51:07 +01:00
Nicolas Tsiftes
16c437da7e Adjust for the multi-instance structures. 2012-02-27 23:03:52 +01:00
Niclas Finne
1e85183754 fixed debug output and changed to use uip-debug.h for debug output 2012-01-27 15:51:46 +01:00
Joakim Eriksson
c3655728b8 fixed extension header handling 2012-01-27 15:40:39 +01:00
Niclas Finne
b65972d32d Corrected debug output 2012-01-22 22:27:20 +01:00
Joakim Eriksson
6ee05f4a2d fixed loop detection bug in RPL 2012-01-13 05:37:30 -08:00
Matthias Kovatsch
8ee68b4345 Added ext. header handling for UDP (RPL multihop still not functional). 2012-01-12 20:22:31 +01:00
David Kopf
24d58edf15 Adjust cycle starts when RTIMER_ARCH_SECOND not a power of two. 2012-01-10 12:48:39 -05:00
Joakim Eriksson
d24ecf8d59 added timestamp to neighbor info 2012-01-10 16:04:56 +01:00
Joakim Eriksson
237100f6fa changed so that ext hdr len code checks against buffer size instead of link mtu 2012-01-10 15:51:06 +01:00
Niclas Finne
9d261eec56 Use NETSTACK_RDC_* instead of NETSTACK_CONF_RDC_* 2012-01-09 18:06:30 +01:00
Niclas Finne
8e59df78e2 Autoenable RX after TX + removed exception check 2012-01-09 14:55:34 +01:00
Niclas Finne
f4f35973d1 Fixed some configuration problems and support for AUTOACK 2012-01-09 14:55:31 +01:00
Niclas Finne
a56793f401 Fixed compiler warnings 2012-01-09 14:54:50 +01:00
Niclas Finne
b6fd166155 Removed obsolete CRC checksum handling and debug leds 2012-01-09 14:41:48 +01:00
Niclas Finne
05b10eb9ce Initial WiSMote port based on code from Arago Systems. 2012-01-09 12:25:06 +01:00
Niclas Finne
8b83ffec67 Added native-border-router and slip-radio 2012-01-01 09:29:33 +01:00
Joakim Eriksson
65edc32de2 Fixed uiplib to stop parsing IPv6 address when at length part 2012-01-01 09:29:27 +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
nvt
d89a4ef4fd Simplified best_dag function and fixed the previous incomplete commit. 2012-01-04 14:13:54 +01:00
Nicolas Tsiftes
f112fa99d5 Removed the force flag from rpl_reset_dio_timer. Removed an unnecessary DIO timer reset when changing rank but keeping the same preferred parent. 2012-01-04 11:22:11 +01:00
Mariano Alvira
c9ac19b919 Allocate the default_instance pointer in rpl-dag.c instead of the
header file to fix "multiple definition of `default_instance'" errors.
2011-12-09 08:36:23 -05:00
Mariano Alvira
1086299f25 fix typo 2011-12-09 08:23:43 -05:00
Adam Dunkels
f88a1e394b Made collect retransmissions and broadcast announcements timers depend on the rdc wakeup rate 2011-12-09 08:18:22 +01:00
Nicolas Tsiftes
a4a7fd7dc0 Fix coding style. 2011-12-08 15:42:19 +01:00
Nicolas Tsiftes
1e61fca653 Fix coding style. 2011-12-08 15:38:35 +01:00
Nicolas Tsiftes
d0ebeb409e Merge remote-tracking branch 'sf/master' into rpl-patch
Conflicts:
	core/net/tcpip.c
2011-12-08 15:26:11 +01:00
Adam Dunkels
1e57ddb6c7 Disable phase shift correction by default 2011-12-08 14:04:01 +01:00
Adam Dunkels
0a428c9489 style fix; added fas check for cycle_time being a power of two or not. 2011-12-05 16:28:04 +01:00
Niclas Finne
405b295306 Clear uip_len when trying to send to a neighbor with an incomplete state, as suggested by Ivan Delamer. 2011-12-02 17:13:29 +01:00
Niclas Finne
077eba80e1 code style 2011-12-02 17:07:27 +01:00
Nicolas Tsiftes
23a280e5eb Refactored loop detection. 2011-12-02 16:16:42 +01:00
Nicolas Tsiftes
ac869185c0 Refactored header management. 2011-12-02 15:55:07 +01:00
Nicolas Tsiftes
5c0100c979 Use rpl headers. 2011-12-02 15:54:49 +01:00
David Kopf
74aa63de43 Add optional correction for phase drift of receiver. 2011-12-01 10:02:37 -05:00
Nicolas Tsiftes
220e6f7b88 Minor documentation improvements. 2011-12-01 14:40:54 +01:00
Nicolas Tsiftes
7c808081d6 Coding style 2011-11-23 14:36:50 +01:00
nvt
e11b7d4fb6 Removed redundant code 2011-11-22 14:18:32 +01:00
Adam Dunkels
8edd86da5e Bugfix: PROCESS_PAUSE() must explicitly check the event type, otherwise we may cause the process event queue to fill up if we repeatedly call PROCESS_PAUSE() while other (broadcast) events are posted as well, such as timer events. 2011-11-22 09:36:27 +01:00
Nicolas Tsiftes
cef95ebf9b Inverted DAG ID check 2011-11-21 15:50:19 +01:00
Nicolas Tsiftes
2b1549bfe8 Continued merge with sf master 2011-11-21 15:25:13 +01:00
Nicolas Tsiftes
0e32956a63 Merge remote-tracking branch 'sf/master' into rpl-patch 2011-11-21 14:59:31 +01:00
Nicolas Tsiftes
ea73f1d767 Do not force DIO reset on certain events where it is not needed. 2011-11-16 09:49:22 +01:00
Nicolas Tsiftes
b405571e32 Update next-hop address for existing routes. 2011-11-16 09:05:34 +01:00
Nicolas Tsiftes
ef0ce944e5 Split management of extension headers into a separate file and fixed coding style. 2011-11-16 09:00:19 +01:00
Nicolas Tsiftes
63afff5436 Removed debug output and fixed coding style. 2011-11-16 08:56:56 +01:00
Nicolas Tsiftes
e716ce25a1 DEBUG off. 2011-11-16 08:50:01 +01:00
Niclas Finne
63e40d195e Restore packetbuf before mac callback (earlier commit was accidental reverted) 2011-11-15 16:59:12 +01:00
David Kopf
8e47694597 Add RDC_CONF_HARDWARE_CSMA, RDC_CONF_HARDWARE_ACK, RDC_CONF_MCU_SLEEP, CONTIKIMAC_CONF_SHORTEST_PACKET_SIZE for use with hardware having those modes.
Default behaviour should be unchanged.
2011-11-14 12:02:47 -05:00
Joakim Eriksson
5281e7c59c made linkable with IAR linker - avoiding multiple defs of rime_sniffer, etc 2011-11-08 11:57:17 +01:00
David Kopf
a547b2259e Avoid infinite loop when printing garbled packets 2011-10-27 11:13:26 -04:00
David Kopf
659d30c6c2 Fix sd6 typo 2011-10-27 09:24:05 -04:00
Joakim Eriksson
2a94b3ce82 added debug callbacks 2011-10-27 12:32:16 +02:00
Niclas Finne
b01cbb996d Fixed to restore packetbuf before mac callback 2011-10-21 17:52:31 +02:00
Joakim Eriksson
1b0af2a21d fixed powertrace attribution for 6lowpan traffic 2011-10-20 12:37:56 +02:00
Joakim Eriksson
2399689bbd Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-10-17 14:16:57 +02:00
Joakim Eriksson
17bbb1f1c1 fixed so that rpl avoids sending no-path DAOs when changing parent when in NO_DOWNWARD mode of operation 2011-10-17 14:16:19 +02:00
David Kopf
8ebd7a65a4 Add missing includes, remove unimplemented function declaration. 2011-10-13 11:23:53 -04:00
Joakim Eriksson
cf61e522a8 added powertrace to IPv6 including an example 2011-10-13 15:09:40 +02:00
nvt
d711887a1b Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-10-10 22:11:52 +02:00
nvt
6611291dd0 Ensure that packet metric is always set. 2011-10-10 22:10:21 +02:00
simonduq
a2073db715 Removed ContikiMAC burst dependency to phase optimization 2011-10-04 10:29:40 +02:00
Joakim Eriksson
e0ae036a69 added static on the list send functions to get less compiler errors with IAR compiler 2011-10-03 15:17:30 +02:00
simonduq
222f9bd3af Include string.h 2011-09-29 15:07:00 +02:00
simonduq
dd8576830e Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
Joakim Eriksson
5b1d9617c4 moved io and signal and IAR-GCC checks from driver files into contiki include file 2011-09-26 10:38:41 +02:00
Joakim Eriksson
ab049ec704 some fixes to cut some extension headers before TCP processing 2011-09-22 17:22:59 +02:00
Niclas Finne
6d3571ed59 Updated to use clock_seconds() on all platforms 2011-09-19 17:42:19 +02:00
Joakim Eriksson
95dde73618 fixed Sky platform for IAR compiler 2011-09-11 17:18:02 +02:00
nvt
ab0c04b041 Move 16-bit integer conversion operations into functions, as is done already with 32-bit ops. 2011-09-06 17:28:39 +02:00
nvt
942ba1f7bd Removed const qualifier to conform with the rest of the Rime interface. 2011-09-05 22:05:41 +02:00
Niko Pollner
84105f4e47 Improved multihop/mesh route discovery.
Packetbuffer is now saved before route discovery and resent when a
route is found.

This solves the following problems:
- First packet sent to a certain node is corrupted.
- Packet to be forwarded that triggers route discovery is lost.
2011-09-05 21:27:38 +02:00
Adam Dunkels
3fa14d3cd5 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-09-05 20:45:24 +02:00
Adam Dunkels
13853b2cfd Set default RDC wakeup rate to 8 hz 2011-09-05 20:42:38 +02:00
nvt
644f1c627d Initialize the DIO object in case options are missing. Updated the terminology regarding options. 2011-09-05 20:28:50 +02:00
Adam Dunkels
f7a3a8476f Added a safeguard to fragmentation reassembly: if there are additional bytes in the final fragment, we shave them off in the spirit of being 'liberal in what we accept' 2011-09-05 14:26:48 +02:00
Joakim Eriksson
7b50b87e12 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-09-05 11:40:22 +02:00
Joakim Eriksson
62705a17ea Send DAOs if dtsn differs instead of only when larger than last dtsn in DIO 2011-09-05 11:36:53 +02:00
Adam Dunkels
bd951031ef Cleanup of the ContikiMAC code; removed the old an unused announcement code 2011-09-02 14:06:29 +02:00
Adam Dunkels
61ef9b6fc3 Cleanup of the ContikiMAC code; removed the old an unused announcement code 2011-09-02 14:06:27 +02:00
Adam Dunkels
9b53b3aa8e Small spelling bugfix 2011-09-02 13:51:28 +02:00
Adam Dunkels
2da65385a0 Added a SICSLOWPAN_CONF_COMPRESSION_THRESHOLD that can be used to set a threshold under which header compression should not be used. Below this threshold, headers are not compressed but sent as full IPv6 packets. This is useful for RDC layers, such as ContikiMAC, which set a lower bound for packet size. 2011-09-02 13:51:09 +02:00
Adam Dunkels
3cb42ceb10 Made the ContikiMAC header configurable from contiki-conf.h 2011-09-02 13:37:46 +02:00
Adam Dunkels
9e30f0f7c6 Minor code style fixes 2011-09-02 08:16:50 +02:00
Adam Dunkels
6220e231a2 Fixed previously erroneously fixed include 2011-09-01 09:11:46 +02:00
Adam Dunkels
4cf82b2764 Fixed includes 2011-09-01 08:45:18 +02:00
Adam Dunkels
d6508cf3c0 Made the number of phase neighbors configurable 2011-08-31 20:54:21 +02:00
Adam Dunkels
81e098d2da Added some defensive programming 2011-08-31 20:53:48 +02:00
Adam Dunkels
7ce313eef6 A significantly simpler API for sending UDP packets 2011-08-29 21:30:21 +02:00
David Kopf
11efc33d2c Make comparison endian-safe, thanks Ivan. 2011-08-18 14:01:20 -04:00
David Kopf
2feed121d2 Account for 16 bit rtimer wraparound, else ENERGEST way underreports AVR times. 2011-08-17 16:51:22 -04:00
David Kopf
d4eeeeb8c9 Remove inclusion of preprocessor directive in macro expansion. Some gcc's do not like that. 2011-08-17 13:13:55 -04:00
David Kopf
b55dddcd38 Free rtimer for contikimac, add print-stats option 2011-08-15 14:55:18 -04:00
David Kopf
e2ad2acde4 Add stk500 platform and changes suggested by Daniel Willmann 2011-08-03 11:18:55 -04:00
David Kopf
44f4ee9315 Use PROCESS_NAME_STRING macro to handle NO_PROCESS_NAMES 2011-08-03 11:08:40 -04:00
David Kopf
df70b21c70 gcc 4.4.1 - 4.6.0 compiler bug workaround. 2011-07-31 15:36:01 -04:00
nvt
5330dd1565 Avoid reading bytes from the original file when their is a log entry for that part of the file. 2011-07-30 10:05:23 +02:00
Vincent Brillault
d7c114dbd8 RPL prefix handling fix : Change IP on DODAG change, delete IP when leaving DODAG. 2011-07-13 10:42:59 +02:00
Vincent Brillault
d8d9494168 uip : When creating a route with a "state" field, clear it (It's possible that the process responsible for this creation doesn't handle the state field) 2011-07-13 10:31:22 +02:00
Vincent Brillault
4f76130a77 Changed Instance structure in order to decrease memory waste. 2011-07-13 10:28:56 +02:00
Vincent Brillault
286cf002bc Clean nd6 debug output (use uip-debug instead of local code) 2011-07-11 16:53:36 +02:00
Vincent Brillault
f4b804ed9f Add support of RPL Option (http://tools.ietf.org/html/draft-ietf-6man-rpl-option-03):
- Auto-insersion when forwarding messages
- Delete messages with 2 rank errors
Not supported yet :
- Routing depending on InstanceID
- DAO inconsistency loop recovery
- Full UDP or TCP support (Bugs in µIPv6)
- Real Option Type (TBD by IANA)
2011-07-11 16:53:02 +02:00
Vincent Brillault
dc9cbe647d Changes in RPL implementation :
- Structural modification of RPL data storage.
- Support multiple gateways (multiple DODAG-ID with a unique InstanceID)
- Use Lollipop counters
- Add leaf-only configuration option for RPL
Bugfix :
- Correctly send "Grounded" flag in DIO
2011-07-11 16:52:45 +02:00
Vincent Brillault
2ac91d53b5 Add (dangerous) feature : use layer 2 acks instead of NUD in the IPv6 layer.
(Decrease packet numbers but dangerous if neighbors change their ips (not a problem in standard RPL with EUI-64 based addresses))
2011-07-11 14:19:14 +02:00
Vincent Brillault
6ddd0bb190 Allow to completely desactivate DAD (useless in route-over LLN as implemented, see http://tools.ietf.org/html/draft-ietf-6lowpan-nd-15#section-8.2) 2011-07-11 13:51:38 +02:00
Vincent Brillault
b0907f0344 Cleaning old .h :
- Delete unimplemented function and unused structures
- Remove misleading configuration options
- Transfer some comments from 6lowmac to framer-802154
(doc/uip6-doc.txt should be cleaned as well)
2011-07-11 13:20:30 +02:00
Nicolas Tsiftes
77a44c560a The flags field got widened to 9 bits. 2011-06-28 17:49:32 +02:00
Nicolas Tsiftes
b1fea35e47 Fixed issues with propagation of the route lifetime configuration. Removed deprecated configuration parameters. 2011-06-28 17:08:44 +02:00
David Kopf
c48b7ab78d Add RPL nodes and border router to minimal-net platform (cygwin only) 2011-06-28 08:19:48 -04:00
Nicolas Tsiftes
6749281a87 Rediscover lost routes when forwarding packets. Also refresh route entries when sending packets through them. Patch from Jaroslav Meduna. 2011-06-23 14:45:11 +02:00
Niclas Finne
28b0479c06 Added optional address filtering 2011-06-15 17:51:57 +02:00
Niclas Finne
e8a96dc202 Bug fix: update packet attributes in queued packets in CSMA instead of doing a full packetbuf copy after transmissions. The lower layers often add their own headers to packetbuf. 2011-06-15 16:10:07 +02:00
Nicolas Tsiftes
48e6e801c2 Removed redundant tokens at the end of preprocessor conditions 2011-06-10 17:44:48 +02:00
Nicolas Tsiftes
ce909a97e6 Removed unread stack variable 2011-06-10 17:41:46 +02:00
Niclas Finne
154f971b2b collect_send() should return 0 if the packet could not be enqueued to be sent 2011-06-07 19:45:41 +02:00
Joakim Eriksson
d980c0db16 added delays in CC2420 to avoid risk of configuring before CC2420 is powered on 2011-06-05 00:20:25 +02:00
Joakim Eriksson
e511c6a930 added debug to sht11 driver and made it more configurable 2011-06-05 00:15:53 +02:00
Joakim Eriksson
77ec0bfa0f fixed the z1 platform and generic code used by z1 to work with IAR compiler 2011-05-25 17:21:51 +02:00
dak664
580efaa412 Fix compiler warning for unused variable 2011-05-18 11:22:25 -04:00
Joakim Eriksson
2432a8ee7d set expected reception sequence no to zero - to get initial connection to avoid having ack-number other than zero 2011-03-11 14:27:23 -05:00
Salvatore Pitrulli
4fb433ac1f 'if' statement replaced by a preprocessor directive. 2011-05-12 21:50:47 +02:00
Joakim Eriksson
695c7d74b8 fixed bug in 6lowpan compression when compressing 2011-05-09 09:57:37 +02:00
Adam Dunkels
0e792fb742 Flush before computing accumulative power 2011-05-08 22:25:38 +02:00
nvt
e00508472c Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-05-03 18:18:50 +02:00
nvt
15ee0a6414 Send No-Path DAOs correctly. 2011-05-03 17:50:24 +02:00
Adam Dunkels
dfaf4afc8e Rime sniffers must be called for all transmissions, even if they failed, to get energy attribution right. This means that rime output sniffers now also must take the MAC transmission status as an argument. 2011-05-02 15:06:34 +02:00
Zhitao He
cae8ef206a fixed excessive retransmissions of junk packets after runicast timeout
fixed stuck packet ID for next packet after runicast timeout
2011-04-27 19:12:46 +02:00
nvt
4b5d380c74 Announce MAX_PATH_COST if we don't have a preferred parent. 2011-04-25 22:37:25 +02:00
Adam Dunkels
74f1754d88 Bugfix: energy consumption for retransmissions was miscounted 2011-04-13 14:10:39 +02:00
Adam Dunkels
af4ce9ba9e Bugfix: idle power consumption was sometimes misestimated for transmissions, when a duty cycle rtimer fired in the middle of a transmission 2011-04-13 14:10:02 +02:00
Oliver Schmidt
07f3df45be Converted scope-local variables into function-local variables.
The 6502-specific LC implementation doesn't allow for scope-local vaiables between PT_BEGIN/PROCESS_BEGIN/PSOCK_BEGIN and PT_BEGIN/PROCESS_END/PSOCK_END.
2011-04-12 14:12:09 +02:00
Joakim Eriksson
5a054c82d2 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-04-07 17:46:01 +02:00
Joakim Eriksson
02fcf5835a fixed RPL to handle inifinite rank better 2011-04-07 17:44:07 +02:00
Niclas Finne
5a4a39afb3 changed etx to metric 2011-04-07 09:46:37 +02:00
Joakim Eriksson
d8e54ca585 fixed for compilation with IAR compiler 2011-04-06 20:14:30 +02:00
Joakim Eriksson
26f0a6e88e changed ext to link_metric 2011-03-28 16:17:53 +02:00
Joakim Eriksson
c9af578eab added psock function for reading specified number of bytes 2011-03-09 02:40:53 -05:00
Joakim Eriksson
2baa6cf1b5 fixed so that ] is accepted as end of IPv6 address 2011-03-08 23:11:06 -05:00
Joakim Eriksson
590b0a1696 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-03-22 10:46:46 +01:00
Joakim Eriksson
90ae09c7e5 fixed parsing of address to handle [<addr>] 2011-03-22 10:42:38 +01:00
nvt
55c4df8ee7 Slight generalization to make it easier to switch metric. 2011-03-17 20:29:38 +01:00
nvt
cdaf58f892 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-03-17 20:23:53 +01:00
nvt
8078ef7705 ROOT_RANK is now a macro function. 2011-03-17 20:21:56 +01:00
Nicolas Tsiftes
c461266524 Made the code more conforming to the Contiki style. 2011-03-16 13:35:44 +01:00
Nicolas Tsiftes
65366d10c1 Update the metric container correctly. Use only one ETX initializer. 2011-03-16 13:29:01 +01:00
Nicolas Tsiftes
eee9a68b12 Simplified. Removed the need for an initial guess. 2011-03-16 13:26:52 +01:00
Joakim Eriksson
6554e87c00 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-03-15 14:15:55 +01:00
Joakim Eriksson
5f4d4550fc fixed RPL statistics bug and added parent switch stats 2011-03-15 14:14:41 +01:00
nvt
4739143126 Generalized MRHOF and added partial support for energy objects in DAG metric containers. 2011-03-15 01:16:20 +01:00
dak664
a883c9bcbc Add PRINTA so direct calls to debug routines will always print 2011-03-13 11:57:39 -04:00
Joakim Eriksson
d381ee7bbf Merge branch '6lowpan-16bit-fix' 2011-03-07 22:17:39 +01:00
Joakim Eriksson
340c86e401 reverted to byte-based iid check 2011-03-07 22:02:43 +01:00
Niclas Finne
e348cf7fc6 removed unnecessary include 2011-03-07 20:20:29 +01:00
Joakim Eriksson
4599284110 minor cleanup of 16-bit compressable macro and comment 2011-03-07 14:50:29 +01:00
Joakim Eriksson
972c1992d2 16-bit addr compression fix 2011-03-06 22:34:16 +01:00
nvt
a7addf990f Avoid hysteresis check if neither p1 nor p2 is the preferred parent. 2011-03-04 16:40:40 +01:00
Fredrik Osterlind
dd7cec737d removed obsolete leds_[color]() functions, replaced by leds_{on,off}()
allow LEDS_[COLOR] to be configured by platform-conf
2011-03-03 17:48:32 +01:00
Fredrik Osterlind
499c13a357 removed execute flag of source files (avoids diff problems with egit) 2011-03-01 18:16:42 +01:00
Joakim Eriksson
fa0fbf5dab fixed format of transit subopt 2011-03-01 12:33:34 +01:00
dak664
7f3c198a78 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-02-28 16:32:48 -05:00
dak664
105f581d86 Use AVR program flash for uip-debug.h printfs. 2011-02-28 16:23:05 -05:00
Mariano Alvira
e826ccd3b9 add NULLRDC_CONF_802154_AUTOACK_HW for radios that only pass-up NOACK
status but not the actual ack packet.
2011-02-23 15:19:44 -08:00
Mariano Alvira
a8f9119ace pass up a RADIO_NOACK to the MAC layer. 2011-02-23 15:19:43 -08:00
Joakim Eriksson
3cd7835f5c made DIO parameters configurable 2011-02-22 18:24:05 +01:00
Joakim Eriksson
68e9fb2a5c added annotate when setting root and joining dag 2011-02-22 16:19:42 +01:00
nvt
e9234a8404 Error: the value was printed before setting it 2011-02-22 02:01:15 +01:00
Adam Dunkels
733aaa546f Made the number of MAC sequence numbers to remember configurable; fixed bug with power attribution to the idle state. 2011-02-21 14:11:32 +01:00
Adam Dunkels
24af4888bc Made the number of MAC sequence numbers to remember configurable 2011-02-21 14:11:17 +01:00
Lionel Debroux
5cb49e8b07 Several compiler warning fixes:
* msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h;
     * sky: fix a couple pointer target signedness warnings;
     * core: fix several signed/unsigned comparison warnings;
     * framer-802154: "const static" -> "static const" to fix compiler warnings;
     * core: comment or remove unused variables and function definitions.

Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
2011-02-20 19:28:14 -05:00
nvt
01b7a4f7f2 Replaced ROOT_RANK with a macro that allows for other min_hoprankinc parameters than the default. Also made some minor style improvements. 2011-02-20 20:15:40 +01:00
François Revol
777518d653 Fix some typos.
Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
2011-02-18 11:01:43 -05:00
Mariano Alvira
bb1baffc79 change FIX2ETX -> NEIGHBOR_INFO_FIX2ETX in some debug prints. 2011-02-17 20:54:57 -05:00
Nicolas Tsiftes
93a7280a1a Replaced old description 2011-02-15 18:10:15 +01:00
nvt
99d0387a8e Merge branch 'master' of github.com:adamdunkels/contiki-2.x 2011-02-15 01:13:41 +01:00
nvt
a093c262ee Improved objective function API so DAG metric containers can be generated cleanly. The packet generation now asks the OF to provide a fresh logical presentation of the metric container, which is then translated to raw packet format. 2011-02-15 01:13:30 +01:00
Adam Dunkels
db37e38156 Make sure we don't remove the preferred parent 2011-02-14 23:01:11 +01:00
nvt
20bf23cf06 Replaced ifdef with if, as salvopitru suggested 2011-02-14 15:53:08 +01:00
nvt
cbe4513bf4 basic support for parsing metric containers in DIOs 2011-02-13 23:17:56 +01:00
nvt
539ff33104 Turn off debugging 2011-02-13 21:36:07 +01:00
nvt
0df450f0dc Add the NEIGHBOR_ATTR prefix to a macro name 2011-02-13 21:34:59 +01:00
nvt
4125c38808 missing word 2011-02-13 21:34:29 +01:00
nvt
5ec2f19dc9 Remove only the worst parent if the table is full when processing a DIO. 2011-02-13 21:33:47 +01:00
Adam Dunkels
432928d000 Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix. 2011-02-13 21:29:59 +01:00
Adam Dunkels
acb5480aa9 Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix. 2011-02-13 21:21:14 +01:00
Adam Dunkels
ed3995960d Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix. 2011-02-13 21:21:13 +01:00
Adam Dunkels
15bf73ba08 Use DAG_RANK() macro to compute rank 2011-02-13 19:01:15 +01:00
Adam Dunkels
e980072817 Don't add neighbor as a potential parent if its rank is too high. 2011-02-13 18:05:28 +01:00
Adam Dunkels
2a96835c05 Don't remove all parents that have a worse rank than an incoming DIO: we may inadvertently remove our preferred parent. Instead, remove parents with a rank that is worse than our preferred parent. If we are lucky, this will give us enough space for the new parent. 2011-02-13 14:16:15 +01:00
Adam Dunkels
f1ac94e415 Slight code complexity reduction 2011-02-13 14:14:49 +01:00
Adam Dunkels
3a824d0ed6 Added a hysteresis when choosing a new parent: don't switch parent unless the ETX is significantly better (1.5 ETX better). 2011-02-13 14:14:16 +01:00
Joakim Eriksson
48fb9dda9e fixed of0 to respect min hop rank increase 2011-02-13 11:25:53 +01:00
nvt
20171985c6 Split the RPL header into a private and a public header. 2011-02-11 16:21:17 +01:00
Adam Dunkels
706045120f Changed the variable name local_confidence to etx to better reflect what it was used for 2011-02-11 14:18:57 +01:00
Adam Dunkels
ba6bf7dd6b Rewrote the parent selection to favour parents with a low ETX and a good rank. The old parent selection would always favour parents with a lower rank, regardless of their ETX, which in some cases lead to suboptimal parent selections. Also, the old code was buggy in that it would always pick the worst parent (the one with the highest ETX). 2011-02-11 14:17:26 +01:00
Adam Dunkels
bb8377dfee Set the end-of-stream flag on the TCP FIN packet 2011-02-10 22:47:45 +01:00
Joakim Eriksson
d24c63c0f1 fixed so that minhoprankinc is configurable 2011-02-10 19:44:12 +01:00
Fredrik Osterlind
3bf99ca040 LEDS_ALL configurable 2011-02-09 15:29:41 +01:00
Nicolas Tsiftes
774aa3984a Use a more understandable name 2011-02-09 15:17:25 +01:00
Nicolas Tsiftes
c77cb63df1 ifdef -> if 2011-02-09 15:13:50 +01:00
Nicolas Tsiftes
39ea9405bb Added a function for setting the I/O semantics on a Coffee file descriptor. Changed the configuration parameters slightly and updated the platform definitions to reflect this change. 2011-02-09 15:03:57 +01:00
Adam Dunkels
8d55a68ebe Added a PACKETBUF_ATTR_STREAM_END packet flag 2011-02-08 22:20:07 +01:00
Adam Dunkels
46348d9013 Added the low-power streaming mode where frequent channel checks are performed when streaming is on. Enabling this will (by setting WITH_STREAMING to 1), however, significantly slow down Cooja/MSPsim simulations. 2011-02-08 21:57:46 +01:00
Joakim Eriksson
d518c84471 made rank calculation depend on selected parent when joining DAG 2011-02-08 19:59:50 +01:00
Nicolas Tsiftes
aeca16d01f Just update the node rank and let rpl_process_parent_event take care of the rest 2011-02-07 17:29:23 +01:00
Nicolas Tsiftes
e3638d2791 Updated to the minrank-hysteresis OF 2011-02-04 15:46:01 +01:00
joxe
389a4f9220 added rpl-all-nodes multicast address to nodes mcast addresses 2011-01-25 22:41:30 +00:00
nvt-se
faab7229c9 Must check the storage boundary in find_contiguous_pages. 2011-01-25 18:39:09 +00:00
adamdunkels
09c223f549 Updated Contiki X-MAC to use hardware acks, which allows for tighter timing and results in a lower duty cycle. Hardware acks also make X-MAC more robust against packet losses, as there is a direct way for the CSMA layer to detect loss of data packets. Before, Contiki X-MAC only detected loss of strobes. 2011-01-25 14:31:09 +00:00
adamdunkels
d51e99a3dd Updated streaming mode to use only about 20% radio. Made guard time more conservative due to problem report by Ricklef Wohlers. 2011-01-25 14:29:46 +00:00
adamdunkels
fa524fabd7 Bugfix: q->buf was not tested for NULL, as it should be. Fix by Simon Duquennoy. 2011-01-25 14:24:38 +00:00
joxe
e79c0ab1ee fixed rpl so that it sends and receives on the rpl-all-nodes multicast address 2011-01-25 09:55:12 +00:00
joxe
3a643fa0c6 added address macros for rpl-all-nodes 2011-01-25 09:54:03 +00:00
adamdunkels
4b4b8fad56 More recent packet entries. Allow 4 queue entries to be dedicated to generated packets. 2011-01-18 16:05:53 +00:00
adamdunkels
808c21fbfa Bugfix: default should be 3 MAC-level retransmissions if collissions or loss occurs 2011-01-18 16:03:57 +00:00
adamdunkels
affba785b5 Enabled phase-lock only for channel check rates of 32 Hz or lower 2011-01-18 16:03:19 +00:00
nvt-se
28421f1fe2 Removed watchdog calls from Coffee 2011-01-18 14:06:33 +00:00
adamdunkels
26e3b6fdc0 Bugfix by Simon Duquennoy: don't transmit packet until previous packet has been sent by the RDC layer. 2011-01-13 19:06:22 +00:00
adamdunkels
81d23a3a36 Minor bugfixes pertaining to queue handling: if a packet was explicitly dropped, the packet would later be acknowledged despite it never being received; added a limit on how many queue entries that can be used for packets that are being forwarded, to allow for originated packets even if the forwarding queue is filled. 2011-01-10 15:10:43 +00:00
adamdunkels
70f9f075a0 Safeguard against NULL arguments 2011-01-10 15:08:52 +00:00
adamdunkels
148bd60fe1 Bugfix: the defensive retransmission timer setting must be made before the packet is transmitted, otherwise the retransmission timer will always be for the defensive retransmit 2011-01-09 23:49:27 +00:00
adamdunkels
50a3e6ea23 Increased the max ETX to allow for longer paths even with the initial conservative ETX estimate; made collect use announcements by default 2011-01-09 23:48:33 +00:00
adamdunkels
acf45ec648 Bugfix: memory wasn't freed when a neighbor was dropped from the list. Also increase the max age to 180 minutes to allow for regular beacons to refresh the neighbor before it is dropped. 2011-01-09 21:20:05 +00:00
adamdunkels
90dc0ceebf Replaced default link estimator with an exponential weighted moving average, which reduces memory consumption per neighbor. 2011-01-09 21:14:22 +00:00
adamdunkels
4e91d9303e Added safeguard timer if the MAC layer would fail to call back after transmission. 2011-01-09 21:13:20 +00:00
adamdunkels
cea299d79a Call upper layers even if packet reception failed - this allows the RDC layer to shut off the radio even if a malformed packet was received. 2011-01-09 21:09:28 +00:00
adamdunkels
a0960154ba Cleaned up parts of the code; added comments 2011-01-09 21:07:01 +00:00
nifi
f3d22e6287 dos2unix conversion 2011-01-07 11:55:36 +00:00
nvt-se
30f5e29db7 dos2unix conversion 2011-01-05 17:01:03 +00:00
joxe
65048c519c removed some void * casts in uip code 2011-01-04 22:11:37 +00:00
nvt-se
7a43b7d832 Configuration of the objective function made easier. Updated OF0 to the new rank calculation. 2011-01-04 20:43:28 +00:00
joxe
b2296e462b removed void * + changed ux_t to uintx_t 2011-01-04 20:22:21 +00:00
dak664
3c3cd868cd Allow shorter UIP_CONF_WAIT_TIMEOUT for more aggressive power saving modes. 2010-12-24 00:39:04 +00:00
dak664
8b5577eca2 Patch from Roger Larsson to answer mac address request, for testing autoconfigure. 2010-12-23 22:38:47 +00:00
dak664
322d835fee Fix avr-gcc compiler warnings 2010-12-18 22:12:53 +00:00
nvt-se
8f76c82433 Improved DAO management. 2010-12-17 15:24:25 +00:00
adamdunkels
4914739e5d Revived the timesynch module, which has been switched off since the introduction of the new radio API after Contiki 2.4. The new code uses explicit timestamp messages instead of piggybacking timestamps on every transmission. It is also significantly better in terms of exactness. 2010-12-16 22:47:38 +00:00
adamdunkels
10fb99a89d Reduced the value of the max depth, so that a count-to-infinity loop will not count too long before hitting the maximum value. This is important when a network loses its sink, so that packets are not forwarded around the network for ever. 2010-12-16 22:46:34 +00:00
adamdunkels
19e930e6f2 Changed the behaviour of retransmissions to work better with the in-order CSMA code. The retransmission timer is now set when the packet is known to be sent by the MAC layer. 2010-12-16 22:45:15 +00:00
adamdunkels
4a89cc9db3 Rework of the new CSMA in-order code that fixes a number of smalllish bugs in the in-order code. 2010-12-16 22:44:02 +00:00
adamdunkels
79f2c25dae Rework of the phase-lock optimization mechanism. There were several bugs in the existing code, such as the phase-lock would lose synchronization when a packet was lost. 2010-12-16 22:43:07 +00:00
adamdunkels
01c28ab502 Added explicit timestamp packet type, for the revived timesynch support 2010-12-16 22:41:43 +00:00
adamdunkels
d267b5ca94 Re-added timestamp support for outbound packets that was removed when switching to the new radio API 2010-12-16 22:40:52 +00:00
adamdunkels
417c7f8c70 Added parenthesis around addresses to allow expressions as arguments 2010-12-16 22:39:50 +00:00
nvt-se
dae3dc22f3 Corrected a comment that was accidentally overwritten in a previous commit 2010-12-15 19:57:40 +00:00
nvt-se
cd08939b38 Corrected the reported ETX in the initial callback, and fixed the coding style 2010-12-15 14:35:07 +00:00
nvt-se
404230a047 Added a macro for portable watchdog calls. 2010-12-15 14:01:07 +00:00
nvt-se
79ae813f88 Improved macro definitions and removed obsolete declarations. 2010-12-15 13:37:34 +00:00
nvt-se
542bbd4b31 Increased the width of dio_next_delay to avoid possible wrappings 2010-12-15 12:24:00 +00:00
nvt-se
486f202d09 Fixed problem with too large values for the DIO timer. 2010-12-15 12:12:27 +00:00
dak664
a026c94467 Fix compiler warnings 2010-12-14 22:45:22 +00:00
dak664
0a4a0ffb32 Add SICSLOWPAN_CONF_ACK_ALL for hardware autoack testing 2010-12-14 22:18:20 +00:00
dak664
240d478c1f Allow platform to specify COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME 2010-12-14 22:14:33 +00:00
adamdunkels
952dfc9384 Rework of the CSMA layer: instead of using one timer per packet, the module now uses one central timer and a queue of outgoing packets. This helps to keep packets in order, which is extremely useful for TCP transfers, and reduces the amount of congestion since consecutive packets now are spaced in time if there is a collision. Based on the observations and ideas of Simon Duquennoy. 2010-12-14 07:57:14 +00:00
dak664
0e60c99e80 Add defines to set stateful address prefixes. 2010-12-13 23:27:40 +00:00
dak664
9c66df6de1 Fix ancient RAND_MAX compiler warning 2010-12-13 16:52:02 +00:00
joxe
3e293e6cfc updated rpl dio message format to be compliant with latest version 2010-12-13 10:59:37 +00:00
nvt-se
c9cc87ef25 Added support for Mode of Operation flags in DIOs. Removed obsolete destination advertisement flags. 2010-12-13 10:54:25 +00:00
joxe
b66da85392 fixed comments and initialize flags in dio_output to zero 2010-12-13 09:59:46 +00:00
joxe
aa1795d5c2 removed route annotation from rpl - moved to ds6 2010-12-10 22:48:31 +00:00
joxe
2c30b3c6ba added annotation for showing routes and default route during simulation 2010-12-10 22:46:58 +00:00
adamdunkels
af21afa750 Make sure that the cycle timing is exact 2010-12-10 13:36:06 +00:00
adamdunkels
e4cf633215 Put parenthesis around user-supplied options. Patch by Roger Larsson 2010-12-07 23:33:17 +00:00
adamdunkels
c19a967973 Bugfix: with the recent bugfixes, it was no longer possible to turn duty cycling back on after it had been turned off 2010-12-07 23:12:54 +00:00
joxe
e1fbb9bba0 changed neighbor state callbacks to occur only at add and remove 2010-12-07 10:36:03 +00:00
nvt-se
b2a28e6fc3 Fixed error reported by Pieter Agten. The reachable time is specified in milliseconds, and must thus be divided by 1000. 2010-12-06 09:48:48 +00:00
adamdunkels
4c9793f428 Let ContikiMAC remember the state that the radio should have when duty cycling is turned off. This fixes a bug in which the radio was turned on after sending, even when NETSTACK_RDC.off(0) was enabled. 2010-12-06 09:08:22 +00:00
adamdunkels
433d42e170 Bugfix: if the cc2420_cca() function wasn't able to turn on the radio properly, it should turn it off again if it was off before. 2010-12-05 00:14:24 +00:00
dak664
f34e5ec798 Convert implicit printf to PRINTF 2010-12-04 21:06:04 +00:00
dak664
e54d7d6f9c Fix compiler warnings 2010-12-02 15:55:17 +00:00
adamdunkels
6d556d5c13 Fixed bug with link-layer ACKs. Refactored the ACK reception code. 2010-11-25 08:44:34 +00:00
adamdunkels
2f66db3ded Added a debug mode that keeps track of where individual queuebufs are allocated, which is useful when debugging queuebuf leakage problems. 2010-11-25 08:43:59 +00:00
nifi
3bd78893e5 Renamed nullrdc to nullrdc-noframer and nullrdc-framer to nullrdc.
nullrdc (previously nullrdc-framer) is now a RDC implementation that
does not do any radio duty cycling but supports link layer addresses
and frame format via framer (for example 802.15.4). nullrdc can now be
used in the same way as contikimac, xmac, etc.

nullrdc-noframer (previously nullrdc) is a null RDC implementation
that does not do any radio duty cycling, does not add any header of its
own to the packets, and does not support link layer addresses.
2010-11-23 18:11:00 +00:00
dak664
62d7832fff Fix compiler warning and possible bug 2010-11-13 16:37:42 +00:00
nifi
05d78522d3 Added MAC-layer duplicate message suppression when using 802.15.4 auto ack 2010-11-12 12:53:16 +00:00
nvt-se
1168703506 Minor clarifications in the code and comments. Integrated atches from Frederic Sureau: 1. copy_buf is now an ordinary char pointer. 2. Read directly from a file that is not modified. This reduces the code size when COFFEE_MICRO_LOGS is set to 0. 3. Update the file end value each time it is changed in case a log merge operation occurs later. 4. Avoid possible alignment problem in reading from the dummy_space area when calling cfs_readdir. 2010-11-11 13:08:23 +00:00
adamdunkels
8f745a6ea6 Added a function for obtaining the current parent 2010-11-06 14:32:10 +00:00
adamdunkels
9750eb93bf Turn off debug messages 2010-11-03 15:41:23 +00:00
adamdunkels
a891a2ffe8 Bugfix: allow ICMPv6 to send packets larger than those whose length fits in one byte. Bugfix by mathieupouillot 2010-11-03 11:56:11 +00:00
adamdunkels
b7df18a96a Turned off streaming by default to save code space; made guard time a little more conservative 2010-11-02 11:00:08 +00:00
adamdunkels
1b5001b226 Bugfix: out-of-order fragments were not handled correctly. minor style fixes 2010-11-02 10:56:57 +00:00
adamdunkels
2a885a476d Bumped version number 2010-11-02 10:55:32 +00:00
adamdunkels
5230e64112 Use the new shared ND-packet queue buffers 2010-10-29 05:36:07 +00:00
joxe
9a1f902881 made rank use full resolution when using OF-ETX 2010-10-28 20:39:06 +00:00
adamdunkels
f5031861ac When IPv6 ND kicks in, the packet that caused the ND can either be dropped or saved in a buffer to be send when the NS reply returns. This commit reimplements the buffer management to avoid having one buffer per neighbor, but instead use a buffer pool from which buffers can be allocated for different neighbors. 2010-10-28 15:42:56 +00:00
adamdunkels
677575fc8c Rewrote proactive link estimator to be invoked randomly instead of triggered by an empty queue; this makes network bootups because nodes are not synchronized 2010-10-28 15:36:02 +00:00
joxe
932fed8cc7 improved ETX calculation 2010-10-28 08:54:54 +00:00
nifi
25ceab07d2 Update annotation when removing preferred parent. 2010-10-27 12:27:57 +00:00
nifi
d2a3f1f257 We found that the preferred parent should be reset in the rpl_remove_parent function. 2010-10-27 12:20:35 +00:00
nvt-se
d528039f9a Created a separate function for local repair. Added a statistics structure. Improved the control of malformed packets. 2010-10-27 00:46:40 +00:00
nvt-se
c2c0505402 Increased alpha to 85 in order to get slower changes in the ETX. Put back the start guess to 3. 2010-10-27 00:45:24 +00:00
joxe
43023ab425 made number of transmissions configurable 2010-10-26 13:25:32 +00:00
nvt-se
1fbc651bf3 Lowered the first guess for the ETX of a link. 2010-10-25 20:06:17 +00:00
nvt-se
127c87efcc Fixed debug printfs. Added control of max_rankinc parameter. 2010-10-25 20:03:37 +00:00
nvt-se
19d7543267 Added detection of loops in DAO forwarding. 2010-10-25 19:49:12 +00:00
adamdunkels
9ecc0437f4 Left-over debug printf removed 2010-10-25 12:25:39 +00:00
adamdunkels
42f37ca1d3 Bugfix: removed old leftover code statement 2010-10-25 11:59:09 +00:00
adamdunkels
3bbd6a00a9 Replace old neighbors according to an LRU policy when a new neighbor needs to be added 2010-10-25 11:58:07 +00:00
adamdunkels
e680276954 ARP fix for multicast transmissions. (Patch by Robert Quattlebaum.) 2010-10-24 22:29:39 +00:00
adamdunkels
a8848517dd UDP checksum is mandatory with IPv6. (Patch by Robert Quattlebaum.) 2010-10-24 22:28:43 +00:00
adamdunkels
77ecfb0366 Rewrote parts of the retransmission logic so that collect is robust against the situation where the MAC layer will fail to callback after a packet has been transmitted. 2010-10-24 21:08:19 +00:00
adamdunkels
8fa7bf6c31 Always restore the queuebuf to the packetbuf before calling the upper layers. Reduce the waiting time between successive MAC layer retransmissions. 2010-10-24 21:07:00 +00:00
adamdunkels
73f5535754 Made the guard time slightly more conservative - found an occasion where this was needed 2010-10-24 21:06:17 +00:00
adamdunkels
8f8741c7f0 Small style fixes 2010-10-24 21:05:42 +00:00
adamdunkels
fd4c0e64aa Removed old unused files rand.[ch]. By default, Contiki uses the libc implementations of the rand() and srand() functions. 2010-10-24 21:02:23 +00:00
nvt-se
00a000cca0 Print the rank correctly in the debug output. 2010-10-22 15:40:10 +00:00
nvt-se
86823a84fb Export fix-point representation of the ETX. Make RPL temporarily use the same representation as before. 2010-10-22 13:50:13 +00:00
joxe
804d23e9f4 made DIS Interval configurable 2010-10-22 13:13:40 +00:00
joxe
e414c8c5a4 added function for retrieving link etx to neighbor 2010-10-22 11:34:24 +00:00
nvt-se
6e28b1d3fb Reduced ETX_LIMIT in order to avoid overflows. Removed ETX_LOSS_PENALTY and set packet_etx to ETX_LIMIT instead upon packet loss. 2010-10-21 19:46:21 +00:00
adamdunkels
9cb830ed37 Timing bugfix in the waiting period between channel samples to check if the coast is clear before sending a packet. 2010-10-20 22:25:24 +00:00
adamdunkels
06123fefe2 Defensive programming: make sure that a process is actually running before we try to kill it. 2010-10-20 22:24:46 +00:00
adamdunkels
3ffcff0656 Added mechanisms for explicit de-synchronization of synchronized neighbors. Added link-layer ACKs. Fixed bugs with MAC-layer interaction. Now seems to work somewhat (didn't work at all before, in some cases), but there are still problems with packet loss. 2010-10-20 15:23:43 +00:00
adamdunkels
5585d72c86 A simple but substantial change: uIP used the htons()/HTONS() macro
functions for converting between host and network byte order. These
names are the de facto standard names for this functionality because
of the original BSD TCP/IP implementation. But they cause problems for
uIP/Contiki: some platforms define these names themselves (Mac OS,
most notably), causing compilation problems for Contiki on those
platforms.

This commit changes all htons to uip_htons instead. Same goes for
htonl, ntohs, and ntohl. All-caps versions as well.
2010-10-19 18:29:03 +00:00
adamdunkels
34cba78ca8 Bugfix: bump advertisements only when a parent changes, not because of an upstream parent change 2010-10-19 07:34:29 +00:00
nifi
e2b4956a7f Bug fix: release the packet and notify the sender if RDC returned an error 2010-10-14 19:08:39 +00:00
oliverschmidt
2f89e69ff7 Fixed build for platforms which use the default value for QUEUEBUF_NUM. 2010-10-12 19:51:28 +00:00
adamdunkels
020da4e8ba Added a function for obtaining beacon intervals 2010-10-11 23:44:24 +00:00
adamdunkels
ec716ea62d Do not reduce transmission interval, unless explicitly told so with the bump flag 2010-10-11 23:43:01 +00:00
adamdunkels
37adf130b4 Rewrite of the congestion logic. A node now report it being congested
when half the transmission queue is full. When a neighbor is heard to
be congested, the rtmetric of that node is inflated to avoid sending
more traffic in its direction.

Fixed problems with beacon intervals: intervals are now not reduced
when a path gets significantly worse, only when they get better.
2010-10-11 23:42:01 +00:00
adamdunkels
d821ba5e22 Added a lifetime for link estimates: if they are too old, they are
reset so that a new probing period can produce more up-to-date
estimates. Added a congestion mechanism whereby a neighbor can be
marked as being congested for a period of time, during which the ETX
for the neighbor will be artificially inflated.
2010-10-11 23:38:46 +00:00
adamdunkels
5eb4a0fe8d Rewrote the initial link estimate logic: link estimates are now
computed only over the actual samples, not over the entire
buffer. Also, the initial link estimate is much more conservative now
(16 transmissions) to favor links that have been probed, and which
therefore are likely to have better ETXs.
2010-10-11 23:34:02 +00:00
adamdunkels
0cabe483c3 Don't call sink recv function for zero-size packets, since these most likely are link estimate probes or keepalive packets. Explicitly set eseqno to zero when opening a new connection. 2010-10-07 15:52:28 +00:00
adamdunkels
ad35c54473 Bugfix: when a node's rtmetric was lower than SIGNIFICANT_RTMETRIC_PARENT_CHANGE, its beacon timers would always be bumped to its lowest value 2010-10-05 20:06:47 +00:00
adamdunkels
52e9a6f1fb Turned the DRAW_TREE debug flag off by default 2010-10-04 22:36:47 +00:00
adamdunkels
65d640ac53 Several bugfixes to the proactive link estimate maintenance code, which is now enabled by default. Simplified DRAW_TREE code for drawing routing graph in Cooja. Added routing metric penalty to parents that are congested or that drop packets. 2010-10-04 20:27:50 +00:00
adamdunkels
212e73faa6 Removed old netsim code. Added a function for obtaining the packet attributes of a queuebuf packet. 2010-10-04 20:26:01 +00:00
joxe
4f3fc1c404 fixed xmac to use new channel check define name 2010-10-03 22:46:53 +00:00
adamdunkels
ceebd7020a Bugfix: the return value sometimes was wrong when a collision was detected. 2010-10-03 20:39:24 +00:00
adamdunkels
ae88ed04f1 Moved the definition of the channel check rate used by the radio duty
cycling layer. This definition was previously held in net/mac/mac.h,
with the name MAC_CONF_CHANNEL_CHECK_RATE. But since the rate is used
by the radio duty cycling layer, it makes more sense to change its
name to reflect this. Also, the configuration option should be tied to
the netstack configuration instead.

So the new configuration option is called
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE.
2010-10-03 20:37:32 +00:00
adamdunkels
40583fe112 Removed the polite announcement code, since it was not used, and enabled the broadcast announcement code by default. Increased the default intervals for broadcast announcements. 2010-10-03 20:10:22 +00:00
adamdunkels
605392522f Bugfixes and improvements: rtmetrics are now 16-bit clean. Added experimental feature that proactively probes neighbors that have not yet been tried out, in order to get an initial ETX for them. 2010-10-03 20:08:44 +00:00
adamdunkels
d0579c8a81 Cleaned up the collect neighbor management code 2010-10-03 20:07:10 +00:00
adamdunkels
b23a364397 rtmetric values should always be computed as 16-bit values 2010-10-03 20:06:25 +00:00
nvt-se
909569f834 Must check if load_file succeeded 2010-10-01 20:14:14 +00:00
adamdunkels
32ba90ea4c Bugfix: make sure that neighbor exists before attempting to update tx
count.
2010-09-28 06:53:02 +00:00
joxe
77c5187a2e fixed bug where context is null but still referenced 2010-09-23 19:57:50 +00:00
joxe
494d2a3073 only compare with global addresses when selecting source for a specific destination 2010-09-23 18:17:27 +00:00
nifi
e242fb28bf Reverted radio API change in CC2420 (not yet fully integrated with Contiki core) 2010-09-23 08:26:06 +00:00
adamdunkels
eed22a6f3c A number of changes to the collect code:
* Added an optional "keep alive" mechanism whereby an idle network is
periodically probed by dummy packets to maintain a recent quality
metric when there is no traffic.
* Bugfix in when new routing metrics should be advertised
* Rewrote the ACK logic so that a queuebuf is not allocated for each
ack, only for those acks generated by the sink node.
* Updated the wrap-around logic for sequence numbers: when a sequence
number wraps, it won't go back to 0. Instead, it wraps to 128. This
allows us to understand when a node has rebooted: when its seqno is <
128, it has recently rebooted.
2010-09-22 22:08:08 +00:00
adamdunkels
2cae71e89b Added a function for obtaining the link estimate and rtmetric for a neighbor 2010-09-22 22:04:55 +00:00
adamdunkels
46b2451969 Made the initial link estimate explicit 2010-09-22 22:03:21 +00:00
adamdunkels
40ee35e8c8 Rewrote all busy waits with a new macro, which has a built-in timeout to ensure that busy waits won't hang the CPU 2010-09-22 22:01:53 +00:00
joxe
1dc5366b15 fixed buggy comment 2010-09-21 13:15:25 +00:00
joxe
f1d19a5f9a no callback to rpl if rpl is not used 2010-09-21 13:13:09 +00:00
joxe
63ab1ffce0 clear default route when neighbour is removed 2010-09-20 15:30:12 +00:00
nvt-se
58db04ee64 Set a high penalty for packet losses. 2010-09-15 15:59:52 +00:00
nvt-se
098f4001e0 Use fixed point arithmetic in the calculations of the ETX EWMA 2010-09-15 15:10:25 +00:00
nvt-se
adf6961a85 Various bug fixes and adjustments for rpl-11 2010-09-15 13:22:22 +00:00
dak664
b9a9e7695d Add option to remove process name strings to save RAM 2010-09-14 18:55:04 +00:00
adamdunkels
18e31f33b9 Minor tweaks. Removed debug output from CVS. 2010-09-14 06:48:36 +00:00
nifi
095f700b63 Moved down inclusion of rtimer-arch.h to allow rtimer_clock_t to be used in rtimer-arch.h 2010-09-13 20:46:02 +00:00
adamdunkels
eb58968459 Added a timer to each phase structure that keeps track of for how long
a particular receiver has not ACKed packets. After some time
(currently 16 seconds), the sender will begin sending full strobe
periods again.
2010-09-13 13:39:05 +00:00
adamdunkels
3ae774c91a Added a way to for specifying lists as parts of structs. These lists
must be initialized with a special LIST_STRUCT_INIT() call before
using.
2010-09-13 13:31:00 +00:00
adamdunkels
591766e663 Significant improvements to the Collect protocol:
* Loop detection and untangling. Now uses in-band loop detection that
  works.

* Link quality estimation. Now starts with a conservative /
  pessimistic estimate for new links.

* Retransmissions. MAC layer and network layer retransmissions are now
  decoupled.

* Loss handling. Deals better with losses now.

* Concurrent applications. Each connection now maintains its own
  neighbor table with separated cost to sink estimates for each
  connection.
2010-09-13 13:28:14 +00:00
oliverschmidt
a0b8927777 Allow to exit the process owning the foreground window by pressing ctrl-c. This is especially useful if there's no closebutton on the window frames (or no windows at all). 2010-09-09 20:21:26 +00:00
adamdunkels
4e0744954a Rewrite of important parts of the Collect logic: link estimation
calculation and parent selection.  This fixes a severe bug that caused
loops when packets were erroneously retransmitted due to ACK loss.
2010-09-08 19:21:45 +00:00
nifi
f05952c926 Changed packet id to use 8 bit instead of 4 bit 2010-08-31 13:14:49 +00:00
nifi
d06a1ecc0c corrected include path 2010-08-25 18:35:52 +00:00
dak664
12479c32bc Fix compiler warnings 2010-08-01 21:18:07 +00:00
oliverschmidt
89f6235c13 Using wherex() to determine the length of the string printed with cputsn() fails if the right edge of the screen was reached as wherex() then returns 0.
Therefore we rather count the chars actually printed in cputsn() and return that value thus avoiding usage of wherex() in those scenarios altogether.
2010-07-20 22:19:23 +00:00
nvt-se
11760059d3 The second predicate is not needed. 2010-07-03 23:52:02 +00:00
nifi
3e6113be72 removed debug output 2010-06-30 09:03:20 +00:00
nvt-se
007d4a4001 Improved logic for processing DIOs 2010-06-28 14:51:23 +00:00
nifi
c44cf73e4f Adapted to new SPI and CC2420 naming 2010-06-24 11:25:55 +00:00
nifi
f609cb0f7c Added macro to read from CC2420 RAM 2010-06-24 11:25:07 +00:00
nifi
30db4eff52 Made QUEUEBUF_STATS configurable 2010-06-24 09:48:21 +00:00
nifi
49a2ca6b1e Fixed naming of CC2420 macros 2010-06-24 09:28:38 +00:00
nifi
fb3c2e75cf removed obsolete definitions 2010-06-24 09:28:12 +00:00
nifi
c6b6b6625c removed obsolete header file for CC2420 2010-06-24 09:20:28 +00:00
joxe
f7a82a9145 split SPI code into generic and CC2420-related and renamed constants in CC2420 2010-06-23 10:15:28 +00:00
joxe
bc398ca546 removed platform dependent loop-count from cc2420 - moved to platform config instead 2010-06-21 19:48:00 +00:00
joxe
a5d7b197eb added support for the Z1 platform and its 8Mhz 2010-06-21 19:09:35 +00:00
joxe
1f0a43bf01 fixed timer bug - did not do equality comparison 2010-06-21 19:07:24 +00:00
joxe
546504516b changed timer comparison to avoid crashing mspgcc4 2010-06-21 09:41:49 +00:00
nifi
e965b74cf5 added missing include 2010-06-18 08:28:56 +00:00
nifi
4741b95858 added missing include 2010-06-16 10:10:10 +00:00
nifi
21828ad782 Changed the retransmission time to be based on the configured MAC channel check rate when the RDC has no channel check interval. 2010-06-16 10:08:30 +00:00
adamdunkels
7647cbd8aa Use the list_item_next() API 2010-06-15 19:22:25 +00:00
adamdunkels
560c84a2fe Added a function for getting the first global IPv6 address 2010-06-15 19:16:22 +00:00
adamdunkels
a84cc7c8a0 Added a function for obtaining the next item on the list. This makes list iterations nicer, as the ->next pointer now is hidden within the list abstraction. 2010-06-15 18:54:27 +00:00
nifi
01b1359b1f removed unused (and slightly problematic) code 2010-06-15 14:19:22 +00:00
nifi
46f9f7e6c0 corrected include path 2010-06-15 13:31:22 +00:00
adamdunkels
3fa8ffda1a Moved the modules packetbuf, queuebuf, and packetqueue from net/rime to net/, since they are not Rime-specific 2010-06-14 19:19:16 +00:00
adamdunkels
951fd78f6c ctimer moved from net/rime to sys/ 2010-06-14 18:58:45 +00:00
nvt-se
fad2b1def9 Clarified the function naming for neighbor information callbacks - names now indicate where the information is from. 2010-06-14 18:35:04 +00:00
nifi
adc38568ad Minor optimization: replaced init loops with memset to reduce code size 2010-06-14 13:51:13 +00:00
nifi
7499939c94 removed debug output 2010-06-14 13:07:09 +00:00
nvt-se
e000b1abf3 A major update to ContikiRPL resulting in a reduced code footprint by
300 bytes, as well as cleaner protocol logic.

* Made parent management uniform.

* Simplified the DIO processing.

* Improved the Objective Function API and its documentation.

* Removed redundant code at various places.

* Improved identifier naming.

* Switched visualization from candidate parents to preferred parents only.

* Made DAO ACK transmissions configurable.

* Improved initial ETX guess by using a cached local confidence value.

* Added a periodical rank recalculation function to reduce
  the maximum stack depth.

* Increased the Trickle redundancy constant to ensure faster
  topological updates.
2010-06-14 12:44:37 +00:00
adamdunkels
a890cd3d49 Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys 2010-06-14 11:33:58 +00:00
adamdunkels
97708d6235 Documentation group set accordingly 2010-06-14 07:35:53 +00:00
adamdunkels
8f8393aadc Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys 2010-06-14 07:34:36 +00:00
adamdunkels
baa62e9314 Addresses are not const 2010-06-14 06:55:26 +00:00
adamdunkels
2647f879c2 Bugfix: select the best parent if current parent is NULL 2010-06-14 06:54:47 +00:00
adamdunkels
8d1680fed5 Filter duplicate packets 2010-06-14 06:52:41 +00:00
adamdunkels
a6bd51f361 If a packet is lost due to NOACK or TXERR, we count the number of transmissions and we add an additional loss penalty (currently one) 2010-06-14 06:51:58 +00:00
joxe
1095997b66 made DIOs and OCP 09 compliant 2010-06-12 10:55:46 +00:00
nvt-se
75b624eb71 Refactored the code, removed void pointer arithmetic, and fixed invalid list removal after freeing of memb object. 2010-06-11 12:32:48 +00:00
nvt-se
8a43743a42 Updated declaration for rpl_alloc_dag. 2010-06-08 21:41:02 +00:00
nvt-se
b1521e4950 Check correctly if a DAG already exists in the same instance. 2010-06-08 21:37:22 +00:00
adamdunkels
296c828ac2 Removed instant reaction to packet loss. Previously, a neighbor was dropped if no MAC layer ack was received. 2010-06-08 19:25:40 +00:00
nvt-se
4a08f545c9 Make the distinction between incoming and outgoing DTSN clear. 2010-06-08 16:21:54 +00:00
nvt-se
b8848f29eb Replaced invalid attempt to switch preferred parent when its DS6 neighbor entry got purged. 2010-06-08 15:40:50 +00:00
nvt-se
4e61d69a49 Removed redundant code, moved the control of acceptable rank increases into a separate function. 2010-06-07 14:01:22 +00:00
nvt-se
c6c6760838 Validate incoming DTSN value 2010-06-07 13:40:05 +00:00
nvt-se
e5fd1f47fa Copy the DTSN from the DIO when joining a DAG. 2010-06-07 11:36:02 +00:00
nvt-se
f0afbb69ab Fixed typo 2010-06-06 21:48:15 +00:00
nvt-se
3748f782c5 Added basic functionality for DAO ACKs and DTSN. Randomized DAO timer. 2010-06-06 21:42:50 +00:00
joxe
f4508cc1e2 minor fixes + improved debug-printout 2010-06-06 12:45:55 +00:00
joxe
e75c77937e fixed bug that caused problems when uncompressing unspecified address 2010-06-06 12:44:12 +00:00
joxe
17209e8fa4 moved code for autoconfiguring global address into join_dag 2010-06-03 18:37:47 +00:00
nvt-se
c201058325 Purge all routes related to a DAG being freed. Do not send no-DAOs when doing a global repair. 2010-06-03 15:20:56 +00:00
joxe
ba2bf31c20 changed DAOs to be formatted according to the rpl-08 specification 2010-06-03 14:49:15 +00:00
nvt-se
f52e97111f Made the remove_parents function more powerful by adding a flag that indicates whether no-DAOs should be sent or not. Fixed some style issues and a possible NULL pointer dereference. 2010-06-03 12:55:09 +00:00
nvt-se
352fb4e74d Restrict the rank to INFINITE_RANK 2010-06-03 12:12:20 +00:00
joxe
62abed8347 fixed a minor bug causing too low rank during global repair 2010-06-02 16:54:59 +00:00
joxe
941443878b fixed rank calculation bug in of-etx 2010-06-02 16:23:08 +00:00
joxe
f069320ca9 removed sequence_number and replaced with version - fixing global repair functionality 2010-06-02 11:59:51 +00:00
joxe
fec0e8df69 changed RPL to be more 08 compliant - DIO and DIO options are formatted as in RPL-08 2010-06-01 22:30:02 +00:00
joxe
7887559d56 fixed bug in ttl decompression 2010-06-01 12:37:54 +00:00
joxe
518f9c1a00 refactoring and cleanup 2010-05-31 20:42:27 +00:00
nifi
b54c6e673b Updated API for uiplib and resolv to use uip_ipaddr_t instead of uint16_t for compability with IPv6 2010-05-31 15:22:08 +00:00
nvt-se
c13bb8666b Better validation of incoming DIOs. Added a reset function to the OF API. 2010-05-31 14:22:00 +00:00
oliverschmidt
126ea40994 Removed UIP_CONF_PLAIN_BUFFER again now that the pointer indirection to uip_buf was removed again. 2010-05-30 09:46:12 +00:00
nvt-se
f135105567 Added support for multiple objective functions.
Extended the objective function API with a callback function that receives link-layer neighbor information.

Throttled DAO transmissions to one per DEFAULT_DAO_LATENCY period.

Added support for an ETX objective function (hysteresis control still lacking though).

Fixed a leak of routes installed by DAOs.

Control that dst_adv_supported is set before sending DAOs.

Improved debugging output.
2010-05-29 22:23:21 +00:00
nifi
f6e0b46f38 * Made Chameleon header processing module configurable (CHAMELEON_CONF_MODULE)
* Removed the unused init function from header processing modules
* Added option CHAMELEON_CONF_WITH_MAC_LINK_ADDRESSES to specify that
  MAC link addresses should be used instead of Chameleon's own encoding
  of sender and receiver. This avoids encoding the link addresses twice
  when the MAC RDC has its own addresses.
2010-05-28 06:18:39 +00:00
nifi
b7b2c8fcde Added macro to identify address attributes for use in header processing modules 2010-05-27 20:28:29 +00:00
nifi
ac9b862cd0 Added configurable support for 802.15.4 autoack 2010-05-26 14:12:33 +00:00
nvt-se
320fa820ca Renamed neighbors to parents. Removed redundant code. Corrected the logic for max rank increase. 2010-05-25 21:58:54 +00:00
joxe
34b8313fb6 added experimental support for disseminating autoconf prefix via DIO suboption 2010-05-25 19:19:43 +00:00
nvt-se
6c4bf93141 Handle MAC_TX_ERR notifications. 2010-05-25 15:29:51 +00:00
nvt-se
c5d1c3ea27 Improvements to local repair and DAO handling. 2010-05-24 16:38:56 +00:00
nvt-se
f882901bf6 Remove unreachable neighbors immediately, rather than using an ETX threshold that leads to slow topological repairs. ETX information should later be stored even for removed neighbors if there is room. 2010-05-24 16:38:17 +00:00
joxe
16c212798f cleanup of the code, removing dead core + adding local vars to save some space. 2010-05-24 14:28:56 +00:00
joxe
2d447502d4 changed uip_buf to a union for 32-bit alignment 2010-05-24 10:07:34 +00:00
joxe
9db7f06368 fixed compiler warnings 2010-05-24 09:57:20 +00:00
joxe
56a3a71108 added include of string.h since memcpy are used 2010-05-19 16:16:57 +00:00
joxe
5c30aed814 removed nd llao option struct since not naturally aligned - replaced struct fields access with array based access 2010-05-19 12:21:45 +00:00
nvt-se
4411807b29 Fixed bug in DAO input. Made printfs more portable. 2010-05-18 16:43:56 +00:00
nvt-se
8c3ed291bb Preserve the file offset if a seek operation fails. 2010-05-13 18:24:55 +00:00
nifi
ed4debe285 Changed neighbor notification to be default on when using RPL 2010-05-11 10:02:29 +00:00
nifi
7aeb206840 Added isinfinite to uip_ds6_defrt_t to handle infinite life time 2010-05-10 13:46:35 +00:00
joxe
058ef029e4 replaced hardcoded value with constant for route lifetime 2010-05-10 11:16:35 +00:00
joxe
c0c7cea3ce fixed bug that caused select_src to set a non legal address - now sets unspecified if no address found 2010-05-10 11:10:27 +00:00
joxe
6f66d36d67 avoid sending DAO when address is tentative 2010-05-09 19:12:47 +00:00
joxe
adb00ed932 factored out function for getting link local address in ds6 and made use of it in rpl for checking state of lladdress as DIOs should not be sent when tentative 2010-05-09 17:52:37 +00:00
oliverschmidt
e5665fb968 The recent change turning uip_buf from an array to a pointer seems a quite heavyweight way to have the uip_buf alligned to a 32-bit boundary. Contiki is - still - supposed to be portable across a wide range of toolchains - therefore it i.e. intentionally doesn't use C99 features. From that perspective it seems questionable if all toolchains are able to optimize away the overhead imposed by an "unnecessary" indirection to access uip_buf - and uIP consists mostly of accesses to uip_buf. Even if the future is supposed to bring support for multiple uip_bufs which would turn the uip_buf pointer from a mere workaround to an neceesary element on can still presume that there will be targets with resources limited in a way prohibiting the use of several uip_bufs. So at least for those targets will still be a usecase for a "plain", not indirected uip_buf.
Therefore it seems reasonable to allow to stay with the "plain" uip_buf at compile-time.
2010-05-08 07:23:55 +00:00
oliverschmidt
dec19626e8 Adjusted UIP_CONF_EXTERNAL_BUFFER to apply to actual buffer only. 2010-05-07 20:45:16 +00:00
fros4943
bc0ea1f81d bug fix: dag pointer may be NULL 2010-05-07 13:51:34 +00:00
joxe
cd5dfa9692 added const for the uip_buf pointer for more efficient and smaller uip code and fixed same construct for the sicslowpan code 2010-05-05 13:07:45 +00:00
nvt-se
e4187b2fc8 Made pointers constant and thereby reduced the code size slightly. 2010-05-05 12:35:39 +00:00
nvt-se
361e210751 Improvements to style and commentary. 2010-05-04 22:55:32 +00:00
joxe
01881f92a8 added missing include 2010-05-04 14:41:55 +00:00
joxe
790819e701 allocate uip_buf as uint32_t to avoid risk for unaligned uip_buf on 32 or 16 bit architectures 2010-05-04 09:19:41 +00:00
joxe
7d235841b3 always include the RPL route state to allow compilation of rpl code 2010-05-03 14:12:03 +00:00
nifi
6c86398778 Added check to not copy or create too large packets 2010-05-02 14:59:11 +00:00
nifi
a04372adc4 Fixed conversion of packetbuf address type to address index and corrected return value 2010-05-02 12:21:34 +00:00
joxe
f72bd5572c added initialization of RPL 2010-05-01 13:04:31 +00:00
joxe
0531d9bd82 moved RPL routing state struct into uip-ds6 2010-05-01 12:02:25 +00:00
nvt-se
9a4a9b9437 Removed return value in function that should not return a value. 2010-04-30 23:13:58 +00:00
nvt-se
ecada2d1ac *** empty log message *** 2010-04-30 23:10:45 +00:00
nvt-se
b8a3a4109e Adjusted the code so as to remove compilation warnings. 2010-04-30 22:18:12 +00:00
nvt-se
b822dbb25e Addressed compilation warnings. 2010-04-30 15:04:47 +00:00
nvt-se
4106f4d798 Increased minimum DIO interval from 1024 ms to 4096 ms in order to more calm in duty-cycled networks. 2010-04-30 15:03:55 +00:00
joxe
168a65d989 added ContikiRPL - an implementation of IETF ROLL RPL 2010-04-30 13:43:53 +00:00
joxe
167b0d636e added icmp_send function and moved rpl input function signature 2010-04-30 13:22:21 +00:00
joxe
dc1a5f70ff added uip-debug utilities 2010-04-30 13:20:57 +00:00
nvt-se
7e0e2fe284 Removed obsolete rime-route code for IPv6 2010-04-30 12:43:37 +00:00
joxe
cc9914a4f3 fixed uip to use UDP_BUF instead of TCP_BUF when setting udp ports - minor cleanup 2010-04-30 08:46:27 +00:00
adamdunkels
3d10dedecf Added a safety measure against a problem where a node in rare situations would turn itself into a sink. Not entirely sure why this happens, but the safety measure should at least avoid the results of the problem. Added more debug messages. 2010-04-30 07:33:51 +00:00
adamdunkels
0859d4b95f Avoid turning off the radio in the middle of a packet reception 2010-04-30 07:32:39 +00:00
adamdunkels
e606c674c2 Rewrote LPP so that it uses 802.15.4 headers. A number of bugfixes with respect to alignment. Avoid turning off the radio in the middle of packet reception. 2010-04-30 07:31:44 +00:00
adamdunkels
55b6129bd2 Debug printout fix 2010-04-30 07:29:31 +00:00
adamdunkels
e523c36cdf Removed the (unused) header packet of the queuebuf. Added a function for accessing address attributes in the queuebuf 2010-04-30 07:29:08 +00:00
adamdunkels
3c735fcea4 Added a packetbuf flag that indicates if the link layer acks should be used or not 2010-04-30 07:25:51 +00:00
adamdunkels
798f1c63bd Make it possible to receive multicast UDP packets 2010-04-30 07:19:33 +00:00
adamdunkels
a1f69138d1 Avoid adding elements twice 2010-04-30 07:18:24 +00:00
fros4943
18e5718c97 avoid freeing queuebuf multiple times, and free buffer after cancelling connection 2010-04-27 13:08:55 +00:00
fros4943
12b6f35ce7 PRINTF()ed debugging output 2010-04-27 12:56:35 +00:00
nifi
85d6f6c514 removed unused variable 2010-04-26 22:41:50 +00:00
nifi
875ad7ffda Fixed to not change the header if the header allocation fails 2010-04-26 22:05:40 +00:00
nifi
b26f45a35b code cleanup 2010-04-26 17:55:11 +00:00
nifi
d761b6e89a Added MAC header to handle padding 2010-04-26 17:46:21 +00:00
fros4943
ce1374087b allow elf loader memory configuration at compile time 2010-04-26 14:02:07 +00:00
nifi
14b1bb9f57 Fixed to only use leds when DEBUG is set 2010-04-20 11:41:16 +00:00
nvt-se
f9ca4a546d Introduced append-only mode for systems with little available code space left, but which require basic FS support. Removes about 1.5kB ROM when the mode is enabled, i.e., COFFEE_CONF_APPEND_ONLY=1 2010-04-12 13:20:55 +00:00
nvt-se
2e5d97366a ensure matching format and type in debug printf 2010-04-09 16:21:07 +00:00
adamdunkels
3670fac618 Bugfix: timing fixed 2010-04-08 18:23:24 +00:00
adamdunkels
f2bf8965d5 MAC sequence number attribute 2010-04-08 09:46:30 +00:00
adamdunkels
91ff8574ad Improved handling of duplicate packets 2010-04-08 09:32:56 +00:00
nvt-se
ac4ba199bc Turn off DEBUG mode by default. 2010-04-06 21:37:54 +00:00
anthony-a
694e1498f4 merge change from branch into mainline. <fingers crossed> 2010-04-06 19:10:21 +00:00
nvt-se
75dd41601b Added a macro for checking if an address is link local. 2010-04-06 16:47:18 +00:00
adamdunkels
497111bcc9 Added an optional rate limit for broadcast transmissions 2010-04-06 11:57:43 +00:00
adamdunkels
e06a30fdb0 Added MAC-layer duplicate message suppression, which is very helpful when running with duty cycling turned off 2010-04-05 19:28:07 +00:00
adamdunkels
c68ee6e577 Bugfix: memory from the wrong memb was freed. 2010-04-04 21:02:09 +00:00
adamdunkels
a4c328785a Small timing tweaks 2010-04-04 21:01:24 +00:00