Fix IPv6 addresses formatting for src_ipn and dst_ipn attributes …

…in report.xml

src/inet_ntop.h

@@ -0,0 +1,17 @@
+#ifndef TCPFLOW_INET_NTOP_H
+#define TCPFLOW_INET_NTOP_H
+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+
+#ifndef HAVE_INET_NTOP
+const char *inet_ntop(int af, const void *src,char *dst, socklen_t size);
+#endif
+
+#if defined(__MINGW32__)
+// <ws2tcpip.h> has this prototype for ws2_32 dll, but has type-conflicts with winsock2.h
+WINSOCK_API_LINKAGE LPCWSTR WSAAPI inet_ntop(INT Family, PVOID pAddr, LPWSTR pStringBuf, size_t StringBufSIze);
+#endif
+
+#endif

src/tcpflow.h

@@ -259,14 +259,7 @@ typedef	unsigned char u_int8_t;
 /* tcpflow.cpp - CLI */
 extern const char *progname;
 void    terminate(int sig) __attribute__ ((__noreturn__));
-#ifndef HAVE_INET_NTOP
-const char *inet_ntop(int af, const void *src,char *dst, socklen_t size);
-#endif
-
-#if defined(__MINGW32__)
-// <ws2tcpip.h> has this prototype for ws2_32 dll, but has type-conflicts with winsock2.h
-WINSOCK_API_LINKAGE LPCWSTR WSAAPI inet_ntop(INT Family, PVOID pAddr, LPWSTR pStringBuf, size_t StringBufSIze);
-#endif
+#include "inet_ntop.h"
 
 #ifdef HAVE_PTHREAD
 #include <semaphore.h>

src/tcpip.cpp

@@ -75,8 +75,8 @@ void tcpip::dump_xml(class dfxml_writer *xreport,const std::string &xmladd)
     std::stringstream attrs;
     attrs << "startime='" << dfxml_writer::to8601(myflow.tstart) << "' ";
     attrs << "endtime='"  << dfxml_writer::to8601(myflow.tlast)  << "' ";
-    attrs << "src_ipn='"  << myflow.src << "' ";
-    attrs << "dst_ipn='"  << myflow.dst << "' ";
+    attrs << "src_ipn='"  << ipaddr_prn(myflow.src, myflow.family) << "' ";
+    attrs << "dst_ipn='"  << ipaddr_prn(myflow.dst, myflow.family) << "' ";
     if(myflow.has_mac_daddr()) attrs << "mac_daddr='" << macaddr(myflow.mac_daddr) << "' ";
     if(myflow.has_mac_saddr()) attrs << "mac_saddr='" << macaddr(myflow.mac_saddr) << "' ";
     attrs << "packets='"  << myflow.packet_count << "' ";

src/tcpip.h

@@ -3,6 +3,8 @@
 
 #include <fstream>
 
+#include "inet_ntop.h"
+
 /** On windows, there is no in_addr_t; this is from
  * /usr/include/netinet/in.h
  */
@@ -54,9 +56,19 @@ public:;
     inline bool operator < (const ipaddr &b) const { return memcmp(this->addr,b.addr,sizeof(this->addr))<0; }
 };
 
-inline std::ostream & operator <<(std::ostream &os,const ipaddr &b)  {
-    os << (int)b.addr[0] <<"."<<(int)b.addr[1] << "."
-       << (int)b.addr[2] << "." << (int)b.addr[3];
+class ipaddr_prn {
+public:
+    const ipaddr& ia;
+    const sa_family_t family;
+    ipaddr_prn(const ipaddr& ia_, sa_family_t family_)
+        : ia(ia_), family(family_)
+    { }
+};
+
+inline std::ostream & operator <<(std::ostream &os, const ipaddr_prn &b) {
+    char buf[INET6_ADDRSTRLEN];
+    inet_ntop(b.family, b.ia.addr, buf, sizeof(buf));
+    os << buf;
     return os;
 }
 
@@ -125,7 +137,7 @@ class flow_addr {
 
     std::string str() const {
         std::stringstream s;
-        s << "flow[" << src << ":" << sport << "->" << dst << ":" << dport << "]";
+        s << "flow[" << ipaddr_prn(src, family) << ":" << sport << "->" << ipaddr_prn(dst, family) << ":" << dport << "]";
         return s.str();
     }
 };