deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added support for multiple objective functions.

Browse source 
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.
This commit is contained in:
nvt-se 2010-05-29 22:23:21 +00:00
parent f6e0b46f38
commit f135105567
8 changed files with 172 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/net/rpl/rpl-of0.c
View file

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rpl-of0.c,v 1.2 2010/05/25 21:58:54 nvt-se Exp $
* $Id: rpl-of0.c,v 1.3 2010/05/29 22:23:21 nvt-se Exp $
*/
/**
* \file
@ -50,6 +50,7 @@ static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);
static rpl_rank_t increment_rank(rpl_rank_t, rpl_parent_t *);
rpl_of_t rpl_of0 = {
NULL,
best_parent,
increment_rank,
0
@ -82,7 +83,6 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
PRINTF(" (confidence %d, rank %d)\n",
p2->local_confidence, p2->rank);
/* TODO: Add other rules. */
if(p1->local_confidence > p2->local_confidence) {
return p1;
} else if(p2->local_confidence > p1->local_confidence) {