kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-30 17:01:19 +01:00
Code Releases Activity

Merge pull request #10679 from miri64/gnrc_sixlowpan_frag/fix/send-check-msg-queue

Browse Source 
gnrc_sixlowpan_frag: check if own message queue is full
This commit is contained in:
Gunar Schorcht 2018-12-30 15:48:26 +01:00 committed by GitHub
commit d3f78a5a40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
sys/net/gnrc/network_layer/sixlowpan/frag/gnrc_sixlowpan_frag.c
View File

@ -263,46 +263,40 @@ void gnrc_sixlowpan_frag_send(gnrc_pktsnip_t *pkt, void *ctx, unsigned page)
if (fragment_msg->offset == 0) {
/* increment tag for successive, fragmented datagrams */
_tag++;
if ((res = _send_1st_fragment(iface, fragment_msg->pkt, payload_len, fragment_msg->datagram_size)) == 0) {
if ((res = _send_1st_fragment(iface, fragment_msg->pkt, payload_len,
fragment_msg->datagram_size)) == 0) {
/* error sending first fragment */
DEBUG("6lo frag: error sending 1st fragment\n");
gnrc_pktbuf_release(fragment_msg->pkt);
fragment_msg->pkt = NULL;
return;
goto error;
}
}
/* (offset + (datagram_size - payload_len) < datagram_size) simplified */
else if (fragment_msg->offset < payload_len) {
if ((res = _send_nth_fragment(iface, fragment_msg->pkt, payload_len,
fragment_msg->datagram_size,
fragment_msg->offset)) == 0) {
/* error sending subsequent fragment */
DEBUG("6lo frag: error sending subsequent fragment"
"(offset = %u)\n", fragment_msg->offset);
goto error;
}
fragment_msg->offset += res;
/* send message to self*/
msg.type = GNRC_SIXLOWPAN_MSG_FRAG_SND;
msg.content.ptr = (void *)fragment_msg;
msg_send_to_self(&msg);
thread_yield();
}
else {
/* (offset + (datagram_size - payload_len) < datagram_size) simplified */
if (fragment_msg->offset < payload_len) {
if ((res = _send_nth_fragment(iface, fragment_msg->pkt, payload_len, fragment_msg->datagram_size,
fragment_msg->offset)) == 0) {
/* error sending subsequent fragment */
DEBUG("6lo frag: error sending subsequent fragment (offset = %" PRIu16
")\n", fragment_msg->offset);
gnrc_pktbuf_release(fragment_msg->pkt);
fragment_msg->pkt = NULL;
return;
}
fragment_msg->offset += res;
/* send message to self*/
msg.type = GNRC_SIXLOWPAN_MSG_FRAG_SND;
msg.content.ptr = (void *)fragment_msg;
msg_send_to_self(&msg);
thread_yield();
}
else {
gnrc_pktbuf_release(fragment_msg->pkt);
fragment_msg->pkt = NULL;
}
goto error;
}
fragment_msg->offset += res;
msg.type = GNRC_SIXLOWPAN_MSG_FRAG_SND,
msg.content.ptr = fragment_msg;
if (msg_send_to_self(&msg) == 0) {
printf("6lo frag: message queue full, can't issue next fragment "
"sending\n");
goto error;
}
thread_yield();
return;
error:
gnrc_pktbuf_release(fragment_msg->pkt);
fragment_msg->pkt = NULL;
}
void gnrc_sixlowpan_frag_recv(gnrc_pktsnip_t *pkt, void *ctx, unsigned page)