Changeset 0cc91ee for libpacketdump

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

File:

• libpacketdump/link_23.c (modified) (3 diffs)

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;