Changeset 8b49230 for lib/libtrace_int.h

Timestamp:

08/30/13 13:30:41 (8 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

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

Children:

bf1029a

Parents:

8780774

Message:

Fixed problems with decoding RadioTap? headers with libpacketdump on big endian
hosts

• Moved byteswapX functions to a separate source file so that libpacketdump can also link against them.
• bswap_* macros have been moved into lt_bswap.h so they can be used without having to include the entire libtrace_int.h header
• Fixed endianness issues with the "fields" inside the RadioTap? header.

File:

• lib/libtrace_int.h (modified) (2 diffs)

lib/libtrace_int.h

@@ -59 +59 @@
 #include "libtrace.h"
 #include "wandio.h"
+#include "lt_bswap.h"
 
 #ifdef _MSC_VER
@@ -900 +901 @@
                 uint32_t *remaining);
 
-/** Byteswaps a 64-bit value.
- *
- * @param num           The value to be byteswapped.
- * @return The byteswapped 64-bit number
- *
- */
-uint64_t byteswap64(uint64_t num);
-
-/** Byteswaps a 32-bit value.
- *
- * @param num           The value to be byteswapped.
- * @return The byteswapped 32-bit number
- *
- */
-uint32_t byteswap32(uint32_t num);
-
-/** Byteswaps a 16-bit value.
- *
- * @param num           The value to be byteswapped.
- * @return The byteswapped 16-bit number
- *
- */
-uint16_t byteswap16(uint16_t num);
-
-/** @name Byte ordering
- * Macros that define how to convert a value into a particular byte-order 
- *
- * @{
- */
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define bswap_host_to_be64(num) ((uint64_t)(num))
-#define bswap_host_to_le64(num) byteswap64(num)
-#define bswap_host_to_be32(num) ((uint32_t)(num))
-#define bswap_host_to_le32(num) byteswap32(num)
-#define bswap_host_to_be16(num) ((uint16_t)(num))
-#define bswap_host_to_le16(num) byteswap16(num)
-
-#define bswap_be_to_host64(num) ((uint64_t)(num))
-#define bswap_le_to_host64(num) byteswap64(num)
-#define bswap_be_to_host32(num) ((uint32_t)(num))
-#define bswap_le_to_host32(num) byteswap32(num)
-#define bswap_be_to_host16(num) ((uint16_t)(num))
-#define bswap_le_to_host16(num) byteswap16(num)
-
-/* We use ntoh*() here, because the compiler may
- * attempt to optimise it
- */
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-#define bswap_host_to_be64(num) (byteswap64(num))
-#define bswap_host_to_le64(num) ((uint64_t)(num))
-#define bswap_host_to_be32(num) (htonl(num))
-#define bswap_host_to_le32(num) ((uint32_t)(num))
-#define bswap_host_to_be16(num) (htons(num))
-#define bswap_host_to_le16(num) ((uint16_t)(num))
-
-#define bswap_be_to_host64(num) (byteswap64(num))
-#define bswap_le_to_host64(num) ((uint64_t)(num))
-#define bswap_be_to_host32(num) (ntohl(num))
-#define bswap_le_to_host32(num) ((uint32_t)(num))
-#define bswap_be_to_host16(num) (ntohs(num))
-#define bswap_le_to_host16(num) ((uint16_t)(num))
-
-#else
-#error "Unknown byte order"
-#endif
-/** @} */
 
 #ifdef HAVE_BPF