From 13f18fd842bf93223fb54481a3e6d5bdef921f1c Mon Sep 17 00:00:00 2001 From: Yasuyuki Tanaka Date: Mon, 27 Jun 2016 20:57:48 +0200 Subject: [PATCH] RPL: update uip_ext_len whenever moving to next header (rpl-ext-header.c) --- core/net/rpl/rpl-ext-header.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c index b13adb916..e7f6428a3 100644 --- a/core/net/rpl/rpl-ext-header.c +++ b/core/net/rpl/rpl-ext-header.c @@ -199,10 +199,8 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr) case UIP_PROTO_DESTO: case UIP_PROTO_FRAG: /* 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_ext_len += (UIP_EXT_BUF->len << 3) + 8; break; default: uip_next_hdr = NULL; @@ -248,10 +246,8 @@ rpl_process_srh_header(void) case UIP_PROTO_DESTO: case UIP_PROTO_FRAG: /* 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_ext_len += (UIP_EXT_BUF->len << 3) + 8; break; default: uip_next_hdr = NULL; @@ -679,10 +675,8 @@ rpl_remove_header(void) * UIP_PROTO_DESTO. Otherwise, we'll return. */ /* 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_ext_len += (UIP_EXT_BUF->len << 3) + 8; default: return; }