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

Merge pull request #2534 from jfischer-phytec-iot/pr@udp-header-decompression

Browse Source 
lowpan.c: add udp header decompression
This commit is contained in:
Martine Lenders 2015-03-31 19:39:18 +02:00
commit f1becc6870
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/include/sixlowpan/lowpan.h
View File

@ -78,6 +78,8 @@ extern "C" {
* </a> * </a>
*/ */
#define SIXLOWPAN_IPHC1_NH (0x04) #define SIXLOWPAN_IPHC1_NH (0x04)
#define SIXLOWPAN_NHC_UDP_MASK (0xF8)
#define SIXLOWPAN_NHC_UDP_ID (0xF0)
/** /**
* @brief Flag for Context Identifier Extention (part of second byte * @brief Flag for Context Identifier Extention (part of second byte

26
sys/net/network_layer/sixlowpan/lowpan.c
View File

@ -1233,10 +1233,7 @@ void lowpan_iphc_decoding(uint8_t *data, uint8_t length, net_if_eui64_t *s_addr,
} }
/* NH: Next Header: */ /* NH: Next Header: */
if (lowpan_iphc[0] & SIXLOWPAN_IPHC1_NH) { if (!(lowpan_iphc[0] & SIXLOWPAN_IPHC1_NH)) {
// TODO: next header decompression
}
else {
ipv6_buf->nextheader = ipv6_hdr_fields[hdr_pos]; ipv6_buf->nextheader = ipv6_hdr_fields[hdr_pos];
hdr_pos++; hdr_pos++;
} }
@ -1474,13 +1471,32 @@ void lowpan_iphc_decoding(uint8_t *data, uint8_t length, net_if_eui64_t *s_addr,
uint8_t *ptr = get_payload_buf(ipv6_ext_hdr_len); uint8_t *ptr = get_payload_buf(ipv6_ext_hdr_len);
memcpy(ptr, &ipv6_hdr_fields[hdr_pos], length - hdr_pos); if (lowpan_iphc[0] & SIXLOWPAN_IPHC1_NH) {
if ((ipv6_hdr_fields[hdr_pos] & SIXLOWPAN_NHC_UDP_MASK) == SIXLOWPAN_NHC_UDP_ID) {
ipv6_buf->nextheader = IPV6_PROTO_NUM_UDP;
/* ipv6 length */
ipv6_buf->length = HTONS(length - hdr_pos + 1);
packet_length = IPV6_HDR_LEN + ipv6_buf->length;
hdr_pos ++;
/* copy inline src_port and dst_port */
memcpy(ptr, &ipv6_hdr_fields[hdr_pos], 4);
hdr_pos += 4;
ptr += 4;
/* insert length value */
*((uint16_t*)ptr) = ipv6_buf->length;
ptr += 2;
}
}
else {
/* ipv6 length */ /* ipv6 length */
ipv6_buf->length = HTONS(length - hdr_pos); ipv6_buf->length = HTONS(length - hdr_pos);
packet_length = IPV6_HDR_LEN + ipv6_buf->length; packet_length = IPV6_HDR_LEN + ipv6_buf->length;
} }
memcpy(ptr, &ipv6_hdr_fields[hdr_pos], length - hdr_pos);
}
uint8_t lowpan_context_len(void) uint8_t lowpan_context_len(void)
{ {
return context_len; return context_len;