Fix FLAGS field displayed in diagnostics

The 2 octets were displayed as as int16 so they can be swapped depending of the architecture.

Fix FLAGS field displayed in diagnostics
The 2 octets were displayed as as int16 so they can be swapped depending of the architecture.
9106c798 · Jean-Claude BAU · 7e5ea9a1 · 9106c798 · 9106c798
Commit 9106c798 authored Jan 08, 2020 by Jean-Claude BAU
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

decent_types.h tools/decent_types.h +3 -1

dump-funcs.c tools/dump-funcs.c +2 -2

No files found.
--- a/tools/decent_types.h
+++ b/tools/decent_types.h
@@ -5,6 +5,8 @@
 * Released according to the GNU GPL, version 2 or any later version.
 */

+#include <ppsi/constants.h>
+
 /*
 * I used to have bit fields, but endianness detection failed. Let's be
 * honest: bit fields must die. I use masks at run time instead
@@ -21,7 +23,7 @@ struct ptp_header {
 	/* 4 */
 	uint8_t		domainNumber;
 	uint8_t		reserved5;
-	uint16_t	flagField;
+	uint8_t	    flagField[PP_FLAG_FIELD_LENGTH];
 	/* 8 */
 	uint64_t	correctionField;
 	/* 16 */

--- a/tools/dump-funcs.c
+++ b/tools/dump-funcs.c
@@ -330,8 +330,8 @@ static void dump_payload(char *prefix, void *pl, int len)
 	printf("%sVERSION: %i (type %i, len %i, domain %i)\n", prefix,
 	       version, messageType,
 	       ntohs(h->messageLength), h->domainNumber);
-	printf("%sFLAGS: 0x%04x (correction 0x%08x:%08x %08u)\n",
-	       prefix, h->flagField,
+	printf("%sFLAGS: 0x%02x%02x (correction 0x%08x:%08x %08u)\n",
+	       prefix, (unsigned) h->flagField[0],(unsigned) h->flagField[1],
 	       ntohl(*(int *)cfptr),
 	       ntohl(*(int *)(cfptr + 4)),
 	       ntohl(*(int *)(cfptr + 4)));