Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-08-15 16:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Temporarily out-commented the problematic code and added a comment that describes the problem

Browse Source
This commit is contained in:
adamdunkels 2008-10-17 14:40:16 +00:00
parent 7d07a7f65d
commit f623b81d59
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
core/net/uip-nd6.c
View File

@ -104,7 +104,7 @@ void uip_log(char *msg);
/** /**
* \brief Timer for maintenance of neighbor cache, prefix list, and default * \brief Timer for maintenance of neighbor cache, prefix list, and default
* router lists * router lists
*/ */
struct etimer uip_nd6_timer_periodic; struct etimer uip_nd6_timer_periodic;
@ -135,7 +135,7 @@ uip_nd6_init(void)
uip_nd6_defrouter_list[i].used = 0; uip_nd6_defrouter_list[i].used = 0;
} }
for(i = 0; i < UIP_CONF_ND6_MAX_PREFIXES; i ++) { for(i = 0; i < UIP_CONF_ND6_MAX_PREFIXES; i ++) {
uip_nd6_prefix_list[i].used = 0; uip_nd6_prefix_list[i].used = 0;
} }
/* create link local prefix */ /* create link local prefix */
@ -144,7 +144,7 @@ uip_nd6_init(void)
uip_nd6_prefix_list[0].used = 1; uip_nd6_prefix_list[0].used = 1;
uip_nd6_prefix_list[0].is_infinite = 1; uip_nd6_prefix_list[0].is_infinite = 1;
/* we check the ND structures every 100ms */ /* we check the ND structures every 100ms */
etimer_set(&uip_nd6_timer_periodic, 0.1 * CLOCK_SECOND); etimer_set(&uip_nd6_timer_periodic, 0.1 * CLOCK_SECOND);
} }
@ -173,7 +173,7 @@ uip_nd6_nbrcache_add(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr,
for(i = 0; i < UIP_CONF_ND6_MAX_NEIGHBORS; ++i) { for(i = 0; i < UIP_CONF_ND6_MAX_NEIGHBORS; ++i) {
if(uip_nd6_nbrcache_list[i].used == 0) { if(uip_nd6_nbrcache_list[i].used == 0) {
break; break;
} }
} }
if(i == UIP_CONF_ND6_MAX_NEIGHBORS){ if(i == UIP_CONF_ND6_MAX_NEIGHBORS){
@ -187,7 +187,7 @@ uip_nd6_nbrcache_add(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr,
memcpy(&(neighbor->lladdr), lladdr, UIP_LLADDR_LEN); memcpy(&(neighbor->lladdr), lladdr, UIP_LLADDR_LEN);
} else { } else {
memset(&(neighbor->lladdr), 0, UIP_LLADDR_LEN); memset(&(neighbor->lladdr), 0, UIP_LLADDR_LEN);
} }
PRINTF("Adding neighbor with ip addr"); PRINTF("Adding neighbor with ip addr");
PRINT6ADDR(ipaddr); PRINT6ADDR(ipaddr);
PRINTF("link addr"); PRINTF("link addr");
@ -197,8 +197,8 @@ uip_nd6_nbrcache_add(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr,
neighbor->isrouter = isrouter; neighbor->isrouter = isrouter;
neighbor->state = state; neighbor->state = state;
/* timers are set separately, for now we put them in expired state */ /* timers are set separately, for now we put them in expired state */
timer_set(&(neighbor->reachable),0); timer_set(&(neighbor->reachable),0);
timer_set(&(neighbor->last_send),0); timer_set(&(neighbor->last_send),0);
neighbor->count_send = 0; neighbor->count_send = 0;
neighbor->used = 1; neighbor->used = 1;
return neighbor; return neighbor;
@ -266,7 +266,7 @@ uip_nd6_defrouter_add(struct uip_nd6_neighbor *neighbor, clock_time_t interval)
for(i = 0; i < UIP_CONF_ND6_MAX_DEFROUTERS; ++i) { for(i = 0; i < UIP_CONF_ND6_MAX_DEFROUTERS; ++i) {
if(uip_nd6_defrouter_list[i].used == 0) { if(uip_nd6_defrouter_list[i].used == 0) {
break; break;
} }
} }
if(i == UIP_CONF_ND6_MAX_DEFROUTERS){ if(i == UIP_CONF_ND6_MAX_DEFROUTERS){
@ -305,13 +305,13 @@ uip_nd6_is_addr_onlink(uip_ipaddr_t *ipaddr)
struct uip_nd6_prefix * struct uip_nd6_prefix *
uip_nd6_prefix_lookup(uip_ipaddr_t *ipaddr) uip_nd6_prefix_lookup(uip_ipaddr_t *ipaddr)
{ {
prefix = NULL; prefix = NULL;
for (i = 0; i < UIP_CONF_ND6_MAX_PREFIXES; i ++) { for (i = 0; i < UIP_CONF_ND6_MAX_PREFIXES; i ++) {
if (uip_nd6_prefix_list[i].used == 0){ if (uip_nd6_prefix_list[i].used == 0){
continue; continue;
} }
if (uip_ipaddr_cmp(&uip_nd6_prefix_list[i].ipaddr, ipaddr)) { if (uip_ipaddr_cmp(&uip_nd6_prefix_list[i].ipaddr, ipaddr)) {
prefix = &uip_nd6_prefix_list[i]; prefix = &uip_nd6_prefix_list[i];
break; break;
@ -328,16 +328,16 @@ uip_nd6_prefix_add(uip_ipaddr_t *ipaddr, u8_t length, clock_time_t interval){
/* /*
* we start at 1: we do not want to overwrite the link local * we start at 1: we do not want to overwrite the link local
* prefix * prefix
*/ */
for(i = 1; i < UIP_CONF_ND6_MAX_PREFIXES; ++i) { for(i = 1; i < UIP_CONF_ND6_MAX_PREFIXES; ++i) {
if(uip_nd6_prefix_list[i].used == 0) { if(uip_nd6_prefix_list[i].used == 0) {
break; break;
} }
} }
if(i == UIP_CONF_ND6_MAX_PREFIXES){ if(i == UIP_CONF_ND6_MAX_PREFIXES){
UIP_LOG("Prefix list full"); UIP_LOG("Prefix list full");
/* /*
* we do not want it to pick the first entry, which * we do not want it to pick the first entry, which
* is the link local prefix * is the link local prefix
*/ */
i = (u8_t)(random_rand()%(UIP_CONF_ND6_MAX_PREFIXES -1) + 1); i = (u8_t)(random_rand()%(UIP_CONF_ND6_MAX_PREFIXES -1) + 1);
@ -351,7 +351,7 @@ uip_nd6_prefix_add(uip_ipaddr_t *ipaddr, u8_t length, clock_time_t interval){
PRINT6ADDR(&prefix->ipaddr); PRINT6ADDR(&prefix->ipaddr);
PRINTF("length %d, vlifetime * CLOCK_SECOND %d\n", length, (u16_t)interval); PRINTF("length %d, vlifetime * CLOCK_SECOND %d\n", length, (u16_t)interval);
if(interval != 0){ if(interval != 0){
timer_set(&(prefix->vlifetime),interval); timer_set(&(prefix->vlifetime),interval);
prefix->is_infinite = 0; prefix->is_infinite = 0;
} else { } else {
@ -364,11 +364,11 @@ uip_nd6_prefix_add(uip_ipaddr_t *ipaddr, u8_t length, clock_time_t interval){
void uip_nd6_prefix_rm(struct uip_nd6_prefix *prefix) { void uip_nd6_prefix_rm(struct uip_nd6_prefix *prefix) {
PRINTF("Removing prefix "); PRINTF("Removing prefix ");
PRINT6ADDR(&prefix->ipaddr); PRINT6ADDR(&prefix->ipaddr);
PRINTF("length %d\n", prefix->length); PRINTF("length %d\n", prefix->length);
prefix->used = 0; prefix->used = 0;
} }
void void
@ -382,9 +382,20 @@ uip_nd6_periodic(void)
for(i = 0; i < UIP_CONF_ND6_MAX_DEFROUTERS; i ++) { for(i = 0; i < UIP_CONF_ND6_MAX_DEFROUTERS; i ++) {
if(uip_nd6_defrouter_list[i].used == 1) { if(uip_nd6_defrouter_list[i].used == 1) {
router = &(uip_nd6_defrouter_list[i]); router = &(uip_nd6_defrouter_list[i]);
if (timer_expired(&(router->lifetime))) {
uip_nd6_defrouter_rm(router); /* XXX when run on a platform with a 16-bit clock_time_t, the
timer_expired() below causes the default route to be immediately
be removed causing communucation problems. We comment it out as
a quick-fix to this problem on the Atmel RAven platform, but
since this is needed for IPv6 compliance, we will solve the
problem by making clock_time_t 32 bits instead after the uIPv6
snapshot release.
if(timer_expired(&(router->lifetime))) {
uip_nd6_defrouter_rm(router);
} }
*/
} }
} }
/*PERIODIC PROCESSING FOR NEIGHBOR CACHE*/ /*PERIODIC PROCESSING FOR NEIGHBOR CACHE*/
@ -398,7 +409,7 @@ uip_nd6_periodic(void)
uip_nd6_nbrcache_list[i].used = 0; uip_nd6_nbrcache_list[i].used = 0;
} }
else if(timer_expired(&(neighbor->last_send))) { else if(timer_expired(&(neighbor->last_send))) {
PRINTF("INCOMPLETE: NS %d\n",neighbor->count_send+1); PRINTF("INCOMPLETE: NS %d\n",neighbor->count_send+1);
uip_nd6_io_ns_output(NULL, NULL, &neighbor->ipaddr); uip_nd6_io_ns_output(NULL, NULL, &neighbor->ipaddr);
timer_set(&(neighbor->last_send), timer_set(&(neighbor->last_send),
uip_netif_physical_if.retrans_timer/1000*CLOCK_SECOND); uip_netif_physical_if.retrans_timer/1000*CLOCK_SECOND);
@ -440,7 +451,7 @@ uip_nd6_periodic(void)
} }
if(timer_expired(&(neighbor->last_send))){ if(timer_expired(&(neighbor->last_send))){
PRINTF("PROBE: NS %d\n",neighbor->count_send+1); PRINTF("PROBE: NS %d\n",neighbor->count_send+1);
uip_nd6_io_ns_output(NULL, &neighbor->ipaddr, &neighbor->ipaddr); uip_nd6_io_ns_output(NULL, &neighbor->ipaddr, &neighbor->ipaddr);
timer_set(&(neighbor->last_send), timer_set(&(neighbor->last_send),
uip_netif_physical_if.retrans_timer/1000*CLOCK_SECOND); uip_netif_physical_if.retrans_timer/1000*CLOCK_SECOND);
neighbor->count_send++; neighbor->count_send++;
@ -450,7 +461,7 @@ uip_nd6_periodic(void)
break; break;
} }
} }
} }
/*PERIODIC PROCESSING FOR PREFIX LIST*/ /*PERIODIC PROCESSING FOR PREFIX LIST*/
prefix = NULL; prefix = NULL;
/* /*
@ -466,6 +477,6 @@ uip_nd6_periodic(void)
uip_nd6_prefix_rm(prefix); uip_nd6_prefix_rm(prefix);
} }
} }
} }
} }
/** @} */ /** @} */