Changeset 32de4c7 for lib/format_linux_ring.c

Timestamp:

01/08/19 10:36:06 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

93564ff

Parents:

4ac48fa (diff), f47025d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'pcapng_write' of ​git://github.com/jacobvw/libtrace into jacobvw-pcapng_write

File:

• lib/format_linux_ring.c (modified) (3 diffs)

lib/format_linux_ring.c

@@ -71 +71 @@
 static int pagesize = 0;
 
+static bool linuxring_can_write(libtrace_packet_t *packet) {
+        /* Get the linktype */
+        libtrace_linktype_t ltype = trace_get_link_type(packet);
+
+        if (ltype == TRACE_TYPE_NONDATA) {
+                return false;
+        }
+
+        return true;
+}
 
 /*
@@ -709 +719 @@
                                   libtrace_packet_t *packet)
 {
+        /* Check linuxring can write this type of packet */
+        if (!linuxring_can_write(packet)) {
+                return 0;
+        }
+
         struct tpacket2_hdr *header;
         struct pollfd pollset;
@@ -715 +730 @@
         unsigned max_size;
         void * off;
-
-        if (trace_get_link_type(packet) == TRACE_TYPE_NONDATA)
-                return 0;
 
         max_size = FORMAT_DATA_OUT->req.tp_frame_size -