Note this changes the commandline behaviour slightly. Previously we would
output the gai_strerror message instead of the address when getnameinfo
fails.
I don't think this behaviour is very useful for scripts as it's hard to
match for since we're missing, say, an "error: " prefix. Instead print the
error to stderr and just don't print anything on stdout in this case. Empty
string is easier to detect than an arbitrary set of (possibly localised!)
error messages.
Signed-off-by: Daniel Gröber <d...@darkboxed.org>
---
src/show.c | 29 +++--------------------------
1 file changed, 3 insertions(+), 26 deletions(-)
diff --git a/src/show.c b/src/show.c
index 3048183..ec830d1 100644
--- a/src/show.c
+++ b/src/show.c
@@ -104,29 +104,6 @@ static char *ip(const struct wgallowedip *ip)
return buf;
}
-char *print_endpoint(const struct sockaddr *addr)
-{
- char host[4096 + 1];
- char service[512 + 1];
- static char buf[sizeof(host) + sizeof(service) + 4];
- int ret;
- socklen_t addr_len = 0;
-
- memset(buf, 0, sizeof(buf));
- if (addr->sa_family == AF_INET)
- addr_len = sizeof(struct sockaddr_in);
- else if (addr->sa_family == AF_INET6)
- addr_len = sizeof(struct sockaddr_in6);
-
- ret = getnameinfo(addr, addr_len, host, sizeof(host), service,
sizeof(service), NI_DGRAM | NI_NUMERICSERV | NI_NUMERICHOST);
- if (ret) {
- strncpy(buf, gai_strerror(ret), sizeof(buf) - 1);
- buf[sizeof(buf) - 1] = '\0';
- } else
- snprintf(buf, sizeof(buf), (addr->sa_family == AF_INET6 &&
strchr(host, ':')) ? "[%s]:%s" : "%s:%s", host, service);
- return buf;
-}
-
char *print_sockaddr_inet(const struct sockaddr_inet *sa)
{
char host[4096 + 1], service[512 + 1], ifname_buf[IF_NAMESIZE+10] = "%";
@@ -271,7 +248,7 @@ static void pretty_print(struct wgdevice *device)
if (peer->flags & WGPEER_HAS_PRESHARED_KEY)
terminal_printf(" " TERMINAL_BOLD "preshared key"
TERMINAL_RESET ": %s\n", masked_key(peer->preshared_key));
if (peer->endpoint.addr.sa_family == AF_INET ||
peer->endpoint.addr.sa_family == AF_INET6)
- terminal_printf(" " TERMINAL_BOLD "endpoint"
TERMINAL_RESET ": %s\n", print_endpoint(&peer->endpoint.addr));
+ terminal_printf(" " TERMINAL_BOLD "endpoint"
TERMINAL_RESET ": %s\n", print_sockaddr_inet(&peer->endpoint.addr_inet));
terminal_printf(" " TERMINAL_BOLD "allowed ips" TERMINAL_RESET
": ");
if (peer->first_allowedip) {
for_each_wgallowedip(peer, allowedip)
@@ -315,7 +292,7 @@ static void dump_print(struct wgdevice *device, bool
with_interface)
printf("%s\t", key(peer->public_key));
printf("%s\t", maybe_key(peer->preshared_key, peer->flags &
WGPEER_HAS_PRESHARED_KEY));
if (peer->endpoint.addr.sa_family == AF_INET ||
peer->endpoint.addr.sa_family == AF_INET6)
- printf("%s\t", print_endpoint(&peer->endpoint.addr));
+ printf("%s\t",
print_sockaddr_inet(&peer->endpoint.addr_inet));
else
printf("(none)\t");
if (peer->first_allowedip) {
@@ -366,7 +343,7 @@ static bool ugly_print(struct wgdevice *device, const char
*param, bool with_int
printf("%s\t", device->name);
printf("%s\t", key(peer->public_key));
if (peer->endpoint.addr.sa_family == AF_INET ||
peer->endpoint.addr.sa_family == AF_INET6)
- printf("%s\n",
print_endpoint(&peer->endpoint.addr));
+ printf("%s\n",
print_sockaddr_inet(&peer->endpoint.addr_inet));
else
printf("(none)\n");
}
--
2.39.2
