Changeset 0cc91ee for lib

Timestamp:

01/29/19 09:59:10 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

4e9be84, b32e8f4

Parents:

0af3a4e

Message:

Meta-API - Keep ip4 address in network byte order, Cleanup bits and pieces

Location:

lib

Files:

• format_erf.c (modified) (2 diffs)
• format_pcapng.c (modified) (5 diffs)
• format_pcapng.h (modified) (1 diff)

lib/format_erf.c

@@ -1086 +1086 @@
         uint16_t curr_sec = 0;
 
+        if (packet == NULL) {
+                fprintf(stderr, "NULL packet passed into erf_get_meta_section()\n");
+                return NULL;
+        }
         if (packet->buffer == NULL) { return NULL; }
 
@@ -1150 +1154 @@
                                 /* depending on the datatype we need to ensure the data is
                                  * in host byte ordering */
-                                if (result->items[result->num-1].datatype == TRACE_META_UINT32
-                                        || result->items[result->num-1].datatype == TRACE_META_IPV4) {
+                                if (result->items[result->num-1].datatype == TRACE_META_UINT32) {
                                         uint32_t t = *(uint32_t *)(ptr+sizeof(struct dag_opthdr));
                                         t = ntohl(t);

lib/format_pcapng.c

@@ -2032 +2032 @@
                 case(PCAPNG_SIMPLE_PACKET_TYPE):
                         /* simple packets should not contain any options */
+                        return TRACE_META_UNKNOWN;
                 case(PCAPNG_NAME_RESOLUTION_TYPE):
                         /* todo - needs to handle name resolution options along with
                          * normal options */
+                        return TRACE_META_UNKNOWN;
                 case(PCAPNG_INTERFACE_STATS_TYPE):
                         return TRACE_META_UINT64;
@@ -2046 +2048 @@
                         /* todo - needs to handle decryption secrets options along with
                          * normal options */
+                        return TRACE_META_UNKNOWN;
                 default:
                         return TRACE_META_UNKNOWN;
         }
-
-        /* If we get this far we dont know the datatype */
-        return TRACE_META_UNKNOWN;
 }
 
@@ -2070 +2070 @@
         else if (blocktype == PCAPNG_INTERFACE_TYPE) { ptr += sizeof(pcapng_int_t); }
         else if (blocktype == PCAPNG_OLD_PACKET_TYPE) { ptr += sizeof(pcapng_opkt_t); }
-        else if (blocktype == PCAPNG_NAME_RESOLUTION_TYPE) { ptr += sizeof(pcapng_epkt_t); }
+        else if (blocktype == PCAPNG_NAME_RESOLUTION_TYPE) { ptr += sizeof(pcapng_nrb_t); }
         else if (blocktype == PCAPNG_INTERFACE_STATS_TYPE) { ptr += sizeof(pcapng_stats_t); }
         else if (blocktype == PCAPNG_ENHANCED_PACKET_TYPE) {
@@ -2117 +2117 @@
         uint16_t tmp;
 
+        if (packet == NULL) {
+                fprintf(stderr, "NULL packet passed into pcapng_get_meta_section()\n");
+                return NULL;
+        }
         if (packet->buffer == NULL) { return NULL; }
 
@@ -2179 +2183 @@
                         /* depending on the datatype we need to ensure the data is
                          * in host byte ordering */
-                        if (result->items[result->num-1].datatype == TRACE_META_UINT32
-                                || result->items[result->num-1].datatype == TRACE_META_IPV4) {
-
+                        if (result->items[result->num-1].datatype == TRACE_META_UINT32) {
                                 uint32_t t = *(uint32_t *)(ptr+sizeof(struct pcapng_optheader));
                                 t = ntohl(t);

lib/format_pcapng.h

@@ -20 +20 @@
 
 
-#define PCAPNG_OPTION_END 0x0000
+#define PCAPNG_OPTION_END 0
 #define PCAPNG_OPTION_COMMENT 1
 /* Custom option code containing a UTF-8 string */