Changeset 8dd1830 for lib/trace.c

Timestamp:

05/09/05 19:20:50 (16 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:

7b4d443

Parents:

828ca90

Message:

• Define IFNAMSIZ if it's undefined
• Use structure copy
• Support BE machines

File:

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

lib/trace.c

@@ -209 +209 @@
 #ifndef PF_RULESET_NAME_SIZE
 #define PF_RULESET_NAME_SIZE 16
+#endif
+
+#ifndef IFNAMSIZ
+#define IFNAMSIZ 16
 #endif
 
@@ -1279 +1283 @@
                         pcapptr = (struct pcap_pkthdr *)packet->buffer;
                         // ick. FIXME
-                        tv.tv_sec = pcapptr->ts.tv_sec;
-                        tv.tv_usec = pcapptr->ts.tv_usec;
+                        tv = pcapptr->ts;
                         break;
 #endif
@@ -1291 +1294 @@
                         // FIXME: This isn't portable to big-endian machines
                         ts = trace_get_erf_timestamp(packet);
-                        tv.tv_sec = ts >> 32;           
+#if __BYTE_ORDER == __BIG_ENDIAN
+                        tv.tv_sec = ts & 0xFFFFFFFF;
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+                        tv.tv_sec = ts >> 32;
+#else
+#error "What on earth are you running this on?"
+#endif
                         ts = (1000000 * (ts & 0xffffffffULL));
                         ts += (ts & 0x80000000ULL) << 1;