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

Replace old switch-based ICMPv6 type/code management

Browse source
This commit is contained in:
George Oikonomou 2014-03-08 21:26:53 +00:00
parent b6978b30e8
commit 1d84962e80
1 changed files with 9 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1420,67 +1420,17 @@ uip_process(uint8_t flag)
UIP_ICMP6_APPCALL(UIP_ICMP_BUF->type); UIP_ICMP6_APPCALL(UIP_ICMP_BUF->type);
#endif /*UIP_CONF_ICMP6*/ #endif /*UIP_CONF_ICMP6*/
switch(UIP_ICMP_BUF->type) { /*
case ICMP6_NS: * Search generic input handlers.
#if UIP_ND6_SEND_NA * The handler is in charge of setting uip_len to 0
uip_nd6_ns_input(); */
#else /* UIP_ND6_SEND_NA */ if(uip_icmp6_input(UIP_ICMP_BUF->type,
UIP_STAT(++uip_stat.icmp.drop); UIP_ICMP_BUF->icode) == UIP_ICMP6_INPUT_ERROR) {
uip_len = 0; PRINTF("Unknown ICMPv6 message type/code %d\n", UIP_ICMP_BUF->type);
#endif /* UIP_ND6_SEND_NA */
break;
case ICMP6_NA:
#if UIP_ND6_SEND_NA
uip_nd6_na_input();
#else /* UIP_ND6_SEND_NA */
UIP_STAT(++uip_stat.icmp.drop);
uip_len = 0;
#endif /* UIP_ND6_SEND_NA */
break;
case ICMP6_RS:
#if UIP_CONF_ROUTER && UIP_ND6_SEND_RA
uip_nd6_rs_input();
#else /* UIP_CONF_ROUTER && UIP_ND6_SEND_RA */
UIP_STAT(++uip_stat.icmp.drop);
uip_len = 0;
#endif /* UIP_CONF_ROUTER && UIP_ND6_SEND_RA */
break;
case ICMP6_RA:
#if UIP_CONF_ROUTER
UIP_STAT(++uip_stat.icmp.drop);
uip_len = 0;
#else /* UIP_CONF_ROUTER */
uip_nd6_ra_input();
#endif /* UIP_CONF_ROUTER */
break;
#if UIP_CONF_IPV6_RPL
case ICMP6_RPL:
uip_rpl_input();
break;
#endif /* UIP_CONF_IPV6_RPL */
case ICMP6_ECHO_REQUEST:
uip_icmp6_echo_request_input();
break;
case ICMP6_ECHO_REPLY:
/** Call echo reply input function. */
uip_icmp6_echo_reply_input();
PRINTF("Received an icmp6 echo reply\n");
UIP_STAT(++uip_stat.icmp.recv);
uip_len = 0;
break;
#if UIP_CONF_IPV6_ROLL_TM
case ICMP6_ROLL_TM:
roll_tm_icmp_input();
uip_len = 0;
break;
#endif
default:
PRINTF("Unknown icmp6 message type %d\n", UIP_ICMP_BUF->type);
UIP_STAT(++uip_stat.icmp.drop); UIP_STAT(++uip_stat.icmp.drop);
UIP_STAT(++uip_stat.icmp.typeerr); UIP_STAT(++uip_stat.icmp.typeerr);
UIP_LOG("icmp6: unknown ICMP message."); UIP_LOG("icmp6: unknown ICMPv6 message.");
uip_len = 0; uip_len = 0;
break;
} }
if(uip_len > 0) { if(uip_len > 0) {