riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3708 from authmillenon/gnrc/fix/i3707

Browse Source 
gnrc(_udp|_ipv6): write protect preceding headers and hand actually hand them over on send
This commit is contained in:
Martine Lenders 2015-08-31 22:07:37 +02:00
commit 170fa70d9e
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,6 +522,9 @@ static void _send(gnrc_pktsnip_t *pkt, bool prep_hdr)
if (ipv6 != pkt) { /* in case packet has netif header */ if (ipv6 != pkt) { /* in case packet has netif header */
pkt->next = payload;/* pkt is already write-protected so we can do that */ pkt->next = payload;/* pkt is already write-protected so we can do that */
} }
else {
pkt = payload; /* pkt is the IPv6 header so we just write-protected it */
}
ipv6 = payload; /* Reset ipv6 from temporary variable */ ipv6 = payload; /* Reset ipv6 from temporary variable */
hdr = ipv6->data; hdr = ipv6->data;

27
sys/net/gnrc/transport_layer/udp/gnrc_udp.c
View File

@ -139,13 +139,34 @@ static void _receive(gnrc_pktsnip_t *pkt)
static void _send(gnrc_pktsnip_t *pkt) static void _send(gnrc_pktsnip_t *pkt)
{ {
udp_hdr_t *hdr; udp_hdr_t *hdr;
gnrc_pktsnip_t *udp_snip; gnrc_pktsnip_t *udp_snip, *tmp;
/* get udp snip and hdr */ /* write protect first header */
LL_SEARCH_SCALAR(pkt, udp_snip, type, GNRC_NETTYPE_UDP); tmp = gnrc_pktbuf_start_write(pkt);
if (tmp == NULL) {
DEBUG("udp: cannot send packet: unable to allocate packet\n");
gnrc_pktbuf_release(pkt);
return;
}
pkt = tmp;
udp_snip = tmp->next;
/* get and write protect until udp snip */
while ((udp_snip != NULL) && (udp_snip->type != GNRC_NETTYPE_UDP)) {
udp_snip = gnrc_pktbuf_start_write(udp_snip);
if (udp_snip == NULL) {
DEBUG("udp: cannot send packet: unable to allocate packet\n");
gnrc_pktbuf_release(pkt);
return;
}
tmp->next = udp_snip;
tmp = udp_snip;
udp_snip = udp_snip->next;
}
assert(udp_snip != NULL); assert(udp_snip != NULL);
/* write protect UDP snip */
udp_snip = gnrc_pktbuf_start_write(udp_snip); udp_snip = gnrc_pktbuf_start_write(udp_snip);
if (udp_snip == NULL) { if (udp_snip == NULL) {
DEBUG("udp: cannot send packet: unable to allocate packet\n"); DEBUG("udp: cannot send packet: unable to allocate packet\n");