Commit graph

970 commits

Author SHA1 Message Date
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
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
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
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
adamdunkels 18e31f33b9 Minor tweaks. Removed debug output from CVS. 2010-09-14 06:48:36 +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 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
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
dak664 12479c32bc Fix compiler warnings 2010-08-01 21:18:07 +00:00
nvt-se 11760059d3 The second predicate is not needed. 2010-07-03 23:52:02 +00:00
nvt-se 007d4a4001 Improved logic for processing DIOs 2010-06-28 14:51:23 +00:00
nifi 30db4eff52 Made QUEUEBUF_STATS configurable 2010-06-24 09:48:21 +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
nifi 01b1359b1f removed unused (and slightly problematic) code 2010-06-15 14:19: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 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
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 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