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

Merge pull request #12879 from miri64/gnrc_sixlowpan_iphc/feat/nhc-ext

Browse Source 
gnrc_sixlowpan_iphc: add support for IPv6 extension header compression
This commit is contained in:
benpicco 2020-01-31 12:02:47 +01:00 committed by GitHub
commit c7b0483549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 781 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sys/net/gnrc/network_layer/ipv6/ext/gnrc_ipv6_ext.c
View File

@ -25,6 +25,11 @@
#include "net/gnrc/ipv6.h"
#include "net/gnrc/ipv6/ext/frag.h"
#include "net/gnrc/ipv6/ext/rh.h"
#if defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) && \
defined(MODULE_GNRC_IPV6_EXT_FRAG)
#include "net/udp.h"
#endif /* defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) &&
* defined(MODULE_GNRC_IPV6_EXT_FRAG) */
#include "net/gnrc/ipv6/ext.h"
@ -101,7 +106,22 @@ gnrc_pktsnip_t *gnrc_ipv6_ext_process_all(gnrc_pktsnip_t *pkt,
uint8_t *protnum)
{
bool is_ext = true;
#if defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) && \
defined(MODULE_GNRC_IPV6_EXT_FRAG)
bool is_frag = false;
#endif /* defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) &&
* defined(MODULE_GNRC_IPV6_EXT_FRAG) */
while (is_ext) {
#if defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) && \
defined(MODULE_GNRC_IPV6_EXT_FRAG)
if (*protnum == PROTNUM_IPV6_EXT_FRAG) {
/* just assigning the if expression might override it if
* fragment header is not the last extension header ;-) */
is_frag = true;
}
#endif /* defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) &&
* defined(MODULE_GNRC_IPV6_EXT_FRAG) */
switch (*protnum) {
case PROTNUM_IPV6_EXT_DST:
case PROTNUM_IPV6_EXT_RH:
@ -127,6 +147,34 @@ gnrc_pktsnip_t *gnrc_ipv6_ext_process_all(gnrc_pktsnip_t *pkt,
}
break;
}
#if defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) && \
defined(MODULE_GNRC_IPV6_EXT_FRAG)
case PROTNUM_UDP:
if (is_frag) {
DEBUG("gnrc_ipv6_ext: adapting compressed header length\n");
/* we can only really now determine the length of the UDP
* packet, after the IPv6 datagram is fully reassembled */
udp_hdr_t *udp_hdr = pkt->data;
udp_hdr->length = byteorder_htons((uint16_t)pkt->size);
}
is_ext = false;
break;
case PROTNUM_IPV6:
if (is_frag) {
DEBUG("gnrc_ipv6_ext: adapting compressed header length\n");
/* we can only really now determine the length of the
* encapsulated IPv6 header, after the IPv6 datagram is
* fully reassembled */
ipv6_hdr_t *ipv6_hdr = pkt->data;
ipv6_hdr->len = byteorder_htons((uint16_t)pkt->size -
sizeof(ipv6_hdr_t));
}
is_ext = false;
break;
#endif /* defined(MODULE_GNRC_SIXLOWPAN_IPHC_NHC) &&
* defined(MODULE_GNRC_IPV6_EXT_FRAG) */
default:
is_ext = false;
break;

1042
sys/net/gnrc/network_layer/sixlowpan/iphc/gnrc_sixlowpan_iphc.c
View File

File diff suppressed because it is too large Load Diff

2
tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci
View File

@ -19,4 +19,6 @@ BOARD_INSUFFICIENT_MEMORY := \
stm32l0538-disco \
telosb \
waspmote-pro \
wsn430-v1_3b \
wsn430-v1_4 \
#