Changeset 5d4e520

Timestamp:

10/28/08 17:34:47 (13 years ago)

Author:

Perry Lorier <perry@…>

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:

aa22b5b

Parents:

37f2a9b

Message:

Deal with endianness better

File:

• lib/format_tsh.c (modified) (3 diffs)

lib/format_tsh.c

@@ -50 +50 @@
 typedef struct tsh_pkt_header_t {
         uint32_t seconds;
-        LT_BITFIELD32 iface:8;
-        LT_BITFIELD32 usecs:24;
+        uint32_t usecs;
 } tsh_pkt_header_t;
 
@@ -187 +186 @@
 
 static libtrace_direction_t tsh_get_direction(const libtrace_packet_t *packet) {
-        return ((tsh_pkt_header_t*)(packet->header))->iface;
+        return ntohl(((tsh_pkt_header_t*)(packet->header))->usecs & htonl(0xFF000000)) >> 24;
 }
 
@@ -194 +193 @@
         struct timeval tv;
         tv.tv_sec=ntohl(((tsh_pkt_header_t*)(packet->header))->seconds);
-        tv.tv_usec=ntohl(((tsh_pkt_header_t*)(packet->header))->usecs);
+        tv.tv_usec=ntohl(((tsh_pkt_header_t*)(packet->header))->usecs & htonl(0x00FFFFFF));
 
         return tv;