Changeset fce4572 for lib

Timestamp:

01/08/19 10:58:31 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

0ae7ba2

Parents:

93564ff

Message:

Add more failure cases to "can_write" functions for some formats.

Specifically:

• Avoid writing metadata packets to DPDK, ring and int
• Make sure all formats avoid writing "content invalid" packets.
• Add comments to remind us that erf meta <-> pcapng meta conversion might be worth adding at some point.
• Add comment to remind us that erf meta should be writable via a DAG card (I think).

Location:

lib

Files:

• format_dag25.c (modified) (1 diff)
• format_dpdk.c (modified) (1 diff)
• format_erf.c (modified) (1 diff)
• format_linux_int.c (modified) (1 diff)
• format_linux_ring.c (modified) (1 diff)
• format_pcapng.c (modified) (1 diff)

lib/format_dag25.c

@@ -179 +179 @@
         libtrace_linktype_t ltype = trace_get_link_type(packet);
 
+        if (ltype == TRACE_TYPE_CONTENT_INVALID) {
+                return false;
+        }
+
+        /* TODO erf meta should definitely be writable, pcapng meta
+         * could probably be converted into erf meta */
         if (ltype == TRACE_TYPE_ERF_META
-                || ltype == TRACE_TYPE_NONDATA) {
-
+                        || ltype == TRACE_TYPE_NONDATA
+                        || ltype == TRACE_TYPE_PCAPNG_META) {
                 return false;
         }

lib/format_dpdk.c

@@ -146 +146 @@
 
 static bool dpdk_can_write(libtrace_packet_t *packet) {
+        libtrace_linktype_t ltype = trace_get_link_type(packet);
+
+        if (ltype == TRACE_TYPE_CONTENT_INVALID) {
+                return false;
+        }
+        if (ltype == TRACE_TYPE_NONDATA || ltype == TRACE_TYPE_ERF_META ||
+                        ltype == TRACE_TYPE_PCAPNG_META) {
+                return false;
+        }
         return true;
 }

lib/format_erf.c

@@ -123 +123 @@
         libtrace_linktype_t ltype = trace_get_link_type(packet);
 
+        if (ltype == TRACE_TYPE_CONTENT_INVALID) {
+                return false;
+        }
         if (ltype == TRACE_TYPE_PCAPNG_META
                 || ltype == TRACE_TYPE_NONDATA) {

lib/format_linux_int.c

@@ -61 +61 @@
 
         if (ltype == TRACE_TYPE_NONDATA) {
+                return false;
+        }
+        if (ltype == TRACE_TYPE_CONTENT_INVALID) {
+                return false;
+        }
+        if (ltype == TRACE_TYPE_PCAPNG_META) {
+                return false;
+        }
+        if (ltype == TRACE_TYPE_ERF_META) {
                 return false;
         }

lib/format_linux_ring.c

@@ -75 +75 @@
         libtrace_linktype_t ltype = trace_get_link_type(packet);
 
+        if (ltype == TRACE_TYPE_CONTENT_INVALID) {
+                return false;
+        }
         if (ltype == TRACE_TYPE_NONDATA) {
+                return false;
+        }
+        if (ltype == TRACE_TYPE_PCAPNG_META) {
+                return false;
+        }
+        if (ltype == TRACE_TYPE_ERF_META) {
                 return false;
         }

lib/format_pcapng.c

@@ -225 +225 @@
         libtrace_linktype_t ltype = trace_get_link_type(packet);
 
+        /* TODO convert erf meta to pcapng meta? */
         if (ltype == TRACE_TYPE_CONTENT_INVALID
                 || ltype == TRACE_TYPE_UNKNOWN