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

Merge pull request #695 from sdefauw/contiki

Browse source 
IPv6 prefix bug
This commit is contained in:
Simon Duquennoy 2015-08-29 20:27:50 +02:00
parent cc3bcbefd4 22caf4b2e1
commit ddf970d3db
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/net/ipv6/uip-ds6.c
View file

@ -275,6 +275,7 @@ uip_ds6_prefix_add(uip_ipaddr_t *ipaddr, uint8_t ipaddrlen,
PRINTF("Adding prefix "); PRINTF("Adding prefix ");
PRINT6ADDR(&locprefix->ipaddr); PRINT6ADDR(&locprefix->ipaddr);
PRINTF("length %u, vlifetime%lu\n", ipaddrlen, interval); PRINTF("length %u, vlifetime%lu\n", ipaddrlen, interval);
return locprefix;
} }
return NULL; return NULL;
} }

4
core/net/ipv6/uip-nd6.c
View file

@ -127,6 +127,8 @@ static uip_ds6_addr_t *addr; /** Pointer to an interface address */
#if !UIP_CONF_ROUTER // TBD see if we move it to ra_input #if !UIP_CONF_ROUTER // TBD see if we move it to ra_input
static uip_nd6_opt_prefix_info *nd6_opt_prefix_info; /** Pointer to prefix information option in uip_buf */ static uip_nd6_opt_prefix_info *nd6_opt_prefix_info; /** Pointer to prefix information option in uip_buf */
static uip_ipaddr_t ipaddr; static uip_ipaddr_t ipaddr;
#endif
#if (!UIP_CONF_ROUTER || UIP_ND6_SEND_RA)
static uip_ds6_prefix_t *prefix; /** Pointer to a prefix list entry */ static uip_ds6_prefix_t *prefix; /** Pointer to a prefix list entry */
#endif #endif
@ -687,7 +689,6 @@ uip_nd6_ra_output(uip_ipaddr_t * dest)
nd6_opt_offset = UIP_ND6_RA_LEN; nd6_opt_offset = UIP_ND6_RA_LEN;
#if !UIP_CONF_ROUTER
/* Prefix list */ /* Prefix list */
for(prefix = uip_ds6_prefix_list; for(prefix = uip_ds6_prefix_list;
prefix < uip_ds6_prefix_list + UIP_DS6_PREFIX_NB; prefix++) { prefix < uip_ds6_prefix_list + UIP_DS6_PREFIX_NB; prefix++) {
@ -704,7 +705,6 @@ uip_nd6_ra_output(uip_ipaddr_t * dest)
uip_len += UIP_ND6_OPT_PREFIX_INFO_LEN; uip_len += UIP_ND6_OPT_PREFIX_INFO_LEN;
} }
} }
#endif /* !UIP_CONF_ROUTER */
/* Source link-layer option */ /* Source link-layer option */
create_llao((uint8_t *)UIP_ND6_OPT_HDR_BUF, UIP_ND6_OPT_SLLAO); create_llao((uint8_t *)UIP_ND6_OPT_HDR_BUF, UIP_ND6_OPT_SLLAO);