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

Use rpl headers.

Browse source
This commit is contained in:
Nicolas Tsiftes 2011-12-02 15:54:49 +01:00
parent 7c808081d6
commit 5c0100c979
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/net/tcpip.c
View file

@ -78,17 +78,16 @@ void uip_log(char *msg);
#ifdef UIP_FALLBACK_INTERFACE
extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE;
#endif
#if UIP_CONF_IPV6_RPL
void rpl_init(void);
int rpl_update_header_final(uip_ipaddr_t *addr);
#endif /* UIP_CONF_IPV6_RPL */
#include "rpl/rpl.h"
#endif
process_event_t tcpip_event;
#if UIP_CONF_ICMP6
process_event_t tcpip_icmp6_event;
#endif /* UIP_CONF_ICMP6 */
/*static struct tcpip_event_args ev_args;*/
/*periodic check of active connections*/
static struct etimer periodic;
@ -601,15 +600,13 @@ tcpip_ipv6_output(void)
}
/* end of next hop determination */
#if UIP_CONF_IPV6_RPL
if (rpl_update_header_final(nexthop)) {
if(rpl_update_header_final(nexthop)) {
uip_len = 0;
return;
}
#endif /* UIP_CONF_IPV6_RPL */
if((nbr = uip_ds6_nbr_lookup(nexthop)) == NULL) {
// printf("add1 %d\n", nexthop->u8[15]);
if((nbr = uip_ds6_nbr_add(nexthop, NULL, 0, NBR_INCOMPLETE)) == NULL) {
// printf("add n\n");
uip_len = 0;
return;
} else {