Changeset bf1029a

Timestamp:

02/12/14 16:37:45 (8 years ago)

Author:

Richard Sanger <rjs51@…>

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:

bcb2402

Parents:

8b49230

Message:

Fix issue #395 - Added pcap nanosecond file support based upon Martin Bligh's patch

Changes to original patch as follows:

• Changed the byteswaps of the magic constants to defines to ensure this is optimised by the compiler
• Whitespace tidy up
• Removed unnecessary fprintf already handled by trace_set_err

File:

• lib/format_pcapfile.c (modified) (11 diffs)

lib/format_pcapfile.c

@@ -70 +70 @@
                 uint32_t snaplen;        /* aka "wirelen" */
                 uint32_t network;        /* data link type */
-} pcapfile_header_t; 
+} pcapfile_header_t;
+
+#define MAGIC1      0xa1b2c3d4  /* Original */
+#define MAGIC2      0xa1b23c4d  /* Newer nanosecond format */
+#define MAGIC1_REV  0xd4c3b2a1  /* Reversed byteorder detection */
+#define MAGIC2_REV  0x4d3cb2a1
+
+static inline int header_is_backwards_magic(pcapfile_header_t *header) {
+        return (header->magic_number == MAGIC1_REV || header->magic_number == MAGIC2_REV);
+}
+
+static inline int header_is_magic(pcapfile_header_t *header) {
+        return (header->magic_number == MAGIC1 || header->magic_number == MAGIC2 ||
+                header_is_backwards_magic(header));
+}
+
+static inline int trace_in_nanoseconds(pcapfile_header_t *header) {
+        return (header->magic_number == MAGIC2 || header->magic_number == MAGIC2_REV);
+}
 
 struct pcapfile_format_data_t {
@@ -99 +117 @@
         int len;
         len = wandio_peek(io, &header, sizeof(header));
+
         /* Is this long enough? */
         if (len < (int)sizeof(header)) {
@@ -104 +123 @@
         }
         /* Pcap magic? */
-        if (header.magic_number == 0xa1b2c3d4 || header.magic_number == 0xd4c3b2a1) {
+        if (header_is_magic(&header)) {
                 return 1;
         }
@@ -110 +129 @@
         return 0;
 }
+
 
 static int pcapfile_init_input(libtrace_t *libtrace) {
@@ -146 +166 @@
         
         /* We can use the PCAP magic number to determine the byte order */
-        if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
+        if (header_is_backwards_magic(&(DATA(libtrace)->header)))
                 return byteswap16(num);
 
@@ -161 +181 @@
         
         /* We can use the PCAP magic number to determine the byte order */
-        if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
+        if (header_is_backwards_magic(&(DATA(libtrace)->header)))
                 return byteswap32(num);
 
@@ -197 +217 @@
                 }
                 
-                if (swapl(libtrace,DATA(libtrace)->header.magic_number) != 
-                                        0xa1b2c3d4) {
+                if (!header_is_magic(&(DATA(libtrace)->header))) {
                         trace_set_err(libtrace,TRACE_ERR_INIT_FAILED,
                                         "Not a pcap tracefile (magic=%08x)\n",swapl(libtrace,DATA(libtrace)->header.magic_number));
@@ -303 +322 @@
                 packet->buf_control = TRACE_CTRL_PACKET;
         } else
-                packet->buf_control = TRACE_CTRL_EXTERNAL;
+                packet->buf_control = TRACE_CTRL_EXTERNAL;
         
         
@@ -595 +614 @@
         hdr = (libtrace_pcapfile_pkt_hdr_t*)packet->header;
         ts.tv_sec = swapl(packet->trace,hdr->ts_sec);
-        ts.tv_usec = swapl(packet->trace,hdr->ts_usec);
+        if (trace_in_nanoseconds(packet->header))
+                ts.tv_usec = swapl(packet->trace, hdr->ts_usec) / 1000;
+        else
+                ts.tv_usec = swapl(packet->trace,hdr->ts_usec);
+        return ts;
+}
+
+static struct timespec pcapfile_get_timespec(
+                const libtrace_packet_t *packet) 
+{
+        libtrace_pcapfile_pkt_hdr_t *hdr;
+        pcapfile_header_t *header = &(DATA(packet->trace)->header);
+        struct timespec ts;
+        
+        assert(packet->header);
+        
+        hdr = (libtrace_pcapfile_pkt_hdr_t*)packet->header;
+        ts.tv_sec = swapl(packet->trace,hdr->ts_sec);
+        if (trace_in_nanoseconds(header))
+                ts.tv_nsec = swapl(packet->trace, hdr->ts_usec);
+        else
+                ts.tv_nsec = swapl(packet->trace, hdr->ts_usec) * 1000;
         return ts;
 }
@@ -611 +651 @@
 static int pcapfile_get_wire_length(const libtrace_packet_t *packet) {
         libtrace_pcapfile_pkt_hdr_t *pcapptr;
-         
+
         assert(packet->header); 
 
@@ -717 +757 @@
         NULL,                           /* get_erf_timestamp */
         pcapfile_get_timeval,           /* get_timeval */
-        NULL,                           /* get_timespec */
+        pcapfile_get_timespec,          /* get_timespec */
         NULL,                           /* get_seconds */
         NULL,                           /* seek_erf */