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

basic support for parsing metric containers in DIOs

Browse source
This commit is contained in:
nvt 2011-02-13 23:17:56 +01:00
parent 539ff33104
commit cbe4513bf4
2 changed files with 74 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/net/rpl/rpl-icmp6.c
View file

@ -237,12 +237,20 @@ dio_input(void)
} }
switch(subopt_type) { switch(subopt_type) {
case RPL_DIO_SUBOPT_DAG_MC: case RPL_DIO_SUBOPT_DAG_METRIC_CONTAINER:
if(len < 7) { if(len < 6) {
PRINTF("RPL: Invalid DAG MC, len = %d\n", len); PRINTF("RPL: Invalid DAG MC, len = %d\n", len);
RPL_STAT(rpl_stats.malformed_msgs++); RPL_STAT(rpl_stats.malformed_msgs++);
return; return;
} }
dio.metric_container.type = buffer[i + 2];
dio.metric_container.flags = buffer[i + 3];
dio.metric_container.aggr = buffer[i + 4] >> 4;
dio.metric_container.prec = buffer[i + 4] & 0xf;
dio.metric_container.length = buffer[i + 5];
if(dio.metric_container.type == RPL_DAG_MC_ETX) {
dio.metric_container.etx.etx = buffer[i + 6];
}
break; break;
case RPL_DIO_SUBOPT_ROUTE_INFO: case RPL_DIO_SUBOPT_ROUTE_INFO:
if(len < 9) { if(len < 9) {
@ -250,6 +258,7 @@ dio_input(void)
RPL_STAT(rpl_stats.malformed_msgs++); RPL_STAT(rpl_stats.malformed_msgs++);
return; return;
} }
/* flags is both preference and flags for now */ /* flags is both preference and flags for now */
dio.destination_prefix.length = buffer[i + 2]; dio.destination_prefix.length = buffer[i + 2];
dio.destination_prefix.flags = buffer[i + 3]; dio.destination_prefix.flags = buffer[i + 3];
@ -268,6 +277,12 @@ dio_input(void)
break; break;
case RPL_DIO_SUBOPT_DAG_CONF: case RPL_DIO_SUBOPT_DAG_CONF:
if(len != 16) {
PRINTF("RPL: Invalid DAG configuration option, len = %d\n", len);
RPL_STAT(rpl_stats.malformed_msgs++);
return;
}
/* Path control field not yet implemented - at i + 2 */ /* Path control field not yet implemented - at i + 2 */
dio.dag_intdoubl = buffer[i + 3]; dio.dag_intdoubl = buffer[i + 3];
dio.dag_intmin = buffer[i + 4]; dio.dag_intmin = buffer[i + 4];

79
core/net/rpl/rpl-private.h
View file

@ -52,6 +52,7 @@
#include "sys/ctimer.h" #include "sys/ctimer.h"
#include "net/uip-ds6.h" #include "net/uip-ds6.h"
/*---------------------------------------------------------------------------*/
/** \brief Is IPv6 address a the link local all rpl nodes multicast address */ /** \brief Is IPv6 address a the link local all rpl nodes multicast address */
#define uip_is_addr_linklocal_rplnodes_mcast(a) \ #define uip_is_addr_linklocal_rplnodes_mcast(a) \
((((a)->u8[0]) == 0xff) && \ ((((a)->u8[0]) == 0xff) && \
@ -67,32 +68,30 @@
/** \brief set IP address a to the link local all-rpl nodes multicast address */ /** \brief set IP address a to the link local all-rpl nodes multicast address */
#define uip_create_linklocal_rplnodes_mcast(a) uip_ip6addr(a, 0xff02, 0, 0, 0, 0, 0, 0, 0x001a) #define uip_create_linklocal_rplnodes_mcast(a) uip_ip6addr(a, 0xff02, 0, 0, 0, 0, 0, 0, 0x001a)
/*---------------------------------------------------------------------------*/
/* The RPL Codes for the message types */ /* RPL message types */
#define RPL_CODE_DIS 0 /* DIS message */ #define RPL_CODE_DIS 0x00 /* DAG Information Solicitation */
#define RPL_CODE_DIO 1 /* DIO message */ #define RPL_CODE_DIO 0x01 /* DAG Information Option */
#define RPL_CODE_DAO 2 /* DAO message */ #define RPL_CODE_DAO 0x02 /* Destination Advertisement Option */
#define RPL_CODE_DAO_ACK 3 /* DAO ACK message */ #define RPL_CODE_DAO_ACK 0x03 /* DAO acknowledgment */
#define RPL_CODE_SEC_DIS 0x80 /* Secure DIS */
#define RPL_CODE_SEC_DIS 0x80 /* DIS message */ #define RPL_CODE_SEC_DIO 0x81 /* Secure DIO */
#define RPL_CODE_SEC_DIO 0x81 /* DIO message */ #define RPL_CODE_SEC_DAO 0x82 /* Secure DAO */
#define RPL_CODE_SEC_DAO 0x82 /* DAO message */ #define RPL_CODE_SEC_DAO_ACK 0x83 /* Secure DAO ACK */
#define RPL_CODE_SEC_DAO_ACK 0x83 /* DAO ACK message */
/* RPL DIO/DAO suboption types */ /* RPL DIO/DAO suboption types */
#define RPL_DIO_SUBOPT_PAD1 0 /* Pad1 */ #define RPL_DIO_SUBOPT_PAD1 0
#define RPL_DIO_SUBOPT_PADN 1 /* PadN */ #define RPL_DIO_SUBOPT_PADN 1
#define RPL_DIO_SUBOPT_DAG_MC 2 /* DAG metric container */ #define RPL_DIO_SUBOPT_DAG_METRIC_CONTAINER 2
#define RPL_DIO_SUBOPT_ROUTE_INFO 3 /* Route information */ #define RPL_DIO_SUBOPT_ROUTE_INFO 3
#define RPL_DIO_SUBOPT_DAG_CONF 4 /* DAG configuration */ #define RPL_DIO_SUBOPT_DAG_CONF 4
#define RPL_DIO_SUBOPT_TARGET 5 /* Target */ #define RPL_DIO_SUBOPT_TARGET 5
#define RPL_DIO_SUBOPT_TRANSIT 6 /* Transit information */ #define RPL_DIO_SUBOPT_TRANSIT 6
#define RPL_DIO_SUBOPT_SOLICITED_INFO 7 /* Solicited information */ #define RPL_DIO_SUBOPT_SOLICITED_INFO 7
#define RPL_DIO_SUBOPT_PREFIX_INFO 8 /* Prefix information option */ #define RPL_DIO_SUBOPT_PREFIX_INFO 8
#define RPL_DAO_K_FLAG 0x80 /* DAO ACK requested */ #define RPL_DAO_K_FLAG 0x80 /* DAO ACK requested */
#define RPL_DAO_D_FLAG 0x40 /* DODAG ID Present */ #define RPL_DAO_D_FLAG 0x40 /* DODAG ID Present */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Default values for RPL constants and variables. */ /* Default values for RPL constants and variables. */
@ -169,6 +168,25 @@
#define RPL_DAG_MC_ETX 7 /* Expected Transmission Count */ #define RPL_DAG_MC_ETX 7 /* Expected Transmission Count */
#define RPL_DAG_MC_LC 8 /* Link Color */ #define RPL_DAG_MC_LC 8 /* Link Color */
/* DAG Metric Container flags. */
#define RPL_DAG_MC_FLAG_P 0x8
#define RPL_DAG_MC_FLAG_C 0x4
#define RPL_DAG_MC_FLAG_O 0x2
#define RPL_DAG_MC_FLAG_R 0x1
/* DAG Metric Container aggregation mode. */
#define RPL_DAG_MC_AGGR_ADDITIVE 0
#define RPL_DAG_MC_AGGR_MAXIMUM 1
#define RPL_DAG_MC_AGGR_MINIMUM 2
#define RPL_DAG_MC_AGGR_MULTIPLICATIVE 3
/*
* The ETX in the metric container is expressed as a fixed-point value
* whose integer part can be obtained by dividing the value by
* RPL_DAG_MC_ETX_DIVISOR.
*/
#define RPL_DAG_MC_ETX_DIVISOR 128
/* DIS related */ /* DIS related */
#define RPL_DIS_SEND 1 #define RPL_DIS_SEND 1
#ifdef RPL_DIS_INTERVAL_CONF #ifdef RPL_DIS_INTERVAL_CONF
@ -178,6 +196,23 @@
#endif #endif
#define RPL_DIS_START_DELAY 5 #define RPL_DIS_START_DELAY 5
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Logical representation of an ETX object in a DAG Metric Container. */
struct rpl_metric_object_etx {
uint16_t etx;
};
/* Logical representation of a DAG Metric Container. */
struct rpl_metric_container {
uint8_t type;
uint8_t flags;
uint8_t aggr;
uint8_t prec;
uint8_t length;
/* Once we support more objects, the etx field will be replaced by a
union of those. */
struct rpl_metric_object_etx etx;
};
/* Logical representation of a DAG Information Object (DIO.) */ /* Logical representation of a DAG Information Object (DIO.) */
struct rpl_dio { struct rpl_dio {
uip_ipaddr_t dag_id; uip_ipaddr_t dag_id;
@ -198,8 +233,8 @@ struct rpl_dio {
rpl_rank_t dag_min_hoprankinc; rpl_rank_t dag_min_hoprankinc;
rpl_prefix_t destination_prefix; rpl_prefix_t destination_prefix;
rpl_prefix_t prefix_info; rpl_prefix_t prefix_info;
struct rpl_metric_container metric_container;
}; };
typedef struct rpl_dio rpl_dio_t; typedef struct rpl_dio rpl_dio_t;
#if RPL_CONF_STATS #if RPL_CONF_STATS