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

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.

Browse source
This commit is contained in:
nvt 2011-02-15 01:13:30 +01:00
parent 20bf23cf06
commit a093c262ee
6 changed files with 164 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@
#include "net/rpl/rpl-private.h"
#define DEBUG DEBUG_ANNOTATE
#define DEBUG DEBUG_NONE
#include "net/uip-debug.h"
#include "net/neighbor-info.h"
@ -49,12 +49,14 @@
static void reset(rpl_dag_t *);
static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);
static rpl_rank_t calculate_rank(rpl_parent_t *, rpl_rank_t);
static void update_metric_container(rpl_dag_t *);
rpl_of_t rpl_of0 = {
reset,
NULL,
best_parent,
calculate_rank,
update_metric_container,
0
};
@ -123,3 +125,9 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
return p2;
}
}
static void
update_metric_container(rpl_dag_t *dag)
{
dag->mc.type = RPL_DAG_MC_NONE;
}