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

Assign aaaa:: prefix if HARD_CODED_ADDRESS not defined

Browse source
This commit is contained in:
David Kopf 2011-08-03 12:30:20 -04:00
parent 6ae3e2bcb2
commit 96c3c1093a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/minimal-net/contiki-main.c
View file

@ -235,9 +235,12 @@ main(void)
#else /* UIP_CONF_IPV6 */ #else /* UIP_CONF_IPV6 */
#if !UIP_CONF_IPV6_RPL #if !UIP_CONF_IPV6_RPL
#ifdef HARD_CODED_ADDRESS
uip_ipaddr_t ipaddr; uip_ipaddr_t ipaddr;
#ifdef HARD_CODED_ADDRESS
uiplib_ipaddrconv(HARD_CODED_ADDRESS, &ipaddr); uiplib_ipaddrconv(HARD_CODED_ADDRESS, &ipaddr);
#else
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
#endif
if ((ipaddr.u16[0]!=0) || (ipaddr.u16[1]!=0) || (ipaddr.u16[2]!=0) || (ipaddr.u16[3]!=0)) { if ((ipaddr.u16[0]!=0) || (ipaddr.u16[1]!=0) || (ipaddr.u16[2]!=0) || (ipaddr.u16[3]!=0)) {
#if UIP_CONF_ROUTER #if UIP_CONF_ROUTER
uip_ds6_prefix_add(&ipaddr, UIP_DEFAULT_PREFIX_LEN, 0, 0, 0, 0); uip_ds6_prefix_add(&ipaddr, UIP_DEFAULT_PREFIX_LEN, 0, 0, 0, 0);
@ -249,7 +252,6 @@ main(void)
uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF); uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
#endif #endif
} }
#endif /* HARD_CODED_ADDRESS */
#endif #endif
#if !RPL_BORDER_ROUTER //Border router process prints addresses later #if !RPL_BORDER_ROUTER //Border router process prints addresses later