Changeset 2b0eae9

Timestamp:

05/20/16 14:55:03 (6 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

a984307, ccc598d

Parents:

e26c1fc

Message:

Fix alignment issues when dumping a RadioTap? header with extended presence

File:

• libpacketdump/link_15.c (modified) (2 diffs)

libpacketdump/link_15.c

@@ -11 +11 @@
 #include "lt_bswap.h"
 
+#define ALIGN_NATURAL_64(_p,_s,_c) \
+        while ( (_p - _s) % sizeof(uint64_t)) {_p++; _c++;}
 #define ALIGN_NATURAL_32(_p,_s,_c) \
         while ( (_p - _s) % sizeof(uint32_t)) {_p++; _c++;}
@@ -53 +55 @@
         }
 
+        if ( (rtap_pres) & (1 << TRACE_RADIOTAP_EXT) )
+                printf("\n");
 
         /* make p point to the first data field */
-        s = p = (uint8_t *) ++ptr;
+        s = (uint8_t *) rtap;
+        p = (uint8_t *) ++ptr;
 
         if (rtap_pres & (1 << TRACE_RADIOTAP_TSFT)) {
+                ALIGN_NATURAL_64(p,s,rtap_real_len);
                 printf(" Radiotap: TSFT = %" PRIu64 " microseconds\n", bswap_le_to_host64(*((uint64_t *)p)));
                 p += sizeof (uint64_t);