Changeset 960 for trunk/lib/format_linux.c

Timestamp:

08/28/06 16:55:46 (7 years ago)

Author:

perry

Message:

More error handling
Use a bigger ancillary data buffer to deal with x86_64's bigger timestamps

File:

• trunk/lib/format_linux.c (modified) (3 diffs)

trunk/lib/format_linux.c

@@ -135 +135 @@
         }
 
-        setsockopt(FORMAT(libtrace->format_data)->fd,
+        if (setsockopt(FORMAT(libtrace->format_data)->fd,
                         SOL_SOCKET,
                         SO_TIMESTAMP,
                         &one,
-                        sizeof(one));
+                        sizeof(one))==-1) {
+                perror("setsockopt(SO_TIMESTAMP)");
+        }
 
         return 0;
@@ -210 +212 @@
 #define LIBTRACE_MIN(a,b) ((a)<(b) ? (a) : (b))
 
-/* 20 should be enough */
-#define CMSG_BUF_SIZE 20
+/* 20 isn't enough on x86_64 */
+#define CMSG_BUF_SIZE 128
 static int linuxnative_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) 
 {
@@ -264 +266 @@
                 if (cmsg->cmsg_level == SOL_SOCKET
                         && cmsg->cmsg_type == SO_TIMESTAMP
-                        && cmsg->cmsg_len == CMSG_LEN(sizeof(struct timeval))) {
+                        && cmsg->cmsg_len <= CMSG_LEN(sizeof(struct timeval))) {
                         memcpy(&hdr->ts, CMSG_DATA(cmsg),
                                         sizeof(struct timeval));