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

Fix and cleanup RPL ext header handling

Browse source
This commit is contained in:
Simon Duquennoy 2016-06-13 12:04:19 +02:00
parent e584a54608
commit d73b229624
3 changed files with 68 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/net/ipv6/uip6.c
View file

@ -890,7 +890,7 @@ ext_hdr_options_process(void)
*/
#if UIP_CONF_IPV6_RPL
PRINTF("Processing RPL option\n");
if(rpl_verify_hbh_header(uip_ext_opt_offset)) {
if(!rpl_verify_hbh_header(uip_ext_opt_offset)) {
PRINTF("RPL Option Error: Dropping Packet\n");
return 1;
}
@ -1228,14 +1228,6 @@ uip_process(uint8_t flag)
goto send;
}
#if UIP_CONF_IPV6_RPL
if(!rpl_update_header()) {
/* Packet can not be forwarded */
PRINTF("RPL header update error\n");
goto drop;
}
#endif /* UIP_CONF_IPV6_RPL */
UIP_IP_BUF->ttl = UIP_IP_BUF->ttl - 1;
PRINTF("Forwarding packet to ");
PRINT6ADDR(&UIP_IP_BUF->destipaddr);