Changeset 0af3a4e for lib

Timestamp:

01/24/19 15:35:35 (21 months ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

0cc91ee

Parents:

5299c55

Message:

ERF can contain multiple occurances of the same section per meta packet, make sure we capture all of them

Location:

lib

Files:

• format_erf.c (modified) (8 diffs)
• format_erf.h (modified) (1 diff)

lib/format_erf.c

@@ -956 +956 @@
                 case (ERF_PROV_LOC_NAME): return "Capture Location";
                 case (ERF_PROV_FLOW_HASH_MODE): return "Flow Hash Mode";
+                case (ERF_PROV_FILTER): return "Filter";
                 case (ERF_PROV_TUNNELING_MODE): return "Tunneling Mode";
+                case (ERF_PROV_ROTFILE_NAME): return "Rotfile Name";
                 case (ERF_PROV_LOC_DESCR): return "Location Description";
                 case (ERF_PROV_MEM): return "Stream Buffer Memory";
@@ -1020 +1022 @@
                 case (ERF_PROV_MODULE_NUM): return TRACE_META_UINT32;
                 case (ERF_PROV_LOC_NAME): return TRACE_META_STRING;
+                case (ERF_PROV_FILTER): return TRACE_META_STRING;
                 case (ERF_PROV_FLOW_HASH_MODE): return TRACE_META_UINT32;
                 case (ERF_PROV_TUNNELING_MODE): return TRACE_META_UINT32;
+                case (ERF_PROV_ROTFILE_NAME): return TRACE_META_STRING;
                 case (ERF_PROV_LOC_DESCR): return TRACE_META_STRING;
                 case (ERF_PROV_MEM): return TRACE_META_UINT64;
@@ -1081 +1085 @@
         uint16_t remaining;
         uint16_t curr_sec = 0;
-        int in_section = 0;
 
         if (packet->buffer == NULL) { return NULL; }
@@ -1098 +1101 @@
         result->num = 0;
 
-        while (remaining > sizeof(dag_sec_t) && curr_sec != 0xFFFF) {
+        while (remaining > sizeof(dag_sec_t)) {
 
                 /* Get the current section/option header */
@@ -1108 +1111 @@
                         || ntohs(sec->type) == ERF_PROV_SECTION_INTERFACE) {
 
-                        if (in_section == 0) {
-                                curr_sec = ntohs(sec->type);
-                        } else {
-                                /* Used to indicate section end */
-                                curr_sec = 0xFFFF;
-                        }
+                        curr_sec = ntohs(sec->type);
                 }
 
@@ -1123 +1121 @@
                         && ntohs(sec->type) != ERF_PROV_SECTION_MODULE
                         && ntohs(sec->type) != ERF_PROV_SECTION_INTERFACE) {
-
-                        /* Indicate a section has been found */
-                        in_section = 1;
 
                         result->num += 1;
@@ -1170 +1165 @@
                                                 ptr+sizeof(struct dag_opthdr), ntohs(sec->len));
                                 }
-
                         }
-
                 }
 
@@ -1185 +1178 @@
         }
 
-        /* If the result structure has result matches were found */
+        /* If the result num > 0 matches were found */
         if (result->num > 0) {
                 return (void *)result;

lib/format_erf.h

@@ -52 +52 @@
 #define ERF_PROV_MODULE_NUM 31
 #define ERF_PROV_LOC_NAME 34
+#define ERF_PROV_FILTER 36
 #define ERF_PROV_FLOW_HASH_MODE 37
 #define ERF_PROV_TUNNELING_MODE 38
+#define ERF_PROV_ROTFILE_NAME 43
 #define ERF_PROV_LOC_DESCR 46
 #define ERF_PROV_APP_VERSION 47