[Openvpn-devel] [PATCH 03/10] Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic

[Arne Schwabe]

---
 src/openvpn/socket.c |   68 ++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 5a99de5..8a3301f 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -2152,60 +2152,52 @@ print_sockaddr (const struct openvpn_sockaddr *addr, 
struct gc_arena *gc)

 const char *
 print_sockaddr_ex (const struct openvpn_sockaddr *addr,
-                  const char* separator,
-                  const unsigned int flags,
-                  struct gc_arena *gc)
+                                  const char* separator,
+                                  const unsigned int flags,
+                                  struct gc_arena *gc)
 {
   struct buffer out = alloc_buf_gc (128, gc);
   bool addr_is_defined;
+  char buf[NI_MAXHOST] = "";
+
   addr_is_defined = addr_defined (addr);
   if (!addr_is_defined) {
     return "[undef]";
   }
+
+  int port;
+  int salen;
   switch(addr->addr.sa.sa_family)
     {
     case AF_INET:
-       {
-         const int port= ntohs (addr->addr.in4.sin_port);
-         buf_puts (&out, "[AF_INET]");
-
-         if (!(flags & PS_DONT_SHOW_ADDR))
-           buf_printf (&out, "%s", (addr_defined (addr) ? inet_ntoa 
(addr->addr.in4.sin_addr) : "[undef]"));
-
-         if (((flags & PS_SHOW_PORT) || (addr_defined (addr) && (flags & 
PS_SHOW_PORT_IF_DEFINED)))
-             && port)
-           {
-             if (separator)
-               buf_printf (&out, "%s", separator);
-
-             buf_printf (&out, "%d", port);
-           }
-       }
+      port= ntohs (addr->addr.in4.sin_port);
+      buf_puts (&out, "[AF_INET]");
+      salen = sizeof (struct sockaddr_in);
       break;
     case AF_INET6:
-       {
-         const int port= ntohs (addr->addr.in6.sin6_port);
-         char buf[INET6_ADDRSTRLEN] = "";
-         buf_puts (&out, "[AF_INET6]");
-         if (addr_is_defined)
-           {
-             getnameinfo(&addr->addr.sa, sizeof (struct sockaddr_in6),
-                         buf, sizeof (buf), NULL, 0, NI_NUMERICHOST);
-             buf_puts (&out, buf);
-           }
-         if (((flags & PS_SHOW_PORT) || (addr_is_defined && (flags & 
PS_SHOW_PORT_IF_DEFINED)))
-             && port)
-           {
-             if (separator)
-               buf_puts (&out, separator);
-
-             buf_printf (&out, "%d", port);
-           }
-       }
+      port= ntohs (addr->addr.in6.sin6_port);
+      buf_puts (&out, "[AF_INET6]");
+      salen = sizeof (struct sockaddr_in6);
       break;
     default:
       ASSERT(0);
     }
+       
+  if (!(flags & PS_DONT_SHOW_ADDR))
+    {
+      getnameinfo(&addr->addr.sa, salen,
+                  buf, sizeof (buf), NULL, 0, NI_NUMERICHOST);
+      buf_puts (&out, buf);
+    }
+  if (((flags & PS_SHOW_PORT) || (addr_is_defined && (flags & 
PS_SHOW_PORT_IF_DEFINED)))
+      && port)
+    {
+      if (separator)
+        buf_puts (&out, separator);
+               
+      buf_printf (&out, "%d", port);
+    }
+       
   return BSTR (&out);
 }

-- 
1.7.9.5