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
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
nvt
3860e798ac
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-03-05 01:49:55 +01: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
5a65e3cc8b
tuned RPL parameters and improved calculation of path etx
2012-02-21 19:06:58 +01:00
Joakim Eriksson
2752337e69
fixed lollipop counter
2012-02-21 13:20:20 +01: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
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
Joakim Eriksson
6ee05f4a2d
fixed loop detection bug in RPL
2012-01-13 05:37:30 -08: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
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
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
7c808081d6
Coding style
2011-11-23 14:36:50 +01:00
nvt
e11b7d4fb6
Removed redundant code
2011-11-22 14:18:32 +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
Joakim Eriksson
2a94b3ce82
added debug callbacks
2011-10-27 12:32:16 +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
Joakim Eriksson
ab049ec704
some fixes to cut some extension headers before TCP processing
2011-09-22 17:22:59 +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
644f1c627d
Initialize the DIO object in case options are missing. Updated the terminology regarding options.
2011-09-05 20:28:50 +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
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
4f76130a77
Changed Instance structure in order to decrease memory waste.
2011-07-13 10:28:56 +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
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
nvt
15ee0a6414
Send No-Path DAOs correctly.
2011-05-03 17:50:24 +02:00
nvt
4b5d380c74
Announce MAX_PATH_COST if we don't have a preferred parent.
2011-04-25 22:37:25 +02:00
Joakim Eriksson
02fcf5835a
fixed RPL to handle inifinite rank better
2011-04-07 17:44:07 +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
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
65366d10c1
Update the metric container correctly. Use only one ETX initializer.
2011-03-16 13:29:01 +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
nvt
a7addf990f
Avoid hysteresis check if neither p1 nor p2 is the preferred parent.
2011-03-04 16:40:40 +01:00
Joakim Eriksson
fa0fbf5dab
fixed format of transit subopt
2011-03-01 12:33:34 +01: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
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
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
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
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
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
Joakim Eriksson
d24c63c0f1
fixed so that minhoprankinc is configurable
2011-02-10 19:44:12 +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
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
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
nvt-se
8f76c82433
Improved DAO management.
2010-12-17 15:24:25 +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
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
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
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
dak664
f34e5ec798
Convert implicit printf to PRINTF
2010-12-04 21:06:04 +00:00
adamdunkels
9750eb93bf
Turn off debug messages
2010-11-03 15:41:23 +00:00
joxe
9a1f902881
made rank use full resolution when using OF-ETX
2010-10-28 20:39:06 +00:00
nifi
25ceab07d2
Update annotation when removing preferred parent.
2010-10-27 12:27:57 +00:00
