Changeset 9a6bdbc for lib/format_dag25.c

Timestamp:

01/07/19 10:35:07 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

51276bd

Parents:

979ab1a0

git-author:

Jacob Van Walraven <jcv9@…> (12/14/18 09:31:48)

git-committer:

Jacob Van Walraven <jcv9@…> (01/07/19 10:35:07)

Message:

Added can_write functions to each output format, Fixed pcapng_get_header_type incorrectly flipping type bytes

File:

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

lib/format_dag25.c

@@ -174 +174 @@
  * many times or close a device that we're still using */
 struct dag_dev_t *open_dags = NULL;
+
+static bool dag_can_write(libtrace_packet_t *packet) {
+        /* Get the linktype */
+        libtrace_linktype_t ltype = trace_get_link_type(packet);
+
+        if (ltype == TRACE_TYPE_ERF_META
+                || ltype == TRACE_TYPE_NONDATA) {
+
+                return false;
+        }
+
+        return true;
+}
 
 /* Returns the amount of padding between the ERF header and the start of the
@@ -1186 +1199 @@
 static int dag_write_packet(libtrace_out_t *libtrace, libtrace_packet_t *packet)
 {
+        /* Check dag can write this type of packet */
+        if (!dag_can_write(packet)) {
+                return 0;
+        }
+
         /* This is heavily borrowed from erf_write_packet(). Yes, CnP
          * coding sucks, sorry about that.
@@ -1200 +1218 @@
                 return -1;
         }
-
-        if (trace_get_link_type(packet) == TRACE_TYPE_NONDATA)
-                return 0;
 
         pad = dag_get_padding(packet);