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

Merged in antmerlino/apps/i8shark-xbee-remove-fcs (pull request #125)

Browse Source 
i8shark: Fixes special XBee compensation by purposely chopping off the FCS.

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2017-12-08 15:25:44 +00:00 committed by Gregory Nutt
parent f866d845e6
commit 2e8f41ef3b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wireless/ieee802154/i8shark/i8shark_main.c
View File

@ -367,7 +367,7 @@ static int i8shark_daemon(int argc, FAR char *argv[])
/* Next bytes is the Channel ID */
zepframe[ind++] = g_i8shark.chan;
ieee802154_getchan(fd, &zepframe[ind++]);
/* For now, just hard code the device ID to an arbitrary value */
@ -410,7 +410,11 @@ static int i8shark_daemon(int argc, FAR char *argv[])
/* Last byte is the length */
#ifdef CONFIG_IEEE802154_I8SHARK_XBEE_APPHDR
zepframe[ind++] = frame.length - 2;
#else
zepframe[ind++] = frame.length;
#endif
}
/* The ZEP header is filled, now copy the frame in */
@ -423,11 +427,17 @@ static int i8shark_daemon(int argc, FAR char *argv[])
* detection. Wireshark doesn't know how to handle this data, so we provide
* a configuration option that drops the first 2 bytes of the payload portion
* of the frame for all sniffed frames
*
* NOTE: Since we remove data from the frame, the FCS is no longer valid
* and Wireshark will fail to disect the frame. Wireshark ignores a case
* where the FCS is not included in the actual frame. Therefore, we
* subtract 4 rather than 2 to remove the FCS field so that the disector
* will not fail.
*/
memcpy(&zepframe[ind], (frame.payload + frame.offset + 2),
(frame.length - frame.offset - 2));
ind += frame.length - frame.offset - 2;
ind += frame.length - frame.offset - 4;
#else
memcpy(&zepframe[ind], frame.payload, frame.length);
ind += frame.length;