From 96c3c1093a980501521a314b7cb40d1731d6ab9c Mon Sep 17 00:00:00 2001 From: David Kopf Date: Wed, 3 Aug 2011 12:30:20 -0400 Subject: [PATCH] Assign aaaa:: prefix if HARD_CODED_ADDRESS not defined --- platform/minimal-net/contiki-main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/minimal-net/contiki-main.c b/platform/minimal-net/contiki-main.c index 4944ab46a..b31091900 100644 --- a/platform/minimal-net/contiki-main.c +++ b/platform/minimal-net/contiki-main.c @@ -235,9 +235,12 @@ main(void) #else /* UIP_CONF_IPV6 */ #if !UIP_CONF_IPV6_RPL -#ifdef HARD_CODED_ADDRESS uip_ipaddr_t ipaddr; +#ifdef HARD_CODED_ADDRESS 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 UIP_CONF_ROUTER 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); #endif } -#endif /* HARD_CODED_ADDRESS */ #endif #if !RPL_BORDER_ROUTER //Border router process prints addresses later