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

Make DS6 neighbors use neighbor-table, and move all DS6 neighbor management from uip-ds6 to a new uip-ds6-neighbor module.

Browse source
This commit is contained in:
Simon Duquennoy 2013-07-03 19:32:26 +02:00
parent 5a1d8d8006
commit ec609b49eb
8 changed files with 386 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/net/tcpip.c
View file

@ -567,6 +567,7 @@ tcpip_ipv6_output(void)
uip_ds6_route_t* locrt;
locrt = uip_ds6_route_lookup(&UIP_IP_BUF->destipaddr);
if(locrt == NULL) {
PRINTF("tcpip_ipv6_output: no route found, using default route\n");
if((nexthop = uip_ds6_defrt_choose()) == NULL) {
#ifdef UIP_FALLBACK_INTERFACE
PRINTF("FALLBACK: removing ext hdrs & setting proto %d %d\n",
@ -588,11 +589,14 @@ tcpip_ipv6_output(void)
} else {
nexthop = &locrt->nexthop;
}
#if TCPIP_CONF_ANNOTATE_TRANSMISSIONS
if(nexthop != NULL) {
PRINTF("tcpip_ipv6_output: next hop ");
PRINT6ADDR(nexthop);
PRINTF("\n");
#if TCPIP_CONF_ANNOTATE_TRANSMISSIONS
printf("#L %u 1; red\n", nexthop->u8[sizeof(uip_ipaddr_t) - 1]);
}
#endif /* TCPIP_CONF_ANNOTATE_TRANSMISSIONS */
}
}
/* End of next hop determination */
#if UIP_CONF_IPV6_RPL
@ -655,7 +659,7 @@ tcpip_ipv6_output(void)
}
#endif /* UIP_ND6_SEND_NA */
tcpip_output(&nbr->lladdr);
tcpip_output(uip_ds6_nbr_get_ll(nbr));
#if UIP_CONF_IPV6_QUEUE_PKT
/*
@ -668,7 +672,7 @@ tcpip_ipv6_output(void)
uip_len = uip_packetqueue_buflen(&nbr->packethandle);
memcpy(UIP_IP_BUF, uip_packetqueue_buf(&nbr->packethandle), uip_len);
uip_packetqueue_free(&nbr->packethandle);
tcpip_output(&nbr->lladdr);
tcpip_output(uip_ds6_nbr_get_ll(nbr));
}
#endif /*UIP_CONF_IPV6_QUEUE_PKT*/