Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

6loWPAN: Costmetic changes.

Browse Source
This commit is contained in:
Gregory Nutt
2017-04-05 17:26:12 -06:00
parent 72bffeddcc
commit d0aa22fb80
2 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/net/sixlowpan.h
+28 -25
View File
@@ -94,37 +94,40 @@
/* IPHC encoding /* IPHC encoding
* *
* Values of fields within the IPHC encoding first byte (C stands for * Values of fields within the IPHC encoding first byte
* compressed and I for inline) * (Using MS-to-LS bit numbering of the draft RFC)
*/ */
/* Bits 0-2: 011 */
#define SIXLOWPAN_IPHC_FL_C 0x10 #define SIXLOWPAN_IPHC_TC_MASK 0x18 /* Bits 3-4: Traffic Class, Flow Label */
#define SIXLOWPAN_IPHC_TC_C 0x08 # define SIXLOWPAN_IPHC_TC_00 0x00 /* ECN+DSCP+4-bit Pad+Flow Label (4 bytes) */
#define SIXLOWPAN_IPHC_NH_C 0x04 # define SIXLOWPAN_IPHC_TC_01 0x08 /* ECN+2-bit Pad+ Flow Label (3 bytes), DSCP is elided. */
#define SIXLOWPAN_IPHC_TTL_1 0x01 # define SIXLOWPAN_IPHC_TC_10 0x10 /* ECN+DSCP (1 byte), Flow Label is elided */
#define SIXLOWPAN_IPHC_TTL_64 0x02 # define SIXLOWPAN_IPHC_TC_11 0x11 /* Traffic Class and Flow Label are elided */
#define SIXLOWPAN_IPHC_TTL_255 0x03 #define SIXLOWPAN_IPHC_NH 0x04 /* Bit 5: Next Header Compressed */
#define SIXLOWPAN_IPHC_TTL_I 0x00 #define SIXLOWPAN_IPHC_HLIM_MASK 0x03 /* Bits 6-7: Hop Limit */
# define SIXLOWPAN_IPHC_HLIM_INLINE 0x00 /* Carried in-line */
# define SIXLOWPAN_IPHC_HLIM_1 0x01 /* Compressed hop limit of 1 */
# define SIXLOWPAN_IPHC_HLIM_64 0x02 /* Compressed hop limit of 64 */
# define SIXLOWPAN_IPHC_HLIM_255 0x03 /* Compressed hop limit of 255 */
/* Values of fields within the IPHC encoding second byte */ /* Values of fields within the IPHC encoding second byte */
#define SIXLOWPAN_IPHC_CID 0x80 #define SIXLOWPAN_IPHC_CID 0x80 /* Bit 8: Context identifier extension */
#define SIXLOWPAN_IPHC_SAC 0x40 /* Bit 9: Source address compression */
#define SIXLOWPAN_IPHC_SAC 0x40 #define SIXLOWPAN_IPHC_SAM_MASK 0x30 /* Bits 10-11: Source address mode */
#define SIXLOWPAN_IPHC_SAM_00 0x00 # define SIXLOWPAN_IPHC_SAM_128 0x00 /* 128-bits */
#define SIXLOWPAN_IPHC_SAM_01 0x10 # define SIXLOWPAN_IPHC_SAM_64 0x10 /* 64-bits */
#define SIXLOWPAN_IPHC_SAM_10 0x20 # define SIXLOWPAN_IPHC_SAM_16 0x20 /* 16-bits */
#define SIXLOWPAN_IPHC_SAM_11 0x30 # define SIXLOWPAN_IPHC_SAM_0 0x30 /* 0-bits */
#define SIXLOWPAN_IPHC_M 0x08 /* Bit 12: Multicast compression */
#define SIXLOWPAN_IPHC_DAC 0x04 /* Bit 13: Destination address compression */
#define SIXLOWPAN_IPHC_DAM_MASK 0x03 /* Bits 14-15: Destination address mode */
# define SIXLOWPAN_IPHC_DAM_128 0x00 /* 128-bits */
# define SIXLOWPAN_IPHC_DAM_64 0x01 /* 64-bits */
# define SIXLOWPAN_IPHC_DAM_16 0x02 /* 16-bits */
# define SIXLOWPAN_IPHC_DAM_0 0x03 /* 0-bits */
#define SIXLOWPAN_IPHC_SAM_BIT 4 #define SIXLOWPAN_IPHC_SAM_BIT 4
#define SIXLOWPAN_IPHC_M 0x08
#define SIXLOWPAN_IPHC_DAC 0x04
#define SIXLOWPAN_IPHC_DAM_00 0x00
#define SIXLOWPAN_IPHC_DAM_01 0x01
#define SIXLOWPAN_IPHC_DAM_10 0x02
#define SIXLOWPAN_IPHC_DAM_11 0x03
#define SIXLOWPAN_IPHC_DAM_BIT 0 #define SIXLOWPAN_IPHC_DAM_BIT 0
/* Link local context number */ /* Link local context number */
net/sixlowpan/sixlowpan_hc06.c
+32 -32
View File
@@ -508,12 +508,12 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
{ {
/* Flow label can be compressed */ /* Flow label can be compressed */
iphc0 |= SIXLOWPAN_IPHC_FL_C; iphc0 |= SIXLOWPAN_IPHC_TC_10;
if (((ipv6->vtc & 0x0f) == 0) && ((ipv6->tcf & 0xf0) == 0)) if (((ipv6->vtc & 0x0f) == 0) && ((ipv6->tcf & 0xf0) == 0))
{ {
/* Compress (elide) all */ /* Compress (elide) all */
iphc0 |= SIXLOWPAN_IPHC_TC_C; iphc0 |= SIXLOWPAN_IPHC_TC_01;
} }
else else
{ {
@@ -531,7 +531,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
{ {
/* Compress only traffic class */ /* Compress only traffic class */
iphc0 |= SIXLOWPAN_IPHC_TC_C; iphc0 |= SIXLOWPAN_IPHC_TC_01;
*g_hc06ptr = (tmp & 0xc0) | (ipv6->tcf & 0x0f); *g_hc06ptr = (tmp & 0xc0) | (ipv6->tcf & 0x0f);
memcpy(g_hc06ptr + 1, &ipv6->flow, 2); memcpy(g_hc06ptr + 1, &ipv6->flow, 2);
g_hc06ptr += 3; g_hc06ptr += 3;
@@ -556,11 +556,11 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
#if CONFIG_NET_UDP || UIP_CONF_ROUTER #if CONFIG_NET_UDP || UIP_CONF_ROUTER
if (ipv6->proto == IP_PROTO_UDP) if (ipv6->proto == IP_PROTO_UDP)
{ {
iphc0 |= SIXLOWPAN_IPHC_NH_C; iphc0 |= SIXLOWPAN_IPHC_NH;
} }
#endif /* CONFIG_NET_UDP */ #endif /* CONFIG_NET_UDP */
if ((iphc0 & SIXLOWPAN_IPHC_NH_C) == 0) if ((iphc0 & SIXLOWPAN_IPHC_NH) == 0)
{ {
*g_hc06ptr = ipv6->proto; *g_hc06ptr = ipv6->proto;
g_hc06ptr += 1; g_hc06ptr += 1;
@@ -577,15 +577,15 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
switch (ipv6->ttl) switch (ipv6->ttl)
{ {
case 1: case 1:
iphc0 |= SIXLOWPAN_IPHC_TTL_1; iphc0 |= SIXLOWPAN_IPHC_HLIM_1;
break; break;
case 64: case 64:
iphc0 |= SIXLOWPAN_IPHC_TTL_64; iphc0 |= SIXLOWPAN_IPHC_HLIM_64;
break; break;
case 255: case 255:
iphc0 |= SIXLOWPAN_IPHC_TTL_255; iphc0 |= SIXLOWPAN_IPHC_HLIM_255;
break; break;
default: default:
@@ -601,7 +601,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
ninfo("Compressing unspecified. Setting SAC\n"); ninfo("Compressing unspecified. Setting SAC\n");
iphc1 |= SIXLOWPAN_IPHC_SAC; iphc1 |= SIXLOWPAN_IPHC_SAC;
iphc1 |= SIXLOWPAN_IPHC_SAM_00; iphc1 |= SIXLOWPAN_IPHC_SAM_128;
} }
else if ((addrcontext = find_addrcontext_byprefix(ipv6->srcipaddr)) != NULL) else if ((addrcontext = find_addrcontext_byprefix(ipv6->srcipaddr)) != NULL)
{ {
@@ -613,7 +613,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
iphc1 |= SIXLOWPAN_IPHC_CID | SIXLOWPAN_IPHC_SAC; iphc1 |= SIXLOWPAN_IPHC_CID | SIXLOWPAN_IPHC_SAC;
iphc[2] |= addrcontext->number << 4; iphc[2] |= addrcontext->number << 4;
/* Compession compare with this nodes address (source) */ /* Compression compare with this nodes address (source) */
iphc1 |= compress_addr_64(ipv6->srcipaddr, &ieee->i_nodeaddr, iphc1 |= compress_addr_64(ipv6->srcipaddr, &ieee->i_nodeaddr,
SIXLOWPAN_IPHC_SAM_BIT); SIXLOWPAN_IPHC_SAM_BIT);
@@ -631,7 +631,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
{ {
/* Send the full address => SAC = 0, SAM = 00 */ /* Send the full address => SAC = 0, SAM = 00 */
iphc1 |= SIXLOWPAN_IPHC_SAM_00; /* 128-bits */ iphc1 |= SIXLOWPAN_IPHC_SAM_128; /* 128-bits */
memcpy(g_hc06ptr, ipv6->srcipaddr, 16); memcpy(g_hc06ptr, ipv6->srcipaddr, 16);
g_hc06ptr += 16; g_hc06ptr += 16;
} }
@@ -645,7 +645,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
iphc1 |= SIXLOWPAN_IPHC_M; iphc1 |= SIXLOWPAN_IPHC_M;
if (SIXLOWPAN_IS_MCASTADDR_COMPRESSABLE8(ipv6->destipaddr)) if (SIXLOWPAN_IS_MCASTADDR_COMPRESSABLE8(ipv6->destipaddr))
{ {
iphc1 |= SIXLOWPAN_IPHC_DAM_11; iphc1 |= SIXLOWPAN_IPHC_DAM_0;
/* Use last byte */ /* Use last byte */
@@ -656,7 +656,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
{ {
FAR uint8_t *iptr = (FAR uint8_t *)ipv6->destipaddr; FAR uint8_t *iptr = (FAR uint8_t *)ipv6->destipaddr;
iphc1 |= SIXLOWPAN_IPHC_DAM_10; iphc1 |= SIXLOWPAN_IPHC_DAM_16;
/* Second byte + the last three */ /* Second byte + the last three */
@@ -668,7 +668,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
{ {
FAR uint8_t *iptr = (FAR uint8_t *)ipv6->destipaddr; FAR uint8_t *iptr = (FAR uint8_t *)ipv6->destipaddr;
iphc1 |= SIXLOWPAN_IPHC_DAM_01; iphc1 |= SIXLOWPAN_IPHC_DAM_64;
/* Second byte + the last five */ /* Second byte + the last five */
@@ -678,7 +678,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
} }
else else
{ {
iphc1 |= SIXLOWPAN_IPHC_DAM_00; iphc1 |= SIXLOWPAN_IPHC_DAM_128;
/* Full address */ /* Full address */
@@ -715,7 +715,7 @@ void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
{ {
/* Send the full address */ /* Send the full address */
iphc1 |= SIXLOWPAN_IPHC_DAM_00; /* 128-bits */ iphc1 |= SIXLOWPAN_IPHC_DAM_128; /* 128-bits */
memcpy(g_hc06ptr, ipv6->destipaddr, 16); memcpy(g_hc06ptr, ipv6->destipaddr, 16);
g_hc06ptr += 16; g_hc06ptr += 16;
} }
@@ -865,7 +865,7 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
g_hc06ptr = payptr + 2; g_hc06ptr = payptr + 2;
ninfo("payptr=%p g_frame_hdrlen=%u iphc=%02x:%02x:%02x g_hc06ptr=%p\n", ninfo("payptr=%p g_frame_hdrlen=%u iphc=%02x:%02x:%02x g_hc06ptr=%p\n",
payptr, g_frame_hdrlen, iphc, iphc[0], iphc[1], iphc[2], g_hc06ptr); payptr, g_frame_hdrlen, iphc[0], iphc[1], iphc[2], g_hc06ptr);
/* Another if the CID flag is set */ /* Another if the CID flag is set */
@@ -877,11 +877,11 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
/* Traffic class and flow label */ /* Traffic class and flow label */
if ((iphc0 & SIXLOWPAN_IPHC_FL_C) == 0) if ((iphc0 & SIXLOWPAN_IPHC_TC_10) == 0)
{ {
/* Flow label are carried inline */ /* Flow label are carried inline */
if ((iphc0 & SIXLOWPAN_IPHC_TC_C) == 0) if ((iphc0 & SIXLOWPAN_IPHC_TC_01) == 0)
{ {
/* Traffic class is carried inline */ /* Traffic class is carried inline */
@@ -916,7 +916,7 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
/* Version is always 6! */ /* Version is always 6! */
/* Version and flow label are compressed */ /* Version and flow label are compressed */
if ((iphc0 & SIXLOWPAN_IPHC_TC_C) == 0) if ((iphc0 & SIXLOWPAN_IPHC_TC_01) == 0)
{ {
/* Traffic class is inline */ /* Traffic class is inline */
@@ -937,7 +937,7 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
/* Next Header */ /* Next Header */
if ((iphc0 & SIXLOWPAN_IPHC_NH_C) == 0) if ((iphc0 & SIXLOWPAN_IPHC_NH) == 0)
{ {
/* Next header is carried inline */ /* Next header is carried inline */
@@ -948,9 +948,9 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
/* Hop limit */ /* Hop limit */
if ((iphc0 & 0x03) != SIXLOWPAN_IPHC_TTL_I) if ((iphc0 & SIXLOWPAN_IPHC_HLIM_MASK) != SIXLOWPAN_IPHC_HLIM_INLINE)
{ {
ipv6->ttl = g_ttl_values[iphc0 & 0x03]; ipv6->ttl = g_ttl_values[iphc0 & SIXLOWPAN_IPHC_HLIM_MASK];
} }
else else
{ {
@@ -960,7 +960,7 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
/* Put the source address compression mode SAM in the tmp var */ /* Put the source address compression mode SAM in the tmp var */
tmp = ((iphc1 & SIXLOWPAN_IPHC_SAM_11) >> SIXLOWPAN_IPHC_SAM_BIT) & 0x03; tmp = ((iphc1 & SIXLOWPAN_IPHC_SAM_MASK) >> SIXLOWPAN_IPHC_SAM_BIT) & 0x03;
/* Address context based compression */ /* Address context based compression */
@@ -996,9 +996,9 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
} }
/* Destination address */ /* Destination address */
/* put the destination address compression mode into tmp */ /* Put the destination address compression mode into tmp */
tmp = ((iphc1 & SIXLOWPAN_IPHC_DAM_11) >> SIXLOWPAN_IPHC_DAM_BIT) & 0x03; tmp = ((iphc1 & SIXLOWPAN_IPHC_DAM_MASK) >> SIXLOWPAN_IPHC_DAM_BIT) & 0x03;
/* Multicast compression */ /* Multicast compression */
@@ -1012,12 +1012,12 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
} }
else else
{ {
/* non-address context based multicast compression /* Non-address context based multicast compression
* *
* DAM_00: 128 bits * DAM 00: 128 bits
* DAM_01: 48 bits FFXX::00XX:XXXX:XXXX * DAM 01: 48 bits FFXX::00XX:XXXX:XXXX
* DAM_10: 32 bits FFXX::00XX:XXXX * DAM 0: 32 bits FFXX::00XX:XXXX
* DAM_11: 8 bits FF02::00XX * DAM 11: 8 bits FF02::00XX
*/ */
uint8_t prefix[] = { 0xff, 0x02 }; uint8_t prefix[] = { 0xff, 0x02 };
@@ -1066,7 +1066,7 @@ void sixlowpan_uncompresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
/* Next header processing - continued */ /* Next header processing - continued */
if ((iphc0 & SIXLOWPAN_IPHC_NH_C)) if ((iphc0 & SIXLOWPAN_IPHC_NH))
{ {
FAR struct udp_hdr_s *udp = UDPIPv6BUF(ieee); FAR struct udp_hdr_s *udp = UDPIPv6BUF(ieee);