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 #11918 from miri64/gnrc_ipv6/enh/use-netif_hdr-setter

Browse Source 
gnrc_ipv6: use gnrc_netif_hdr_get/set_netif()
This commit is contained in:
Martine Lenders 2019-07-26 12:00:39 +02:00 committed by GitHub
commit 44410a4aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c
View File

@ -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,

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

@ -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);
@ -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;

4
sys/net/gnrc/network_layer/ipv6/nib/nib.c
View File

@ -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);

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

@ -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;
}