[PATCH v2 6/6] wg: Simplify showconf_main by using print_sockaddr_inet

[Daniel Gröber]

Signed-off-by: Daniel Gröber <d...@darkboxed.org>
---
 src/showconf.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/showconf.c b/src/showconf.c
index c99a6a0..f2c6a68 100644
--- a/src/showconf.c
+++ b/src/showconf.c
@@ -23,8 +23,6 @@ int showconf_main(int argc, const char *argv[])
 {
        char base64[WG_KEY_LEN_BASE64];
        char ip[INET6_ADDRSTRLEN];
-       char host[4096 + 1], service[512 + 1];
-       socklen_t addr_len = 0;
        struct wgdevice *device = NULL;
        struct wgpeer *peer;
        struct wgallowedip *allowedip;
@@ -77,19 +75,8 @@ int showconf_main(int argc, const char *argv[])
                if (peer->first_allowedip)
                        printf("\n");
 
-               // TODO: use print_endpoint
-               if (peer->endpoint.addr.sa_family == AF_INET || 
peer->endpoint.addr.sa_family == AF_INET6) {
-                       if (peer->endpoint.addr.sa_family == AF_INET)
-                               addr_len = sizeof(struct sockaddr_in);
-                       else if (peer->endpoint.addr.sa_family == AF_INET6)
-                               addr_len = sizeof(struct sockaddr_in6);
-                       if (!getnameinfo(&peer->endpoint.addr, addr_len, host, 
sizeof(host), service, sizeof(service), NI_DGRAM | NI_NUMERICSERV | 
NI_NUMERICHOST)) {
-                               if (peer->endpoint.addr.sa_family == AF_INET6 
&& strchr(host, ':'))
-                                       printf("Endpoint = [%s]:%s\n", host, 
service);
-                               else
-                                       printf("Endpoint = %s:%s\n", host, 
service);
-                       }
-               }
+               if (peer->endpoint.addr.sa_family == AF_INET || 
peer->endpoint.addr.sa_family == AF_INET6)
+                       printf("Endpoint = %s\n", 
print_sockaddr_inet(&peer->endpoint.addr_inet));
 
                if (peer->persistent_keepalive_interval)
                        printf("PersistentKeepalive = %u\n", 
peer->persistent_keepalive_interval);
-- 
2.39.2