riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3840 from OlegHahm/sixlowpan_nd_stale_null_pointer

Browse Source 
6lowpan nd: fix null pointer handling in staling
This commit is contained in:
Martine Lenders 2015-09-17 01:38:21 +02:00
commit e76f1cf27f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
View File

@ -57,13 +57,17 @@ static void _stale_nc(kernel_pid_t iface, ipv6_addr_t *ipaddr, uint8_t *l2addr,
#ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER #ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER
/* tentative type see https://tools.ietf.org/html/rfc6775#section-6.3 */ /* tentative type see https://tools.ietf.org/html/rfc6775#section-6.3 */
gnrc_ipv6_netif_t *ipv6_iface = gnrc_ipv6_netif_get(iface); gnrc_ipv6_netif_t *ipv6_iface = gnrc_ipv6_netif_get(iface);
if ((ipv6_iface == NULL) || (ipv6_iface->flags & GNRC_IPV6_NETIF_FLAGS_ROUTER)) { if ((ipv6_iface->flags & GNRC_IPV6_NETIF_FLAGS_SIXLOWPAN) &&
(ipv6_iface->flags & GNRC_IPV6_NETIF_FLAGS_ROUTER)) {
timex_t t = { GNRC_SIXLOWPAN_ND_TENTATIVE_NCE_LIFETIME, 0 }; timex_t t = { GNRC_SIXLOWPAN_ND_TENTATIVE_NCE_LIFETIME, 0 };
gnrc_ipv6_nc_add(iface, ipaddr, l2addr, (uint16_t)l2addr_len, if ((nc_entry = gnrc_ipv6_nc_add(iface, ipaddr, l2addr,
GNRC_IPV6_NC_STATE_STALE | GNRC_IPV6_NC_TYPE_TENTATIVE); (uint16_t)l2addr_len,
vtimer_remove(&nc_entry->type_timeout); GNRC_IPV6_NC_STATE_STALE |
vtimer_set_msg(&nc_entry->type_timeout, t, gnrc_ipv6_pid, GNRC_IPV6_NC_TYPE_TENTATIVE)) != NULL) {
GNRC_SIXLOWPAN_ND_MSG_AR_TIMEOUT, nc_entry); vtimer_remove(&nc_entry->type_timeout);
vtimer_set_msg(&nc_entry->type_timeout, t, gnrc_ipv6_pid,
GNRC_SIXLOWPAN_ND_MSG_AR_TIMEOUT, nc_entry);
}
return; return;
} }
#endif #endif