Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

RPL: code cleanup (rpl-ext-header.c)

Browse Source
This commit is contained in:
Yasuyuki Tanaka 2016-06-27 20:57:48 +02:00
parent 13f18fd842
commit ffdc53718d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/net/rpl/rpl-ext-header.c
View File

@ -154,8 +154,8 @@ rpl_verify_hbh_header(int uip_ext_opt_offset)
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",
sender_rank, instance->current_dag->rank, sender_rank, instance->current_dag->rank,
sender_closer); sender_closer);
/* Attempt to repair the loop by sending a unicast DIO back to the sender /* Attempt to repair the loop by sending a unicast DIO back to the sender
* so that it gets a fresh update of our rank. */ * so that it gets a fresh update of our rank. */
if(sender != NULL) { if(sender != NULL) {
@ -197,7 +197,11 @@ rpl_srh_get_next_hop(uip_ipaddr_t *ipaddr)
switch(*uip_next_hdr) { switch(*uip_next_hdr) {
case UIP_PROTO_HBHO: case UIP_PROTO_HBHO:
case UIP_PROTO_DESTO: case UIP_PROTO_DESTO:
case UIP_PROTO_FRAG: /*
* As per RFC 2460, only the Hop-by-Hop Options header and
* Destination Options header can appear before the Routing
* header.
*/
/* Move to next header */ /* Move to next header */
uip_next_hdr = &UIP_EXT_BUF->next; uip_next_hdr = &UIP_EXT_BUF->next;
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8; uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;
@ -244,7 +248,11 @@ rpl_process_srh_header(void)
switch(*uip_next_hdr) { switch(*uip_next_hdr) {
case UIP_PROTO_HBHO: case UIP_PROTO_HBHO:
case UIP_PROTO_DESTO: case UIP_PROTO_DESTO:
case UIP_PROTO_FRAG: /*
* As per RFC 2460, only the Hop-by-Hop Options header and
* Destination Options header can appear before the Routing
* header.
*/
/* Move to next header */ /* Move to next header */
uip_next_hdr = &UIP_EXT_BUF->next; uip_next_hdr = &UIP_EXT_BUF->next;
uip_ext_len += (UIP_EXT_BUF->len << 3) + 8; uip_ext_len += (UIP_EXT_BUF->len << 3) + 8;