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

Removes duplicate of uip_is_addr_linklocal

Browse source 
A simple search and replace of `uip_is_addr_link_local` to ensure the more
commonly used `uip_is_addr_linklocal` is used consistently.
This commit is contained in:
Valentin Sawadski 2015-10-20 11:18:46 +02:00
parent 9c15d1c42f
commit b0c7dabf4c
11 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1203,8 +1203,8 @@ uip_process(uint8_t flag)
if(!uip_ds6_is_my_addr(&UIP_IP_BUF->destipaddr) &&
!uip_ds6_is_my_maddr(&UIP_IP_BUF->destipaddr)) {
if(!uip_is_addr_mcast(&UIP_IP_BUF->destipaddr) &&
!uip_is_addr_link_local(&UIP_IP_BUF->destipaddr) &&
!uip_is_addr_link_local(&UIP_IP_BUF->srcipaddr) &&
!uip_is_addr_linklocal(&UIP_IP_BUF->destipaddr) &&
!uip_is_addr_linklocal(&UIP_IP_BUF->srcipaddr) &&
!uip_is_addr_unspecified(&UIP_IP_BUF->srcipaddr) &&
!uip_is_addr_loopback(&UIP_IP_BUF->destipaddr)) {
@ -1238,7 +1238,7 @@ uip_process(uint8_t flag)
UIP_STAT(++uip_stat.ip.forwarded);
goto send;
} else {
if((uip_is_addr_link_local(&UIP_IP_BUF->srcipaddr)) &&
if((uip_is_addr_linklocal(&UIP_IP_BUF->srcipaddr)) &&
(!uip_is_addr_unspecified(&UIP_IP_BUF->srcipaddr)) &&
(!uip_is_addr_loopback(&UIP_IP_BUF->destipaddr)) &&
(!uip_is_addr_mcast(&UIP_IP_BUF->destipaddr)) &&