From 7b43a8f9d51926cc1facd12d56cc2291de65d6a7 Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Wed, 12 Dec 2018 19:56:33 +0100 Subject: [PATCH 1/4] gnrc_ipv6: use gnrc_netif_hdr_set_netif() --- sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | 2 +- sys/net/gnrc/network_layer/ipv6/nib/nib.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c index 3e69b051ebfa..37fff172bcb8 100644 --- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c +++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c @@ -232,7 +232,7 @@ static void _send_to_iface(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt) const ipv6_hdr_t *hdr = pkt->next->data; assert(netif != NULL); - ((gnrc_netif_hdr_t *)pkt->data)->if_pid = netif->pid; + gnrc_netif_hdr_set_netif(pkt->data, netif); if (gnrc_pkt_len(pkt->next) > netif->ipv6.mtu) { DEBUG("ipv6: packet too big\n"); gnrc_icmpv6_error_pkt_too_big_send(netif->ipv6.mtu, pkt); diff --git a/sys/net/gnrc/network_layer/ipv6/nib/nib.c b/sys/net/gnrc/network_layer/ipv6/nib/nib.c index 3b8efa519a1d..deef221b7c70 100644 --- a/sys/net/gnrc/network_layer/ipv6/nib/nib.c +++ b/sys/net/gnrc/network_layer/ipv6/nib/nib.c @@ -830,7 +830,7 @@ static void _send_delayed_nbr_adv(const gnrc_netif_t *netif, if ((pkt = _check_release_pkt(pkt, payload)) == NULL) { return; } - ((gnrc_netif_hdr_t *)pkt->data)->if_pid = netif->pid; + gnrc_netif_hdr_set_netif(pkt->data, netif); LL_PREPEND(payload, pkt); _evtimer_add(pkt, GNRC_IPV6_NIB_SND_NA, &nce->snd_na, random_uint32_range(0, NDP_MAX_ANYCAST_MS_DELAY)); @@ -1196,7 +1196,7 @@ static bool _resolve_addr(const ipv6_addr_t *dst, gnrc_netif_t *netif, queue_entry->pkt = NULL; return false; } - ((gnrc_netif_hdr_t *)netif_hdr->data)->if_pid = netif->pid; + gnrc_netif_hdr_set_netif(netif_hdr->data, netif); LL_PREPEND(queue_entry->pkt, netif_hdr); } gnrc_pktqueue_add(&entry->pktqueue, queue_entry); From 2afa6795ef3ff288d0d296c718cc467417174292 Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Thu, 25 Jul 2019 15:47:42 +0200 Subject: [PATCH 2/4] gnrc_ipv6: use gnrc_netif_hdr_get_netif() --- sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c index 37fff172bcb8..4c042673c12c 100644 --- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c +++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c @@ -630,7 +630,7 @@ static void _receive(gnrc_pktsnip_t *pkt) netif_hdr = gnrc_pktsnip_search_type(pkt, GNRC_NETTYPE_NETIF); if (netif_hdr != NULL) { - netif = gnrc_netif_get_by_pid(((gnrc_netif_hdr_t *)netif_hdr->data)->if_pid); + netif = gnrc_netif_hdr_get_netif(netif_hdr->data); #ifdef MODULE_NETSTATS_IPV6 assert(netif != NULL); netstats_t *stats = &netif->ipv6.stats; From 4231b7cd3811e270c2ac7dc620fbdbee85f81278 Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Wed, 12 Dec 2018 19:57:06 +0100 Subject: [PATCH 3/4] gnrc_ndp: use gnrc_netif_hdr_set_netif() --- sys/net/gnrc/network_layer/ndp/gnrc_ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c index 25c29285d975..c42477cfee2e 100644 --- a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c +++ b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c @@ -609,7 +609,7 @@ static gnrc_pktsnip_t *_build_headers(gnrc_netif_t *netif, gnrc_pktbuf_remove_snip(iphdr, iphdr); return NULL; } - ((gnrc_netif_hdr_t *)l2hdr->data)->if_pid = netif->pid; + gnrc_netif_hdr_set_netif(l2hdr->data, netif); LL_PREPEND(iphdr, l2hdr); return l2hdr; } From e865f4e34c781cb47d241b28fbc1a946a7bfd7f9 Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Thu, 25 Jul 2019 15:51:30 +0200 Subject: [PATCH 4/4] gnrc_icmpv6_error: use gnrc_netif_hdr_get/set_netif() --- sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c b/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c index b2f7f308c082..a5a29aca1bd3 100644 --- a/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c +++ b/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c @@ -211,8 +211,7 @@ static void _send(gnrc_pktsnip_t *pkt, const gnrc_pktsnip_t *orig_pkt, if (netif) { /* copy interface from original netif header to assure packet * goes out where it came from */ - gnrc_netif_hdr_t *netif_hdr = netif->data; - kernel_pid_t netif_pid = netif_hdr->if_pid; + gnrc_netif_t *iface = gnrc_netif_hdr_get_netif(netif->data); netif = gnrc_netif_hdr_build(NULL, 0, NULL, 0); if (netif == NULL) { @@ -220,8 +219,7 @@ static void _send(gnrc_pktsnip_t *pkt, const gnrc_pktsnip_t *orig_pkt, gnrc_pktbuf_release(pkt); return; } - netif_hdr = netif->data; - netif_hdr->if_pid = netif_pid; + gnrc_netif_hdr_set_netif(netif->data, iface); LL_PREPEND(pkt, netif); } if (!gnrc_netapi_dispatch_send(GNRC_NETTYPE_IPV6,