sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in antmerlino/nuttx/sixlowpan-mcast-uncompress (pull request #738)

Browse Source 
net/sixlowpan: Fixes bug in uncompress_addr handling of odd postfix.

This affected multicast compress/uncompress since it's the only logic that used an odd postfix. The odd byte needs to be handled first, not last.

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2018-10-27 18:07:47 +00:00 committed by GregoryN
parent 511c90d050
commit 1adfef8113
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/sixlowpan/sixlowpan_hc06.c
View File

@ -495,9 +495,25 @@ static void uncompress_addr(FAR const struct netdev_varaddr_s *addr,
/* If the postcount is even then take extra care with endian-ness */
destndx = 8 - (postcount >> 1);
endndx = 8 - (postcount & 1);
for (i = destndx; i < endndx; i++)
/* Handle any odd byte first */
if ((postcount & 1) != 0)
{
#ifdef CONFIG_BIG_ENDIAN
/* Preserve big-endian, network order */
ipaddr[destndx - 1] = (uint16_t)(*srcptr) << 8;
#else
/* Preserve big-endian, network order */
ipaddr[destndx - 1] = (uint16_t)(*srcptr);
#endif
srcptr++;
}
for (i = destndx; i < 8; i++)
{
#ifdef CONFIG_BIG_ENDIAN
/* Preserve big-endian, network order */
@ -511,13 +527,6 @@ static void uncompress_addr(FAR const struct netdev_varaddr_s *addr,
srcptr += 2;
}
/* Handle any remaining odd byte */
if ((postcount & 1) != 0)
{
ipaddr[7] = (uint16_t)(*srcptr) << 8;
}
/* If the was a standard MAC based address then toggle */
if (fullmac)