Changeset 0cc91ee

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

Files:

• lib/format_erf.c (modified) (2 diffs)
• lib/format_pcapng.c (modified) (5 diffs)
• lib/format_pcapng.h (modified) (1 diff)
• libpacketdump/link_23.c (modified) (3 diffs)

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 */

libpacketdump/link_23.c

@@ -41 +41 @@
 static void print_interface_type(libtrace_meta_t *r, libtrace_packet_t *packet) {
         int i;
-        char *ip4, *ip6, *ptr UNUSED;
+        struct in_addr ip;
+        char *ip6, *ptr UNUSED;
         printf(" PCAPNG Interface Description Block\n");
 
@@ -57 +58 @@
                                 break;
                         case(PCAPNG_META_IF_IP4):
-                                ip4 = calloc(1, INET4_ADDRSTRLEN);
-                                ptr = trace_get_interface_ipv4_string(packet, ip4,
-                                        INET4_ADDRSTRLEN, 0);
-                                printf("  if_IPv4addr: %s", ip4);
-                                free(ip4);
+                                ip.s_addr = *(uint32_t *)r->items[i].data;
+                                printf("  if_IPv4addr: %s", inet_ntoa(ip));
                                 break;
                         case(PCAPNG_META_IF_IP6):
@@ -119 +117 @@
 static void print_name_resolution_type(libtrace_meta_t *r) {
         int i;
+        struct in_addr ip;
         printf(" PCAPNG Name Resolution\n");
-
         if (r == NULL) { return; }
 
         for (i=0; i<r->num; i++) {
                 switch(r->items[i].option) {
-                        //case(PCAPNG_META_NRB_RECORD_END):
-                        //      /* This should never occur,
-                        //       * the meta api should not return it */
+                        case(PCAPNG_META_NRB_RECORD_IP4):
+                                ip.s_addr = *(uint32_t *)r->items[i].data;
+                                printf("  nrb_record_ipv4: %s dns_name: %s\n",
+                                        inet_ntoa(ip),
+                                        (char *)(r->items[i].data+sizeof(uint32_t)));
+                                break;
+                        case(PCAPNG_META_NRB_RECORD_IP6):
+                                /* todo - need to find an example */
+                                break;
+                        //case(PCAPNG_META_NS_DNSNAME):
+                        //      printf("  ns_dnsname: %s\n",
+                        //              (char *)r->items[i].data);
                         //      break;
-                        //case(PCAPNG_META_NRB_RECORD_IP4):
-                        //      printf("  nrb_record_ipv4: %u dns_name: %s\n",
-                        //              *(uint32_t *)r->items[i].data,
-                        //              (char *)r->items[i].data+sizeof(uint32_t));
+                        //case(PCAPNG_META_NS_DNS_IP4_ADDR):
+                        //      printf("  ns_dnsIP4addr: %u.%u.%u.%u\n",
+                        //              *(uint8_t *)r->items[i].data,
+                        //              *(uint8_t *)r->items[i].data+8,
+                        //              *(uint8_t *)r->items[i].data+16,
+                        //              *(uint8_t *)r->items[i].data+24);
                         //      break;
-                        //case(PCAPNG_META_NRB_RECORD_IP6):
+                        //case(PCAPNG_META_NS_DNS_IP6_ADDR):
                         //      /* todo - need to find an example */
                         //      break;
-                        case(PCAPNG_META_NS_DNSNAME):
-                                printf("  ns_dnsname: %s\n",
-                                        (char *)r->items[i].data);
-                                break;
-                        case(PCAPNG_META_NS_DNS_IP4_ADDR):
-                                printf("  ns_dnsIP4addr: %u.%u.%u.%u\n",
-                                        *(uint8_t *)r->items[i].data,
-                                        *(uint8_t *)r->items[i].data+8,
-                                        *(uint8_t *)r->items[i].data+16,
-                                        *(uint8_t *)r->items[i].data+24);
-                                break;
-                        case(PCAPNG_META_NS_DNS_IP6_ADDR):
-                                /* todo - need to find an example */
-                                break;
                         default:
                                 break;