Changeset b27ed21 for lib/format_pktmeta.c

Timestamp:

01/21/19 11:43:12 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

ddad48c

Parents:

c8171e5

Message:

Add datatype enum to libtrace_meta_item_t structure, Convert interface speeds from network to host byte ordering

File:

• lib/format_pktmeta.c (modified) (12 diffs)

lib/format_pktmeta.c

@@ -7 +7 @@
 #include <stdlib.h>
 #include <string.h>
-
+#include <endian.h>
 
 /* Internal Meta functions */
@@ -22 +22 @@
 }
 
+static libtrace_meta_t *trace_meta_set_datatype(libtrace_meta_t *r, meta_datatype_t dt) {
+        if (r == NULL) { return NULL; }
+
+        int i;
+        for (i=0; i<r->num; i++) {
+                r->items[i].datatype = dt;
+        }
+        return r;
+}
+
 /* API functions to retrieve interface related packet data */
 
@@ -60 +70 @@
         }
 
+        libtrace_meta_t *r = NULL;
+
         /* get the result */
         if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_NAME);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_NAME);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_STRING);
 }
 /* Get the interface name for a meta packet.
@@ -112 +124 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_IF_MAC);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_MAC);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_STRING);
 }
 /* Get the interface MAC address for a meta packet.
@@ -160 +174 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_IF_SPEED);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_SPEED);
         }
 
-        return NULL;
+        /* Flip from network to host byte ordering */
+        int i;
+        if (r != NULL) {
+                for (i=0; i<r->num; i++) {
+                        uint64_t d = be64toh(*(uint64_t *)r->items[i].data);
+                        memcpy(r->items[i].data, &d, r->items[i].len);
+                }
+        }
+
+        return trace_meta_set_datatype(r, TRACE_META_UINT64_T);
 }
 /* Get the interface speed for a meta packet.
@@ -202 +227 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_IF_IPV4);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_IP4);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_UINT32_T);
 }
 /* Get the interface ipv4 address for a meta packet.
@@ -263 +290 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_IF_IPV4);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_IP4);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_UINT128_T);
 }
 /* Get the interface ipv6 address for a meta packet.
@@ -342 +371 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_DESCR);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_DESCR);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_STRING);
 }
 /* Get the interface description for a meta packet.
@@ -390 +421 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_HOST, ERF_PROV_OS);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_OS);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_STRING);
 }
 /* Get the host OS for a meta packet.
@@ -432 +465 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_FCS_LEN);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_META_IF_FCSLEN);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_UINT32_T);
 }
 /* Get the interface frame check sequence length for a meta packet.
@@ -471 +506 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_INTERFACE, ERF_PROV_COMMENT);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_INTERFACE_TYPE, PCAPNG_OPTION_COMMENT);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_STRING);
 }
 /* Get the interface comment for a meta packet.
@@ -518 +555 @@
         }
 
-        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
-                return packet->trace->format->get_meta_section_option(packet,
+        libtrace_meta_t *r = NULL;
+
+        if (packet->trace->format->type == TRACE_FORMAT_ERF) {
+                r = packet->trace->format->get_meta_section_option(packet,
                         ERF_PROV_SECTION_CAPTURE, ERF_PROV_APP_NAME);
         }
         if (packet->trace->format->type == TRACE_FORMAT_PCAPNG) {
-                return packet->trace->format->get_meta_section_option(packet,
+                r = packet->trace->format->get_meta_section_option(packet,
                         PCAPNG_SECTION_TYPE, PCAPNG_META_SHB_USERAPPL);
         }
 
-        return NULL;
+        return trace_meta_set_datatype(r, TRACE_META_STRING);
 }
 /* Get the capture application for a meta packet.