Changeset 7b4f5e2

Timestamp:

02/05/19 14:41:55 (2 years ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

58c226e

Parents:

a0e5b65

Message:

cleanup trace_get_interface ipv4 and ipv6 functions

Location:

lib

Files:

• format_pktmeta.c (modified) (2 diffs)
• libtrace.h.in (modified) (1 diff)

lib/format_pktmeta.c

@@ -322 +322 @@
  *
  * @params libtrace_packet_t meta packet to extract the ipv4 address from.
- * @params A pointer to a character buffer to store the ipv4 address string in.
- * @params The size of the buffer passed in.
  * @params The interface index within the meta packet.
  * @returns Pointer to the character buffer containing the ipv4 address string or NULL.
  */
 /* UNTESTED */
-char *trace_get_interface_ipv4_string(libtrace_packet_t *packet, char *space, int spacelen,
-        int index) {
-
-        uint32_t addr = htonl(trace_get_interface_ipv4(packet, index));
+char *trace_get_interface_ipv4_string(libtrace_packet_t *packet, int index) {
+        struct in_addr ip;
+        uint32_t addr;
+
+        addr = trace_get_interface_ipv4(packet, index);
         if (addr == 0) { return NULL; }
 
-        char *addrstr = inet_ntoa(*(struct in_addr *)&addr);
-        memcpy(space, addrstr, spacelen);
-        space[spacelen] = '\0';
-        return space;
+        ip.s_addr = addr;
+
+        return inet_ntoa(ip);
 }
 
@@ -404 +402 @@
         int index) {
 
+        /* Ensure we have enough space */
         if (spacelen < INET6_ADDRSTRLEN) {
                 return NULL;
         }
 
-        void *addr = calloc(1, 16);
-        void *r = trace_get_interface_ipv6(packet, addr, 16, index);
-
+        struct sockaddr_in6 sa;
+
+        void *r = trace_get_interface_ipv6(packet, &(sa.sin6_addr), 16, index);
         if (r == NULL) {
                 return NULL;
         }
 
-        inet_ntop(AF_INET6, addr, space, INET6_ADDRSTRLEN);
-        free(addr);
+        /* get the string representation */
+        inet_ntop(AF_INET6, &(sa.sin6_addr), space, INET6_ADDRSTRLEN);
 
         return space;

lib/libtrace.h.in

@@ -3749 +3749 @@
 DLLEXPORT uint32_t trace_get_interface_ipv4(libtrace_packet_t *packet, int index);
 
-DLLEXPORT char *trace_get_interface_ipv4_string(libtrace_packet_t *packet, char *space, int spacelen,
-        int index);
+DLLEXPORT char *trace_get_interface_ipv4_string(libtrace_packet_t *packet, int index);
 
 DLLEXPORT libtrace_meta_t *trace_get_interface_ipv6_meta(libtrace_packet_t *packet);