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

Removed exit() calls that were unadvertedtly left in from testing

Browse source
This commit is contained in:
adamdunkels 2010-02-02 21:10:38 +00:00
parent 0db31db624
commit 28052c655f
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/net/uip-netif.c
View file

@ -164,11 +164,11 @@ uip_netif_compute_reachable_time(void)
u8_t u8_t
uip_netif_is_addr_my_solicited(uip_ipaddr_t *ipaddr) uip_netif_is_addr_my_solicited(uip_ipaddr_t *ipaddr)
{ {
if(uip_ipaddr_cmp(ipaddr, &uip_netif_physical_if.solicited_node_mcastaddr)) if(uip_ipaddr_cmp(ipaddr, &uip_netif_physical_if.solicited_node_mcastaddr)) {
return 1; return 1;
}
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
struct uip_netif_addr * struct uip_netif_addr *
uip_netif_addr_lookup(uip_ipaddr_t *ipaddr, u8_t length, uip_netif_type type) uip_netif_addr_lookup(uip_ipaddr_t *ipaddr, u8_t length, uip_netif_type type)
@ -248,10 +248,9 @@ uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
memcpy(ipaddr->u8 + 13, (u8_t*)lladdr + 3, 3); memcpy(ipaddr->u8 + 13, (u8_t*)lladdr + 3, 3);
ipaddr->u8[8] ^= 0x02; ipaddr->u8[8] ^= 0x02;
#else #else
UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER"); UIP_LOG("CAN NOT BUILD INTERFACE IDENTIFIER");
UIP_LOG("THE STACK IS GOING TO SHUT DOWN"); UIP_LOG("THE STACK IS GOING TO SHUT DOWN");
UIP_LOG("THE HOST WILL BE UNREACHABLE"); UIP_LOG("THE HOST WILL BE UNREACHABLE");
exit(-1);
#endif #endif
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -385,7 +384,6 @@ uip_netif_dad(void)
void void
uip_netif_dad_failed(uip_ipaddr_t *ipaddr) uip_netif_dad_failed(uip_ipaddr_t *ipaddr)
{ {
UIP_LOG("DAD FAILED"); UIP_LOG("DAD FAILED");
UIP_LOG("THE STACK IS GOING TO SHUT DOWN"); UIP_LOG("THE STACK IS GOING TO SHUT DOWN");
UIP_LOG("THE HOST WILL BE UNREACHABLE"); UIP_LOG("THE HOST WILL BE UNREACHABLE");
@ -396,8 +394,6 @@ uip_netif_dad_failed(uip_ipaddr_t *ipaddr)
dad_ifaddr = NULL; dad_ifaddr = NULL;
dad_ns = 0; dad_ns = 0;
} }
exit(-1);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -411,8 +407,6 @@ uip_netif_sched_send_rs(void)
PRINTF("Scheduling RS\n"); PRINTF("Scheduling RS\n");
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_send_rs(void) uip_netif_send_rs(void)