From d54ac38f8403e7fc8f409225652e0174d059d129 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Thu, 8 Nov 2018 09:31:23 +0100
Subject: [PATCH] gnrc_ipv6: don't dispatch encapsulated IPv6 headers in
central function
Otherwise, an encapsulated IPv6 packet is handled twice. Once in the
central function, once in the specialized decapsulation.
---
sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
index 5f91029ec1..255095f639 100644
--- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
+++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
@@ -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);
--
GitLab