kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

Merge pull request #10246 from miri64/gnrc_ipv6/fix/encaps-ipv6-recursion

Browse Source 
gnrc_ipv6: don't recurse into receive for encapsulated IPv6
This commit is contained in:
Koen Zandberg 2018-11-08 12:34:40 +01:00 committed by GitHub
commit 60a6e66f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
View File

@ -213,9 +213,11 @@ static void _dispatch_next_header(gnrc_pktsnip_t *current, gnrc_pktsnip_t *pkt,
{
#ifdef MODULE_GNRC_IPV6_EXT
const bool should_dispatch_current_type = ((current->type != GNRC_NETTYPE_IPV6_EXT) ||
(current->next->type == GNRC_NETTYPE_IPV6));
(current->next->type == GNRC_NETTYPE_IPV6)) &&
(current->type != GNRC_NETTYPE_IPV6);
#else
const bool should_dispatch_current_type = (current->next->type == GNRC_NETTYPE_IPV6);
const bool should_dispatch_current_type = (current->next->type == GNRC_NETTYPE_IPV6) &&
(current->type != GNRC_NETTYPE_IPV6);
#endif
DEBUG("ipv6: forward nh = %u to other threads\n", nh);
@ -896,7 +898,10 @@ static void _decapsulate(gnrc_pktsnip_t *pkt)
pkt->type = GNRC_NETTYPE_IPV6;
_receive(pkt);
if (gnrc_netapi_dispatch_receive(GNRC_NETTYPE_IPV6,
GNRC_NETREG_DEMUX_CTX_ALL, pkt) == 0) {
gnrc_pktbuf_release(pkt);
}
}
/** @} */