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

Sender rank in Hop-by-Hop option has inverted bytes

Browse source
This commit is contained in:
Laurent Deru 2014-01-22 12:16:27 +01:00
parent 43731dbb68
commit b6742e5eb5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/net/rpl/rpl-ext-header.c
View file

@ -68,6 +68,7 @@ rpl_verify_header(int uip_ext_opt_offset)
{ {
rpl_instance_t *instance; rpl_instance_t *instance;
int down; int down;
uint16_t sender_rank;
uint8_t sender_closer; uint8_t sender_closer;
uip_ds6_route_t *route; uip_ds6_route_t *route;
@ -117,17 +118,18 @@ rpl_verify_header(int uip_ext_opt_offset)
down = 1; down = 1;
} }
sender_closer = UIP_EXT_HDR_OPT_RPL_BUF->senderrank < instance->current_dag->rank; sender_rank = UIP_HTONS(UIP_EXT_HDR_OPT_RPL_BUF->senderrank);
sender_closer = sender_rank < instance->current_dag->rank;
PRINTF("RPL: Packet going %s, sender closer %d (%d < %d)\n", down == 1 ? "down" : "up", PRINTF("RPL: Packet going %s, sender closer %d (%d < %d)\n", down == 1 ? "down" : "up",
sender_closer, sender_closer,
UIP_EXT_HDR_OPT_RPL_BUF->senderrank, sender_rank,
instance->current_dag->rank instance->current_dag->rank
); );
if((down && !sender_closer) || (!down && sender_closer)) { if((down && !sender_closer) || (!down && sender_closer)) {
PRINTF("RPL: Loop detected - senderrank: %d my-rank: %d sender_closer: %d\n", PRINTF("RPL: Loop detected - senderrank: %d my-rank: %d sender_closer: %d\n",
UIP_EXT_HDR_OPT_RPL_BUF->senderrank, instance->current_dag->rank, sender_rank, instance->current_dag->rank,
sender_closer); sender_closer);
if(UIP_EXT_HDR_OPT_RPL_BUF->flags & RPL_HDR_OPT_RANK_ERR) { if(UIP_EXT_HDR_OPT_RPL_BUF->flags & RPL_HDR_OPT_RANK_ERR) {
PRINTF("RPL: Rank error signalled in RPL option!\n"); PRINTF("RPL: Rank error signalled in RPL option!\n");
@ -210,7 +212,7 @@ rpl_update_header_empty(void)
switch(UIP_EXT_HDR_OPT_BUF->type) { switch(UIP_EXT_HDR_OPT_BUF->type) {
case UIP_EXT_HDR_OPT_RPL: case UIP_EXT_HDR_OPT_RPL:
PRINTF("RPL: Updating RPL option\n"); PRINTF("RPL: Updating RPL option\n");
UIP_EXT_HDR_OPT_RPL_BUF->senderrank = instance->current_dag->rank; UIP_EXT_HDR_OPT_RPL_BUF->senderrank = UIP_HTONS(instance->current_dag->rank);
/* Check the direction of the down flag, as per Section 11.2.2.3, /* Check the direction of the down flag, as per Section 11.2.2.3,
which states that if a packet is going down it should in which states that if a packet is going down it should in
@ -276,7 +278,7 @@ rpl_update_header_final(uip_ipaddr_t *addr)
UIP_EXT_HDR_OPT_RPL_BUF->flags = RPL_HDR_OPT_DOWN; UIP_EXT_HDR_OPT_RPL_BUF->flags = RPL_HDR_OPT_DOWN;
} }
UIP_EXT_HDR_OPT_RPL_BUF->instance = default_instance->instance_id; UIP_EXT_HDR_OPT_RPL_BUF->instance = default_instance->instance_id;
UIP_EXT_HDR_OPT_RPL_BUF->senderrank = default_instance->current_dag->rank; UIP_EXT_HDR_OPT_RPL_BUF->senderrank = UIP_HTONS(default_instance->current_dag->rank);
uip_ext_len = last_uip_ext_len; uip_ext_len = last_uip_ext_len;
} }
} }
@ -334,7 +336,7 @@ rpl_invert_header(void)
PRINTF("RPL: Updating RPL option (switching direction)\n"); PRINTF("RPL: Updating RPL option (switching direction)\n");
UIP_EXT_HDR_OPT_RPL_BUF->flags &= RPL_HDR_OPT_DOWN; UIP_EXT_HDR_OPT_RPL_BUF->flags &= RPL_HDR_OPT_DOWN;
UIP_EXT_HDR_OPT_RPL_BUF->flags ^= RPL_HDR_OPT_DOWN; UIP_EXT_HDR_OPT_RPL_BUF->flags ^= RPL_HDR_OPT_DOWN;
UIP_EXT_HDR_OPT_RPL_BUF->senderrank = rpl_get_instance(UIP_EXT_HDR_OPT_RPL_BUF->instance)->current_dag->rank; UIP_EXT_HDR_OPT_RPL_BUF->senderrank = UIP_HTONS(rpl_get_instance(UIP_EXT_HDR_OPT_RPL_BUF->instance)->current_dag->rank);
uip_ext_len = last_uip_ext_len; uip_ext_len = last_uip_ext_len;
return RPL_HOP_BY_HOP_LEN; return RPL_HOP_BY_HOP_LEN;
default: default: