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

Make sure our parent's IP address isn't NULL.

Browse source
This commit is contained in:
Adam Dunkels 2013-08-12 00:11:48 +02:00 committed by Simon Duquennoy
parent e5a6565137
commit 4d0ecaae02
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/net/rpl/rpl-icmp6.c
View file

@ -720,7 +720,8 @@ dao_input(void)
rep->state.learned_from = learned_from; rep->state.learned_from = learned_from;
if(learned_from == RPL_ROUTE_FROM_UNICAST_DAO) { if(learned_from == RPL_ROUTE_FROM_UNICAST_DAO) {
if(dag->preferred_parent) { if(dag->preferred_parent != NULL &&
rpl_get_parent_ipaddr(dag->preferred_parent) != NULL) {
PRINTF("RPL: Forwarding DAO to parent "); PRINTF("RPL: Forwarding DAO to parent ");
PRINT6ADDR(rpl_get_parent_ipaddr(dag->preferred_parent)); PRINT6ADDR(rpl_get_parent_ipaddr(dag->preferred_parent));
PRINTF("\n"); PRINTF("\n");
@ -828,8 +829,10 @@ dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
PRINT6ADDR(rpl_get_parent_ipaddr(parent)); PRINT6ADDR(rpl_get_parent_ipaddr(parent));
PRINTF("\n"); PRINTF("\n");
if(rpl_get_parent_ipaddr(parent) != NULL) {
uip_icmp6_send(rpl_get_parent_ipaddr(parent), ICMP6_RPL, RPL_CODE_DAO, pos); uip_icmp6_send(rpl_get_parent_ipaddr(parent), ICMP6_RPL, RPL_CODE_DAO, pos);
} }
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
dao_ack_input(void) dao_ack_input(void)