Changeset dadc609

Timestamp:

06/01/04 09:22:05 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

c792590

Parents:

63a2713

Message:

fixed get_timeval to return a correct tv from ERF type records

File:

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

lib/trace.c

@@ -687 +687 @@
         struct pcap_pkthdr *pcapptr = 0;
         uint64_t ts;
+        uint32_t seconds;
         switch (libtrace->format) {
                 case PCAPINT:
@@ -699 +700 @@
                 case RTCLIENT:
                 default:
+                        // FIXME: This isn't portable to big-endian machines
                         ts = get_erf_timestamp(libtrace,buffer,buflen);
-                        tv.tv_sec = ts >> 32;
-                        tv.tv_usec = ((long)ts)*1000000/UINT_MAX;
+                        tv.tv_sec = ts >> 32;           
+                        ts = (1000000 * (ts & 0xffffffffULL));
+                        ts += (ts & 0x80000000ULL) << 1;
+                        tv.tv_usec = ts >> 32;
+                        if (tv.tv_usec >= 1000000) {
+                                tv.tv_usec -= 1000000;
+                                tv.tv_sec += 1;
+                        }
                         break;
         }