Changeset d1af45d

Timestamp:

05/13/14 16:25:33 (7 years ago)

Author:

Shane Alcock <salcock@…>

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:

5692bc4

Parents:

dad224b

Message:

Setting the snaplen option will now work for ring:

This feature was missing in the current implementation of ring:

Thanks to Nevil Brownlee for bringing this to our attention.

File:

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

lib/format_linux.c

@@ -1020 +1020 @@
         struct pollfd pollset;  
         int ret;
+        unsigned int snaplen;
         
         ring_release_frame(libtrace, packet);
@@ -1048 +1049 @@
 
         packet->buffer = header;
+
+        /* If a snaplen was configured, automatically truncate the packet to
+         * the desired length.
+         */
+        snaplen=LIBTRACE_MIN(
+                        (int)LIBTRACE_PACKET_BUFSIZE-(int)sizeof(*header),
+                        (int)FORMAT(libtrace->format_data)->snaplen);
+        
+        TO_TP_HDR(packet->buffer)->tp_snaplen = LIBTRACE_MIN((unsigned int)snaplen, TO_TP_HDR(packet->buffer)->tp_len);
 
         /* Move to next buffer */