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

RPL: update uip_ext_len whenever moving to next header (rpl-ext-header.c)

Browse source
This commit is contained in:
Yasuyuki Tanaka 2016-06-27 20:57:48 +02:00
parent 5a79bad4b1
commit 13f18fd842
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,10 +199,8 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
case UIP_PROTO_DESTO: case UIP_PROTO_DESTO:
case UIP_PROTO_FRAG: case UIP_PROTO_FRAG:
/* Move to next header */ /* Move to next header */
if(uip_next_hdr != &UIP_IP_BUF->proto) {
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
}
uip_next_hdr = &UIP_EXT_BUF->next; uip_next_hdr = &UIP_EXT_BUF->next;
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
break; break;
default: default:
uip_next_hdr = NULL; uip_next_hdr = NULL;
@ -248,10 +246,8 @@ rpl_process_srh_header(void)
case UIP_PROTO_DESTO: case UIP_PROTO_DESTO:
case UIP_PROTO_FRAG: case UIP_PROTO_FRAG:
/* Move to next header */ /* Move to next header */
if(uip_next_hdr != &UIP_IP_BUF->proto) {
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
}
uip_next_hdr = &UIP_EXT_BUF->next; uip_next_hdr = &UIP_EXT_BUF->next;
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
break; break;
default: default:
uip_next_hdr = NULL; uip_next_hdr = NULL;
@ -679,10 +675,8 @@ rpl_remove_header(void)
* UIP_PROTO_DESTO. Otherwise, we'll return. * UIP_PROTO_DESTO. Otherwise, we'll return.
*/ */
/* Move to next header */ /* Move to next header */
if(uip_next_hdr != &UIP_IP_BUF->proto) {
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
}
uip_next_hdr = &UIP_EXT_BUF->next; uip_next_hdr = &UIP_EXT_BUF->next;
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
default: default:
return; return;
} }