From cdfc788967acb543964c4a387c154f4bb1b2d9c9 Mon Sep 17 00:00:00 2001
From: Adam Dunkels <adam@dunkels.com>
Date: Wed, 25 Jan 2012 06:34:10 -0800
Subject: [PATCH] Increased wait time between main loop polls; cleaned up the
 code to Contiki code style standards; moved process autostart code to after
 network setup

---
 platform/minimal-net/contiki-main.c | 244 +++++++++++++++-------------
 1 file changed, 134 insertions(+), 110 deletions(-)

diff --git a/platform/minimal-net/contiki-main.c b/platform/minimal-net/contiki-main.c
index b31091900..2ab990cc8 100644
--- a/platform/minimal-net/contiki-main.c
+++ b/platform/minimal-net/contiki-main.c
@@ -70,53 +70,63 @@ PROCESS_THREAD(border_router_process, ev, data)
 
   PROCESS_PAUSE();
 
-{ rpl_dag_t *dag;
-  char buf[sizeof(dag_id)];
-  memcpy(buf,dag_id,sizeof(dag_id));
-  dag = rpl_set_root((uip_ip6addr_t *)buf);
-
-/* Assign separate addresses to the uip stack and the host network interface, but with the same prefix */
-/* E.g. bbbb::ff:fe00:200 to the stack and bbbb::1 to the host *fallback* network interface */
-/* Otherwise the host will trap packets intended for the stack, just as the stack will trap packets intended for the host */
-/* $ifconfig usb0 -arp on Ubuntu to skip the neighbor solicitations. Add explicit neighbors on other OSs */
-  if(dag != NULL) {
-    printf("Created a new RPL dag\n");
+  {
+    rpl_dag_t *dag;
+    char buf[sizeof(dag_id)];
+    memcpy(buf,dag_id,sizeof(dag_id));
+    dag = rpl_set_root((uip_ip6addr_t *)buf);
+    
+    /* Assign separate addresses to the uip stack and the host network
+        interface, but with the same prefix E.g. bbbb::ff:fe00:200 to
+        the stack and bbbb::1 to the host *fallback* network interface
+        Otherwise the host will trap packets intended for the stack,
+        just as the stack will trap packets intended for the host
+        $ifconfig usb0 -arp on Ubuntu to skip the neighbor
+        solicitations. Add explicit neighbors on other OSs */
 
+    if(dag != NULL) {
+      printf("Created a new RPL dag\n");
+      
 #if UIP_CONF_ROUTER_RECEIVE_RA
-//Contiki stack will shut down until assigned an address from the interface RA
-//Currently this requires changes in the core rpl-icmp6.c to pass the link-local RA broadcast
-
+      /* Contiki stack will shut down until assigned an address from the
+	 interface RA Currently this requires changes in the core
+	 rpl-icmp6.c to pass the link-local RA broadcast.
+      */
+      
 #else
-void sprint_ip6(uip_ip6addr_t addr);
-    int i;
-    uip_ip6addr_t ipaddr;
+      {
+	static void sprint_ip6(uip_ip6addr_t addr);
+	int i;
+	uip_ip6addr_t ipaddr;
 #ifdef HARD_CODED_ADDRESS
-    uiplib_ipaddrconv(HARD_CODED_ADDRESS, &ipaddr);
+	uiplib_ipaddrconv(HARD_CODED_ADDRESS, &ipaddr);
 #else
-    uip_ip6addr(&ipaddr, 0xbbbb, 0, 0, 0, 0, 0, 0, 0x1);
+	uip_ip6addr(&ipaddr, 0xbbbb, 0, 0, 0, 0, 0, 0, 0x1);
 #endif
-    uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
-    uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
-    rpl_set_prefix(dag, &ipaddr, 64);
+	uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+	uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+	rpl_set_prefix(dag, &ipaddr, 64);
 
-	for (i=0;i<UIP_DS6_ADDR_NB;i++) {
-	  if (uip_ds6_if.addr_list[i].isused) {	  
-	    printf("IPV6 Address: ");sprint_ip6(uip_ds6_if.addr_list[i].ipaddr);printf("\n");
+	for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+	  if(uip_ds6_if.addr_list[i].isused) {
+	    printf("IPV6 Address: ");
+	    sprint_ip6(uip_ds6_if.addr_list[i].ipaddr);
+	    printf("\n");
 	  }
 	}
+      }
 #endif
+    }
   }
-}
   /* The border router runs with a 100% duty cycle in order to ensure high
      packet reception rates. */
- // NETSTACK_MAC.off(1);
+  /* NETSTACK_MAC.off(1); */
 
   while(1) {
     PROCESS_YIELD();
     /* Local and global dag repair can be done from ? */
- //   rpl_set_prefix(rpl_get_dag(RPL_ANY_INSTANCE), &ipaddr, 64);
- //   rpl_repair_dag(rpl_get_dag(RPL_ANY_INSTANCE));
-
+    /*  rpl_set_prefix(rpl_get_dag(RPL_ANY_INSTANCE), &ipaddr, 64);
+	rpl_repair_dag(rpl_get_dag(RPL_ANY_INSTANCE)); */
   }
 
   PROCESS_END();
@@ -125,20 +135,22 @@ void sprint_ip6(uip_ip6addr_t addr);
 
 #if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
-void
+static void
 sprint_ip6(uip_ip6addr_t addr)
 {
   unsigned char i = 0;
   unsigned char zerocnt = 0;
   unsigned char numprinted = 0;
   char thestring[40];
-  char * result = thestring;
+  char *result = thestring;
 
-  *result++='[';
-  while (numprinted < 8) {
-    if ((addr.u16[i] == 0) && (zerocnt == 0)) {
-      while(addr.u16[zerocnt + i] == 0) zerocnt++;
-      if (zerocnt == 1) {
+  *result++ = '[';
+  while(numprinted < 8) {
+    if((addr.u16[i] == 0) && (zerocnt == 0)) {
+      while(addr.u16[zerocnt + i] == 0) {
+	zerocnt++;
+      }
+      if(zerocnt == 1) {
         *result++ = '0';
          numprinted++;
          break;
@@ -150,46 +162,52 @@ sprint_ip6(uip_ip6addr_t addr)
       i++;
       numprinted++;
     }
-    if (numprinted != 8) *result++ = ':';
+    if(numprinted != 8) {
+      *result++ = ':';
+    }
   }
   *result++=']';
   *result=0;
-  printf("%s",thestring);
+  printf("%s", thestring);
 }
 #endif /* UIP_CONF_IPV6 */
-/*---------------------------------------------------------------------------*/
-
 /*---------------------------------------------------------------------------*/
 int
 main(void)
 {
   clock_init();
 #if UIP_CONF_IPV6
-/* A hard coded address overrides the stack default MAC address to allow multiple instances.
- * uip6.c defines it as {0x00,0x06,0x98,0x00,0x02,0x32} giving an ipv6 address of [fe80::206:98ff:fe00:232]
- * We make it simpler,  {0x02,0x00,0x00 + the last three bytes of the hard coded address (if any are nonzero).
- * HARD_CODED_ADDRESS can be defined in the contiki-conf.h file, or here to allow quick builds using different addresses.
- * If HARD_CODED_ADDRESS has a prefix it also applied, unless built as a RPL end node.
- * E.g. bbbb::12:3456 becomes fe80::ff:fe12:3456 and prefix bbbb::/64 if non-RPL
- *      ::10 becomes fe80::ff:fe00:10 and prefix awaits RA or RPL formation
- *      bbbb:: gives an address of bbbb::206:98ff:fe00:232 if non-RPL
-*/
-//#define HARD_CODED_ADDRESS      "bbbb::20"
+/* A hard coded address overrides the stack default MAC address to
+   allow multiple instances. uip6.c defines it as
+   {0x00,0x06,0x98,0x00,0x02,0x32} giving an ipv6 address of
+   [fe80::206:98ff:fe00:232] We make it simpler, {0x02,0x00,0x00 + the
+   last three bytes of the hard coded address (if any are nonzero).
+   HARD_CODED_ADDRESS can be defined in the contiki-conf.h file, or
+   here to allow quick builds using different addresses.  If
+   HARD_CODED_ADDRESS has a prefix it also applied, unless built as a
+   RPL end node.  E.g. bbbb::12:3456 becomes fe80::ff:fe12:3456 and
+   prefix bbbb::/64 if non-RPL ::10 becomes fe80::ff:fe00:10 and
+   prefix awaits RA or RPL formation bbbb:: gives an address of
+   bbbb::206:98ff:fe00:232 if non-RPL */
 #ifdef HARD_CODED_ADDRESS
-{
+  {
   uip_ipaddr_t ipaddr;
   uiplib_ipaddrconv(HARD_CODED_ADDRESS, &ipaddr);
-  if ((ipaddr.u8[13]!=0) || (ipaddr.u8[14]!=0) || (ipaddr.u8[15]!=0)) {
-    if (sizeof(uip_lladdr)==6) {  //Minimal-net uses ethernet MAC
-      uip_lladdr.addr[0]=0x02;uip_lladdr.addr[1]=0;uip_lladdr.addr[2]=0;
-	  uip_lladdr.addr[3]=ipaddr.u8[13];;
-	  uip_lladdr.addr[4]=ipaddr.u8[14];
-	  uip_lladdr.addr[5]=ipaddr.u8[15];
-   }
+  if((ipaddr.u8[13] != 0) ||
+     (ipaddr.u8[14] != 0) ||
+     (ipaddr.u8[15] != 0)) {
+    if(sizeof(uip_lladdr) == 6) {  /* Minimal-net uses ethernet MAC */
+      uip_lladdr.addr[0] = 0x02;
+      uip_lladdr.addr[1] = 0;
+      uip_lladdr.addr[2] = 0;
+      uip_lladdr.addr[3] = ipaddr.u8[13];
+      uip_lladdr.addr[4] = ipaddr.u8[14];
+      uip_lladdr.addr[5] = ipaddr.u8[15];
+    }
+  }
  }
-}
-#endif
-#endif
+#endif /* HARD_CODED_ADDRESS */
+#endif /* UIP_CONF_IPV6 */
 
   process_init();
 /* procinit_init initializes RPL which sets a ctimer for the first DIS */
@@ -197,9 +215,6 @@ main(void)
   process_start(&etimer_process, NULL);
   ctimer_init();
 
-  procinit_init();
-  autostart_start(autostart_processes);
-
 #if RPL_BORDER_ROUTER
   process_start(&border_router_process, NULL);
   printf("Border Router Process started\n");
@@ -209,66 +224,78 @@ main(void)
 
   /* Set default IP addresses if not specified */
 #if !UIP_CONF_IPV6
-  uip_ipaddr_t addr;
-  
-  uip_gethostaddr(&addr);
-  if (addr.u8[0]==0) {
-    uip_ipaddr(&addr, 10,1,1,1);
-  }
-  printf("IP Address:  %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
-  uip_sethostaddr(&addr);
+  {
+    uip_ipaddr_t addr;
 
-  uip_getnetmask(&addr);
-  if (addr.u8[0]==0) {
-    uip_ipaddr(&addr, 255,0,0,0);
+    uip_gethostaddr(&addr);
+    if(addr.u8[0] == 0) {
+      uip_ipaddr(&addr, 10,1,1,1);
+    }
+    printf("IP Address:  %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
+    uip_sethostaddr(&addr);
+    
+    uip_getnetmask(&addr);
+    if(addr.u8[0] == 0) {
+      uip_ipaddr(&addr, 255,0,0,0);
     uip_setnetmask(&addr);
+    }
+    printf("Subnet Mask: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
+    
+    uip_getdraddr(&addr);
+    if(addr.u8[0] == 0) {
+      uip_ipaddr(&addr, 10,1,1,100);
+      uip_setdraddr(&addr);
+    }
+    printf("Def. Router: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
   }
-  printf("Subnet Mask: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
-
-  uip_getdraddr(&addr);
-  if (addr.u8[0]==0) {
-    uip_ipaddr(&addr, 10,1,1,100);
-    uip_setdraddr(&addr);
-  }
-  printf("Def. Router: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
-
 #else /* UIP_CONF_IPV6 */
 
 #if !UIP_CONF_IPV6_RPL
-  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);
+    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
-    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);
 #else /* UIP_CONF_ROUTER */
-    uip_ds6_prefix_add(&ipaddr, UIP_DEFAULT_PREFIX_LEN, 0);
+      uip_ds6_prefix_add(&ipaddr, UIP_DEFAULT_PREFIX_LEN, 0);
 #endif /* UIP_CONF_ROUTER */
-#if !UIP_CONF_IPV6_RPL
-    uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
-    uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
-#endif
-  }
-#endif
 
-#if !RPL_BORDER_ROUTER  //Border router process prints addresses later
-{ uint8_t i;
-  for (i=0;i<UIP_DS6_ADDR_NB;i++) {
-	if (uip_ds6_if.addr_list[i].isused) {	  
-	  printf("IPV6 Addresss: ");sprint_ip6(uip_ds6_if.addr_list[i].ipaddr);printf("\n");
-	}
+      uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+      uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+    }
   }
-}
-#endif
+#endif /* !UIP_CONF_IPV6_RPL */
+
+#if !RPL_BORDER_ROUTER  /* Border router process prints addresses later */
+  {
+    uint8_t i;
+    for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
+      if(uip_ds6_if.addr_list[i].isused) {	  
+	printf("IPV6 Addresss: ");
+	sprint_ip6(uip_ds6_if.addr_list[i].ipaddr);
+	printf("\n");
+      }
+    }
+  }
+#endif /* !RPL_BORDER_ROUTER */
 #endif /* !UIP_CONF_IPV6 */
 
+  print_processes(autostart_processes);
+  procinit_init();
+  autostart_start(autostart_processes);
+
   /* Make standard output unbuffered. */
   setvbuf(stdout, (char *)NULL, _IONBF, 0);
 
-    printf("\n*******%s online*******\n",CONTIKI_VERSION_STRING);
+  printf("\n*******%s online*******\n",CONTIKI_VERSION_STRING);
 
   while(1) {
     fd_set fds;
@@ -276,12 +303,9 @@ main(void)
     struct timeval tv;
     
     n = process_run();
-    /*    if(n > 0) {
-      printf("%d processes in queue\n");
-      }*/
 
     tv.tv_sec = 0;
-    tv.tv_usec = 1;
+    tv.tv_usec = 1000;
     FD_ZERO(&fds);
     FD_SET(STDIN_FILENO, &fds);
     select(1, &fds, NULL, NULL, &tv);