Changeset 7fa118f for lib

Timestamp:

01/25/10 17:14:13 (12 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:

226c08b

Parents:

fc710bf

Message:

Keep sizes of framing headers passed over the wire specified

File:

• lib/format_linux.c (modified) (6 diffs)

lib/format_linux.c

@@ -77 +77 @@
 
 
+/* Note that this structure is passed over the wire in rt encapsulation, and thus we need to be 
+ * careful with data sizes.  timeval's and timespec's change their size on 32/64 machines
+ */
 struct libtrace_linuxnative_header {
-        struct timeval tv;
-        struct timespec ts;
-        timestamptype_t timestamptype;
-        int wirelen;
-        int caplen;
+        struct {
+                uint32_t tv_sec;
+                uint32_t tv_usec;
+        } tv;
+        struct {
+                uint32_t tv_sec;
+                uint32_t tv_nsec;
+        } ts;
+        uint8_t timestamptype;
+        uint32_t wirelen;
+        uint32_t caplen;
         struct sockaddr_ll hdr;
 };
@@ -453 +462 @@
                         && cmsg->cmsg_type == SO_TIMESTAMP
                         && cmsg->cmsg_len <= CMSG_LEN(sizeof(struct timeval))) {
-                        memcpy(&hdr->tv, CMSG_DATA(cmsg),
-                                        sizeof(struct timeval));
+                        hdr->tv.tv_sec = ((struct timeval*)CMSG_DATA(cmsg))->tv_sec;
+                        hdr->tv.tv_usec = ((struct timeval*)CMSG_DATA(cmsg))->tv_usec;
                         hdr->timestamptype = TS_TIMEVAL;
                         break;
@@ -462 +471 @@
                         && cmsg->cmsg_type == SO_TIMESTAMPNS
                         && cmsg->cmsg_len <= CMSG_LEN(sizeof(struct timespec))) {
-                        memcpy(&hdr->ts, CMSG_DATA(cmsg),
-                                        sizeof(struct timeval));
+                        hdr->ts.tv_sec = ((struct timespec*)CMSG_DATA(cmsg))->tv_sec;
+                        hdr->ts.tv_nsec = ((struct timespec*)CMSG_DATA(cmsg))->tv_nsec;
                         hdr->timestamptype = TS_TIMESPEC;
                         break;
@@ -472 +481 @@
         /* Did we not get given a timestamp? */
         if (cmsg == NULL) {
+                struct timeval tv;
                 if (ioctl(FORMAT(libtrace->format_data)->fd, 
-                                  SIOCGSTAMP,&hdr->tv)==0) {
+                                  SIOCGSTAMP,&tv)==0) {
+                        hdr->tv.tv_sec = tv.tv_sec;
+                        hdr->tv.tv_usec = tv.tv_usec;
                         hdr->timestamptype = TS_TIMEVAL;
                 }
@@ -567 +579 @@
                 return ts;
         }
-        else
-                return hdr->ts;
+        else {
+                struct timespec ts;
+                ts.tv_sec = hdr->ts.tv_sec;
+                ts.tv_nsec = hdr->ts.tv_nsec;
+                return ts;
+        }
 }
 
@@ -582 +598 @@
                 return tv;
         }
-        else
-                return hdr->tv;
+        else {
+                struct timeval tv;
+                tv.tv_sec = hdr->tv.tv_sec;
+                tv.tv_usec = hdr->tv.tv_usec;
+                return tv;
+        }
 }