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

Merge pull request #1172 from tim-ist/tm_fix

Browse source 
[multicast] Do not forward every incoming TM ICMP
This commit is contained in:
George Oikonomou 2015-08-03 10:26:39 +01:00
parent ca5a4db919 b9aa88b504
commit cf4e191593
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/net/ipv6/multicast/roll-tm.c
View file

@ -1107,26 +1107,26 @@ icmp_input()
PRINT6ADDR(&UIP_IP_BUF->destipaddr); PRINT6ADDR(&UIP_IP_BUF->destipaddr);
PRINTF("\n"); PRINTF("\n");
ROLL_TM_STATS_ADD(icmp_bad); ROLL_TM_STATS_ADD(icmp_bad);
return; goto discard;
} }
if(!uip_is_addr_linklocal_allnodes_mcast(&UIP_IP_BUF->destipaddr) if(!uip_is_addr_linklocal_allnodes_mcast(&UIP_IP_BUF->destipaddr)
&& !uip_is_addr_linklocal_allrouters_mcast(&UIP_IP_BUF->destipaddr)) { && !uip_is_addr_linklocal_allrouters_mcast(&UIP_IP_BUF->destipaddr)) {
PRINTF("ROLL TM: ICMPv6 In, bad destination\n"); PRINTF("ROLL TM: ICMPv6 In, bad destination\n");
ROLL_TM_STATS_ADD(icmp_bad); ROLL_TM_STATS_ADD(icmp_bad);
return; goto discard;
} }
if(UIP_ICMP_BUF->icode != ROLL_TM_ICMP_CODE) { if(UIP_ICMP_BUF->icode != ROLL_TM_ICMP_CODE) {
PRINTF("ROLL TM: ICMPv6 In, bad ICMP code\n"); PRINTF("ROLL TM: ICMPv6 In, bad ICMP code\n");
ROLL_TM_STATS_ADD(icmp_bad); ROLL_TM_STATS_ADD(icmp_bad);
return; goto discard;
} }
if(UIP_IP_BUF->ttl != ROLL_TM_IP_HOP_LIMIT) { if(UIP_IP_BUF->ttl != ROLL_TM_IP_HOP_LIMIT) {
PRINTF("ROLL TM: ICMPv6 In, bad TTL\n"); PRINTF("ROLL TM: ICMPv6 In, bad TTL\n");
ROLL_TM_STATS_ADD(icmp_bad); ROLL_TM_STATS_ADD(icmp_bad);
return; goto discard;
} }
#endif #endif
@ -1311,6 +1311,9 @@ drop:
t[1].c++; t[1].c++;
} }
discard:
uip_len = 0;
return; return;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/