kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 07:21:18 +01:00
Code Releases Activity

gnrc_ndp_node: always assume link-local dst to be on-link

Browse Source
This commit is contained in:
Martine Lenders 2015-09-22 19:49:09 +02:00
parent 4232f2dca7
commit 2a61ac936a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/net/gnrc/network_layer/ndp/node/gnrc_ndp_node.c
View File

@ -61,6 +61,7 @@ kernel_pid_t gnrc_ndp_node_next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len,
{
gnrc_ipv6_nc_t *nc_entry;
ipv6_addr_t *next_hop_ip = NULL, *prefix = NULL;
bool dst_link_local = ipv6_addr_is_link_local(dst);
#ifdef MODULE_GNRC_IPV6_EXT_RH
ipv6_hdr_t *hdr;
@ -73,7 +74,7 @@ kernel_pid_t gnrc_ndp_node_next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len,
#ifdef MODULE_FIB
ipv6_addr_t next_hop_actual; /* FIB copies address into this variable */
/* don't look-up link local addresses in FIB */
if (!ipv6_addr_is_link_local(dst)) {
if (!dst_link_local) {
size_t next_hop_size = sizeof(ipv6_addr_t);
uint32_t next_hop_flags = 0;
@ -88,18 +89,20 @@ kernel_pid_t gnrc_ndp_node_next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len,
#endif
if (next_hop_ip == NULL) { /* no route to host */
if (iface == KERNEL_PID_UNDEF) {
/* gnrc_ipv6_netif_t doubles as prefix list */
iface = gnrc_ipv6_netif_find_by_prefix(&prefix, dst);
}
else {
/* gnrc_ipv6_netif_t doubles as prefix list */
prefix = gnrc_ipv6_netif_match_prefix(iface, dst);
if (!dst_link_local) {
if (iface == KERNEL_PID_UNDEF) {
/* gnrc_ipv6_netif_t doubles as prefix list */
iface = gnrc_ipv6_netif_find_by_prefix(&prefix, dst);
}
else {
/* gnrc_ipv6_netif_t doubles as prefix list */
prefix = gnrc_ipv6_netif_match_prefix(iface, dst);
}
}
if ((prefix != NULL) && /* prefix is on-link */
(gnrc_ipv6_netif_addr_get(prefix)->flags &
GNRC_IPV6_NETIF_ADDR_FLAGS_NDP_ON_LINK)) {
if (dst_link_local || ((prefix != NULL) &&
(gnrc_ipv6_netif_addr_get(prefix)->flags & /* prefix is on-link */
GNRC_IPV6_NETIF_ADDR_FLAGS_NDP_ON_LINK))) {
next_hop_ip = dst;
}
}