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

gnrc_ipv6_ext_frag: fix release on rbuf creation for n-th fragment

Browse Source 
The IPv6 (extension) headers of the first fragment received are re-used
for the reassembled packet, so when receiving a subsequent packet we
need to distinguish, if we just want to release the payload or all of
the packet after the packet data was added to the reassembly buffer.
This commit is contained in:
Martine S. Lenders 2019-10-10 16:23:08 +02:00
parent 07a6b5425e
commit 095e966b73
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/net/gnrc/network_layer/ipv6/ext/frag/gnrc_ipv6_ext_frag.c
View File

@ -455,6 +455,7 @@ gnrc_pktsnip_t *gnrc_ipv6_ext_frag_reass(gnrc_pktsnip_t *pkt)
goto error_exit;
}
if (rbuf->pkt == NULL) {
/* entry did not exist yet */
rbuf->pkt = gnrc_pktbuf_add(fh_snip->next, NULL, size_until,
GNRC_NETTYPE_UNDEF);
if (rbuf->pkt == NULL) {
@ -464,15 +465,25 @@ gnrc_pktsnip_t *gnrc_ipv6_ext_frag_reass(gnrc_pktsnip_t *pkt)
}
}
else if (rbuf->pkt->size < size_until) {
/* entry exists already but doesn't fit full datagram yet */
if (gnrc_pktbuf_realloc_data(rbuf->pkt, size_until) != 0) {
DEBUG("ipv6_ext_frag: unable to allocate space for reassembled "
"packet\n");
goto error_exit;
}
}
/* copy payload of fragment into reassembled datagram */
memcpy(((uint8_t *)rbuf->pkt->data) + offset, pkt->data, pkt->size);
/* we don't need the rest anymore */
gnrc_pktbuf_release(pkt);
/* if entry was newly created above */
if (rbuf->pkt->next == fh_snip->next) {
/* we don't need the payload anymore, headers are still kept to be
* reused when assembled, so just remove the payload. */
gnrc_pktbuf_remove_snip(pkt, pkt);
}
else {
/* we don't need the rest anymore */
gnrc_pktbuf_release(pkt);
}
return _completed(rbuf);
}
else if (!ipv6_ext_frag_more(fh)) {