RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

sixlowpan_frag: Fix some debug messages for nano-specs

Browse Source
This commit is contained in:
Martine Lenders 2015-05-08 18:25:24 +02:00
parent 0514e11805
commit bc41cfc93f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
View File

@ -222,8 +222,8 @@ static bool _rbuf_update_ints(rbuf_t *entry, uint16_t offset, size_t frag_size)
DEBUG("6lo rfrag: add interval (%" PRIu16 ", %" PRIu16 ") to entry (%s, ", DEBUG("6lo rfrag: add interval (%" PRIu16 ", %" PRIu16 ") to entry (%s, ",
new->start, new->end, ng_netif_addr_to_str(l2addr_str, new->start, new->end, ng_netif_addr_to_str(l2addr_str,
sizeof(l2addr_str), entry->src, entry->src_len)); sizeof(l2addr_str), entry->src, entry->src_len));
DEBUG("%s, %zu, %" PRIu16 ")\n", ng_netif_addr_to_str(l2addr_str, DEBUG("%s, %u, %" PRIu16 ")\n", ng_netif_addr_to_str(l2addr_str,
sizeof(l2addr_str), entry->dst, entry->dst_len), entry->datagram_size, sizeof(l2addr_str), entry->dst, entry->dst_len), entry->datagram_size,
entry->tag); entry->tag);
LL_PREPEND(entry->ints, new); LL_PREPEND(entry->ints, new);
@ -246,8 +246,8 @@ static void _rbuf_gc(void)
else if ((rbuf[i].pkt != NULL) && else if ((rbuf[i].pkt != NULL) &&
((now.seconds - rbuf[i].arrival) > RBUF_TIMEOUT)) { ((now.seconds - rbuf[i].arrival) > RBUF_TIMEOUT)) {
DEBUG("6lo rfrag: entry (%s, ", ng_netif_addr_to_str(l2addr_str, DEBUG("6lo rfrag: entry (%s, ", ng_netif_addr_to_str(l2addr_str,
sizeof(l2addr_str), rbuf[i].src, rbuf[i].src_len)); sizeof(l2addr_str), rbuf[i].src, rbuf[i].src_len));
DEBUG("%s, %zu, %" PRIu16 ") timed out\n", DEBUG("%s, %u, %" PRIu16 ") timed out\n",
ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str), rbuf[i].dst, ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str), rbuf[i].dst,
rbuf[i].dst_len), rbuf[i].dst_len),
rbuf[i].datagram_size, rbuf[i].tag); rbuf[i].datagram_size, rbuf[i].tag);
@ -261,7 +261,7 @@ static void _rbuf_gc(void)
} }
if ((i >= RBUF_SIZE) && (oldest != NULL) && (oldest->pkt != NULL)) { if ((i >= RBUF_SIZE) && (oldest != NULL) && (oldest->pkt != NULL)) {
DEBUG("6lo rfrag: reassembly buffer full, remove oldest entry"); DEBUG("6lo rfrag: reassembly buffer full, remove oldest entry\n");
ng_pktbuf_release(oldest->pkt); ng_pktbuf_release(oldest->pkt);
_rbuf_rem(oldest); _rbuf_rem(oldest);
} }
@ -283,9 +283,10 @@ static rbuf_t *_rbuf_get(const void *src, size_t src_len,
(rbuf[i].dst_len == dst_len) && (rbuf[i].dst_len == dst_len) &&
(memcmp(rbuf[i].src, src, src_len) == 0) && (memcmp(rbuf[i].src, src, src_len) == 0) &&
(memcmp(rbuf[i].dst, dst, dst_len) == 0)) { (memcmp(rbuf[i].dst, dst, dst_len) == 0)) {
DEBUG("6lo rfrag: entry (%s, ", ng_netif_addr_to_str(l2addr_str, DEBUG("6lo rfrag: entry %p (%s, ", (void *)(&rbuf[i]),
sizeof(l2addr_str), rbuf[i].src, rbuf[i].src_len)); ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str),
DEBUG("%s, %zu, %" PRIu16 ") found\n", rbuf[i].src, rbuf[i].src_len));
DEBUG("%s, %u, %" PRIu16 ") found\n",
ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str), ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str),
rbuf[i].dst, rbuf[i].dst_len), rbuf[i].dst, rbuf[i].dst_len),
rbuf[i].datagram_size, rbuf[i].tag); rbuf[i].datagram_size, rbuf[i].tag);
@ -318,9 +319,10 @@ static rbuf_t *_rbuf_get(const void *src, size_t src_len,
res->datagram_size = size; res->datagram_size = size;
res->cur_size = 0; res->cur_size = 0;
DEBUG("6lo rfrag: entry (%s, ", ng_netif_addr_to_str(l2addr_str, DEBUG("6lo rfrag: entry %p (%s, ", (void *)res,
sizeof(l2addr_str), res->src, res->src_len)); ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str), res->src,
DEBUG("%s, %zu, %" PRIu16 ") created\n", res->src_len));
DEBUG("%s, %u, %" PRIu16 ") created\n",
ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str), res->dst, ng_netif_addr_to_str(l2addr_str, sizeof(l2addr_str), res->dst,
res->dst_len), res->datagram_size, res->tag); res->dst_len), res->datagram_size, res->tag);
} }