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

Merge pull request #1548 from simonduq/pr/traceroute

Browse source 
uip6, icmp6 and ext header handling fixes: traceroute now working!
This commit is contained in:
Nicolas Tsiftes 2016-03-11 14:14:26 +01:00
parent f5ea8e613e 3fa25eac8c
commit c476194004
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/net/ipv6/uip-icmp6.c
View file

@ -206,23 +206,22 @@ echo_request_input(void)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) { uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) {
/* check if originating packet is not an ICMP error */
/* check if originating packet is not an ICMP error*/ if(uip_ext_len) {
if (uip_ext_len) { if(UIP_EXT_BUF->next == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128) {
if(UIP_EXT_BUF->next == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128){
uip_clear_buf(); uip_clear_buf();
return; return;
} }
} else { } else {
if(UIP_IP_BUF->proto == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128){ if(UIP_IP_BUF->proto == UIP_PROTO_ICMP6 && UIP_ICMP_BUF->type < 128) {
uip_clear_buf(); uip_clear_buf();
return; return;
} }
} }
#if UIP_CONF_IPV6_RPL #if UIP_CONF_IPV6_RPL
uip_ext_len = rpl_invert_header(); rpl_remove_header();
#else /* UIP_CONF_IPV6_RPL */ #else
uip_ext_len = 0; uip_ext_len = 0;
#endif /* UIP_CONF_IPV6_RPL */ #endif /* UIP_CONF_IPV6_RPL */
@ -231,8 +230,9 @@ uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) {
uip_len += UIP_IPICMPH_LEN + UIP_ICMP6_ERROR_LEN; uip_len += UIP_IPICMPH_LEN + UIP_ICMP6_ERROR_LEN;
if(uip_len > UIP_LINK_MTU) if(uip_len > UIP_LINK_MTU) {
uip_len = UIP_LINK_MTU; uip_len = UIP_LINK_MTU;
}
memmove((uint8_t *)UIP_ICMP6_ERROR_BUF + uip_ext_len + UIP_ICMP6_ERROR_LEN, memmove((uint8_t *)UIP_ICMP6_ERROR_BUF + uip_ext_len + UIP_ICMP6_ERROR_LEN,
(void *)UIP_IP_BUF, uip_len - UIP_IPICMPH_LEN - uip_ext_len - UIP_ICMP6_ERROR_LEN); (void *)UIP_IP_BUF, uip_len - UIP_IPICMPH_LEN - uip_ext_len - UIP_ICMP6_ERROR_LEN);
@ -280,6 +280,10 @@ uip_icmp6_error_output(uint8_t type, uint8_t code, uint32_t param) {
UIP_ICMP_BUF->icmpchksum = 0; UIP_ICMP_BUF->icmpchksum = 0;
UIP_ICMP_BUF->icmpchksum = ~uip_icmp6chksum(); UIP_ICMP_BUF->icmpchksum = ~uip_icmp6chksum();
#if UIP_CONF_IPV6_RPL
rpl_insert_header();
#endif /* UIP_CONF_IPV6_RPL */
UIP_STAT(++uip_stat.icmp.sent); UIP_STAT(++uip_stat.icmp.sent);
PRINTF("Sending ICMPv6 ERROR message type %d code %d to ", type, code); PRINTF("Sending ICMPv6 ERROR message type %d code %d to ", type, code);

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

@ -1473,6 +1473,7 @@ uip_process(uint8_t flag)
udp_input: udp_input:
remove_ext_hdr(); remove_ext_hdr();
UIP_IP_BUF->proto = UIP_PROTO_UDP;
PRINTF("Receiving UDP packet\n"); PRINTF("Receiving UDP packet\n");
@ -1481,8 +1482,6 @@ uip_process(uint8_t flag)
work. If the application sets uip_slen, it has a packet to work. If the application sets uip_slen, it has a packet to
send. */ send. */
#if UIP_UDP_CHECKSUMS #if UIP_UDP_CHECKSUMS
uip_len = uip_len - UIP_IPUDPH_LEN;
uip_appdata = &uip_buf[UIP_IPUDPH_LEN + UIP_LLH_LEN];
/* XXX hack: UDP/IPv6 receivers should drop packets with UDP /* XXX hack: UDP/IPv6 receivers should drop packets with UDP
checksum 0. Here, we explicitly receive UDP packets with checksum checksum 0. Here, we explicitly receive UDP packets with checksum
0. This is to be able to debug code that for one reason or 0. This is to be able to debug code that for one reason or
@ -1495,8 +1494,6 @@ uip_process(uint8_t flag)
uip_udpchksum()); uip_udpchksum());
goto drop; goto drop;
} }
#else /* UIP_UDP_CHECKSUMS */
uip_len = uip_len - UIP_IPUDPH_LEN;
#endif /* UIP_UDP_CHECKSUMS */ #endif /* UIP_UDP_CHECKSUMS */
/* Make sure that the UDP destination port number is not zero. */ /* Make sure that the UDP destination port number is not zero. */
@ -1528,17 +1525,15 @@ uip_process(uint8_t flag)
PRINTF("udp: no matching connection found\n"); PRINTF("udp: no matching connection found\n");
UIP_STAT(++uip_stat.udp.drop); UIP_STAT(++uip_stat.udp.drop);
#if UIP_UDP_SEND_UNREACH_NOPORT
uip_icmp6_error_output(ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); uip_icmp6_error_output(ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
goto send; goto send;
#else
goto drop;
#endif
udp_found: udp_found:
PRINTF("In udp_found\n"); PRINTF("In udp_found\n");
UIP_STAT(++uip_stat.udp.recv); UIP_STAT(++uip_stat.udp.recv);
uip_len = uip_len - UIP_IPUDPH_LEN;
uip_appdata = &uip_buf[UIP_IPUDPH_LEN + UIP_LLH_LEN];
uip_conn = NULL; uip_conn = NULL;
uip_flags = UIP_NEWDATA; uip_flags = UIP_NEWDATA;
uip_sappdata = uip_appdata = &uip_buf[UIP_IPUDPH_LEN + UIP_LLH_LEN]; uip_sappdata = uip_appdata = &uip_buf[UIP_IPUDPH_LEN + UIP_LLH_LEN];
@ -1593,6 +1588,7 @@ uip_process(uint8_t flag)
tcp_input: tcp_input:
remove_ext_hdr(); remove_ext_hdr();
UIP_IP_BUF->proto = UIP_PROTO_TCP;
UIP_STAT(++uip_stat.tcp.recv); UIP_STAT(++uip_stat.tcp.recv);
PRINTF("Receiving TCP packet\n"); PRINTF("Receiving TCP packet\n");