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

added experimental support for disseminating autoconf prefix via DIO suboption

Browse source
This commit is contained in:
joxe 2010-05-25 19:19:43 +00:00
parent 8e619e991d
commit 34b8313fb6
3 changed files with 89 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/net/rpl/rpl-dag.c
View file

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rpl-dag.c,v 1.7 2010/05/24 16:38:56 nvt-se Exp $
* $Id: rpl-dag.c,v 1.8 2010/05/25 19:19:43 joxe Exp $
*/
/**
* \file
@ -44,6 +44,7 @@
#include "net/rpl/rpl.h"
#include "net/uip.h"
#include "net/uip-nd6.h"
#include "net/rime/ctimer.h"
#include "lib/list.h"
#include "lib/memb.h"
@ -162,6 +163,22 @@ rpl_set_root(uip_ipaddr_t *dag_id)
}
/************************************************************************/
int
rpl_set_prefix(rpl_dag_t *dag, uip_ipaddr_t *prefix, int len) {
if(len <= 128) {
memset(&dag->destination_prefix.prefix, 0, 16);
memcpy(&dag->destination_prefix.prefix, prefix, (len + 7)/ 8);
dag->destination_prefix.length = len;
/* Note: this is an experiment to see if RPL can be used for
prefix-assignment for RPL nodes - this flag is originally
intended for Router Advertisements */
dag->destination_prefix.preference = UIP_ND6_RA_FLAG_AUTONOMOUS;
PRINTF("RPL: Prefix set - will announce this in DIOs\n");
return 0;
}
return -1;
}
/************************************************************************/
int
rpl_set_default_route(rpl_dag_t *dag, uip_ipaddr_t *from)
{
if(dag->def_route != NULL) {
@ -423,6 +440,10 @@ join_dag(uip_ipaddr_t *from, rpl_dio_t *dio)
memcpy(&dag->dag_id, &dio->dag_id, sizeof(dio->dag_id));
/* copy prefix information into the dag */
memcpy(&dag->destination_prefix, &dio->destination_prefix,
sizeof(rpl_prefix_t));
rpl_join_dag(dag);
PRINTF("RPL: Joined DAG with instance ID %u, rank %hu, DAG ID ",