Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 14:27:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net/sixlowpan: Fix a nasty, byte-ordering/endian-ness problem. The root cause has been found and corrected. And a half dozen or so bandaid fixes were reverted.

Browse Source
This commit is contained in:
Gregory Nutt
2018-04-17 15:34:12 -06:00
parent 27f624d881
commit d93b22d042
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/sixlowpan/sixlowpan_hc06.c
+16 -17
View File
@@ -271,8 +271,13 @@ static uint8_t compress_ipaddr(FAR const net_ipv6addr_t ipaddr, uint8_t bitpos)
{
/* Compress IID to 16 bits: xxxx:xxxx:xxxx:xxxx:0000:00ff:fe00:XXXX */
*g_hc06ptr++ = ipaddr[7] >> 8; /* Big-endian, network order */
#ifdef CONFIG_BIG_ENDIAN
*g_hc06ptr++ = ipaddr[7] >> 8; /* Preserve big-endian, network order */
*g_hc06ptr++ = ipaddr[7] & 0xff;
#else
*g_hc06ptr++ = ipaddr[7] & 0xff; /* Preserve big-endian, network order */
*g_hc06ptr++ = ipaddr[7] >> 8;
#endif
return 2 << bitpos; /* 16-bits */
}
@@ -284,8 +289,13 @@ static uint8_t compress_ipaddr(FAR const net_ipv6addr_t ipaddr, uint8_t bitpos)
for (i = 4; i < 8; i++)
{
*g_hc06ptr++ = ipaddr[i] >> 8; /* Big-endian, network order */
#ifdef CONFIG_BIG_ENDIAN
*g_hc06ptr++ = ipaddr[i] >> 8; /* Preserve big-endian, network order */
*g_hc06ptr++ = ipaddr[i] & 0xff;
#else
*g_hc06ptr++ = ipaddr[i] & 0xff; /* Preserve big-endian, network order */
*g_hc06ptr++ = ipaddr[i] >> 8;
#endif
}
return 1 << bitpos; /* 64-bits */
@@ -489,21 +499,10 @@ static void uncompress_addr(FAR const struct netdev_varaddr_s *addr,
for (i = destndx; i < endndx; i++)
{
#ifndef CONFIG_BIG_ENDIAN
if (!usemac)
{
/* Local address is in network order. Switch to host order */
/* Big-endian, network order */
ipaddr[i] = (uint16_t)srcptr[0] << 8 | (uint16_t)srcptr[1];
}
else
#endif
{
/* Big-endian, network order */
ipaddr[i] = (uint16_t)srcptr[1] << 8 | (uint16_t)srcptr[0];
srcptr += 2;
}
ipaddr[i] = (uint16_t)srcptr[0] << 8 | (uint16_t)srcptr[1];
srcptr += 2;
}
/* Handle any remaining odd byte */
@@ -517,7 +516,7 @@ static void uncompress_addr(FAR const struct netdev_varaddr_s *addr,
if (fullmac)
{
ipaddr[7] ^= HTONS(0x0200);
ipaddr[7] ^= 0x0200;
}
/* If we took the data from packet, then update the packet pointer */