Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Increased wait time between main loop polls; cleaned up the code to Contiki code style standards; moved process autostart code to after network setup

Browse Source
This commit is contained in:
Adam Dunkels 2012-01-25 06:34:10 -08:00
parent c8c5ddd99d
commit cdfc788967
1 changed files with 134 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
platform/minimal-net/contiki-main.c
View File

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