Skip to content

Commit

Permalink
gnrc_sixlowpan: Fix IPHC/NHC packet order problem
Browse files Browse the repository at this point in the history
  • Loading branch information
@miri64 @cgundogan
miri64 authored and cgundogan committed Dec 22, 2015
1 parent 693d438 commit f3e3eac
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 37 deletions.
12 changes: 6 additions & 6 deletions sys/include/net/gnrc/sixlowpan/iphc.h
View file
Expand Up @@ -32,11 +32,11 @@ extern "C" {
/**
* @brief Decompresses a received 6LoWPAN IPHC frame.
*
* @pre (ipv6 != NULL) && (ipv6->size >= sizeof(gnrc_ipv6_hdr_t))
* @pre (dec_hdr != NULL) && (*dec_hdr != NULL) && ((*dec_hdr)->size >= sizeof(gnrc_ipv6_hdr_t))
*
* @param[out] ipv6 A pre-allocated IPv6 header. Will not be inserted into
* @p pkt
* @param[in,out] pkt A received 6LoWPAN IPHC frame. IPHC dispatch will not
* @param[out] dec_hdr A pre-allocated IPv6 header. Will not be inserted into
* @p pkt. May change due to next headers being added in NHC.
* @param[in] pkt A received 6LoWPAN IPHC frame. IPHC dispatch will not
* be marked.
* @param[in] datagram_size Size of the full uncompressed IPv6 datagram. May be 0, if @p pkt
* contains the full (unfragmented) IPv6 datagram.
Expand All @@ -45,8 +45,8 @@ extern "C" {
* @return length of the HC dispatches + inline values on success.
* @return 0 on error.
*/
size_t gnrc_sixlowpan_iphc_decode(gnrc_pktsnip_t *ipv6, gnrc_pktsnip_t *pkt, size_t datagram_size,
size_t offset);
size_t gnrc_sixlowpan_iphc_decode(gnrc_pktsnip_t **dec_hdr, gnrc_pktsnip_t *pkt,
size_t datagram_size, size_t offset);

/**
* @brief Compresses a 6LoWPAN for IPHC.
Expand Down
2 changes: 1 addition & 1 deletion sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.c
View file
Expand Up @@ -92,7 +92,7 @@ void rbuf_add(gnrc_netif_hdr_t *netif_hdr, gnrc_pktsnip_t *pkt,
#ifdef MODULE_GNRC_SIXLOWPAN_IPHC
else if (sixlowpan_iphc_is(data)) {
size_t iphc_len;
iphc_len = gnrc_sixlowpan_iphc_decode(entry->pkt, pkt, entry->pkt->size,
iphc_len = gnrc_sixlowpan_iphc_decode(&entry->pkt, pkt, entry->pkt->size,
sizeof(sixlowpan_frag_t));
if (iphc_len == 0) {
DEBUG("6lo rfrag: could not decode IPHC dispatch\n");
Expand Down
35 changes: 15 additions & 20 deletions sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c
View file
Expand Up @@ -118,6 +118,7 @@ static void _receive(gnrc_pktsnip_t *pkt)
}

pkt = gnrc_pktbuf_remove_snip(pkt, sixlowpan);
payload->type = GNRC_NETTYPE_IPV6;
}
#ifdef MODULE_GNRC_SIXLOWPAN_FRAG
else if (sixlowpan_frag_is((sixlowpan_frag_t *)dispatch)) {
Expand All @@ -129,36 +130,33 @@ static void _receive(gnrc_pktsnip_t *pkt)
#ifdef MODULE_GNRC_SIXLOWPAN_IPHC
else if (sixlowpan_iphc_is(dispatch)) {
size_t dispatch_size;
gnrc_pktsnip_t *sixlowpan;
gnrc_pktsnip_t *ipv6 = gnrc_pktbuf_add(NULL, NULL, sizeof(ipv6_hdr_t),
GNRC_NETTYPE_IPV6);
if ((ipv6 == NULL) ||
(dispatch_size = gnrc_sixlowpan_iphc_decode(ipv6, pkt, 0, 0)) == 0) {
gnrc_pktsnip_t *sixlowpan, *tmp;
gnrc_pktsnip_t *dec_hdr = gnrc_pktbuf_add(NULL, NULL, sizeof(ipv6_hdr_t),
GNRC_NETTYPE_IPV6);
if ((dec_hdr == NULL) ||
(dispatch_size = gnrc_sixlowpan_iphc_decode(&dec_hdr, pkt, 0, 0)) == 0) {
DEBUG("6lo: error on IPHC decoding\n");
if (ipv6 != NULL) {
gnrc_pktbuf_release(ipv6);
if (dec_hdr != NULL) {
gnrc_pktbuf_release(dec_hdr);
}
gnrc_pktbuf_release(pkt);
return;
}
sixlowpan = gnrc_pktbuf_mark(pkt, dispatch_size, GNRC_NETTYPE_SIXLOWPAN);
if (sixlowpan == NULL) {
DEBUG("6lo: error on marking IPHC dispatch\n");
gnrc_pktbuf_release(ipv6);
gnrc_pktbuf_release(dec_hdr);
gnrc_pktbuf_release(pkt);
return;
}

/* Remove IPHC dispatch */
/* Remove IPHC dispatches */
gnrc_pktbuf_remove_snip(pkt, sixlowpan);
/* Insert IPv6 header instead */
if (ipv6->next != NULL) {
ipv6->next->next = pkt->next;
}
else {
ipv6->next = pkt->next;
}
pkt->next = ipv6;
/* Insert decoded header instead */
LL_SEARCH_SCALAR(dec_hdr, tmp, next, NULL); /* search last decoded header */
tmp->next = pkt->next;
pkt->next = dec_hdr;
payload->type = GNRC_NETTYPE_UNDEF;
}
#endif
else {
Expand All @@ -167,9 +165,6 @@ static void _receive(gnrc_pktsnip_t *pkt)
gnrc_pktbuf_release(pkt);
return;
}

payload->type = GNRC_NETTYPE_IPV6;

if (!gnrc_netapi_dispatch_receive(GNRC_NETTYPE_IPV6, GNRC_NETREG_DEMUX_CTX_ALL, pkt)) {
DEBUG("6lo: No receivers for this packet found\n");
gnrc_pktbuf_release(pkt);
Expand Down
26 changes: 16 additions & 10 deletions sys/net/gnrc/network_layer/sixlowpan/iphc/gnrc_sixlowpan_iphc.c
View file
Expand Up @@ -111,16 +111,18 @@ static inline bool _context_overlaps_iid(gnrc_sixlowpan_ctx_t *ctx,
(iid->uint8[(ctx->prefix_len / 8) - 8] & byte_mask[ctx->prefix_len % 8])));
}

#ifdef MODULE_GNRC_UDP
inline static size_t iphc_nhc_udp_decode(gnrc_pktsnip_t *pkt, gnrc_pktsnip_t *ipv6, size_t offset)
#if defined(MODULE_GNRC_UDP) && defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC)
inline static size_t iphc_nhc_udp_decode(gnrc_pktsnip_t *pkt, gnrc_pktsnip_t **dec_hdr,
size_t offset)
{
uint8_t *payload = pkt->data;
uint8_t udp_nhc = payload[offset++];
gnrc_pktsnip_t *ipv6 = *dec_hdr;
ipv6_hdr_t *ipv6_hdr = ipv6->data;
uint8_t tmp;

gnrc_pktsnip_t *udp = gnrc_pktbuf_add(NULL, NULL, sizeof(udp_hdr_t),
GNRC_NETTYPE_UDP);
uint8_t udp_nhc = payload[offset++];
uint8_t tmp;

if (udp == NULL) {
DEBUG("6lo: error on IPHC NHC UDP decoding\n");
return 0;
Expand Down Expand Up @@ -178,21 +180,25 @@ inline static size_t iphc_nhc_udp_decode(gnrc_pktsnip_t *pkt, gnrc_pktsnip_t *ip
ipv6_hdr->nh = PROTNUM_UDP;
ipv6_hdr->len = udp_hdr->length;

ipv6->next = udp;
udp->next = ipv6;
*dec_hdr = udp;

return offset;
}
#endif

size_t gnrc_sixlowpan_iphc_decode(gnrc_pktsnip_t *ipv6, gnrc_pktsnip_t *pkt, size_t datagram_size,
size_t offset)
size_t gnrc_sixlowpan_iphc_decode(gnrc_pktsnip_t **dec_hdr, gnrc_pktsnip_t *pkt,
size_t datagram_size, size_t offset)
{
gnrc_pktsnip_t *ipv6;
gnrc_netif_hdr_t *netif_hdr = pkt->next->data;
ipv6_hdr_t *ipv6_hdr;
uint8_t *iphc_hdr = pkt->data;
size_t payload_offset = SIXLOWPAN_IPHC_HDR_LEN;
gnrc_sixlowpan_ctx_t *ctx = NULL;

assert(dec_hdr != NULL);
ipv6 = *dec_hdr;
assert(ipv6 != NULL);
assert(ipv6->size >= sizeof(ipv6_hdr_t));

Expand Down Expand Up @@ -472,7 +478,7 @@ size_t gnrc_sixlowpan_iphc_decode(gnrc_pktsnip_t *ipv6, gnrc_pktsnip_t *pkt, siz
switch (iphc_hdr[payload_offset] & NHC_ID_MASK) {
#ifdef MODULE_GNRC_UDP
case NHC_UDP_ID:
payload_offset = iphc_nhc_udp_decode(pkt, ipv6, payload_offset);
payload_offset = iphc_nhc_udp_decode(pkt, dec_hdr, payload_offset);
break;
#endif

Expand All @@ -485,7 +491,7 @@ size_t gnrc_sixlowpan_iphc_decode(gnrc_pktsnip_t *ipv6, gnrc_pktsnip_t *pkt, siz
return payload_offset;
}

#ifdef MODULE_GNRC_UDP
#if defined(MODULE_GNRC_UDP) && defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC)
inline static size_t iphc_nhc_udp_encode(gnrc_pktsnip_t *udp, ipv6_hdr_t *ipv6_hdr)
{
udp_hdr_t *udp_hdr = udp->data;
Expand Down

0 comments on commit f3e3eac

Please sign in to comment.