diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-01-10 05:52:06 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-01-10 06:29:24 +0100 |
| commit | ffb37250f968297bf3cc50a87c63a18d54efcbd0 (patch) | |
| tree | 2b5671e0aada3294b0b35fd0f63d8df29d68598f /src/tools/showconf.c | |
| parent | uapi: use flag instead of C bitfield for portability (diff) | |
| download | wireguard-monolithic-historical-ffb37250f968297bf3cc50a87c63a18d54efcbd0.tar.xz wireguard-monolithic-historical-ffb37250f968297bf3cc50a87c63a18d54efcbd0.zip | |
uapi: use sockaddr union instead of sockaddr_storage
Diffstat (limited to 'src/tools/showconf.c')
| -rw-r--r-- | src/tools/showconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/showconf.c b/src/tools/showconf.c index f04caa1..fe811e6 100644 --- a/src/tools/showconf.c +++ b/src/tools/showconf.c @@ -75,18 +75,18 @@ int showconf_main(int argc, char *argv[]) if (peer->num_ipmasks) printf("\n"); - if (peer->endpoint.ss_family == AF_INET || peer->endpoint.ss_family == AF_INET6) { + if (peer->endpoint.addr.sa_family == AF_INET || peer->endpoint.addr.sa_family == AF_INET6) { char host[4096 + 1]; char service[512 + 1]; static char buf[sizeof(host) + sizeof(service) + 4]; socklen_t addr_len = 0; memset(buf, 0, sizeof(buf)); - if (peer->endpoint.ss_family == AF_INET) + if (peer->endpoint.addr.sa_family == AF_INET) addr_len = sizeof(struct sockaddr_in); - else if (peer->endpoint.ss_family == AF_INET6) + else if (peer->endpoint.addr.sa_family == AF_INET6) addr_len = sizeof(struct sockaddr_in6); - if (!getnameinfo((struct sockaddr *)&peer->endpoint, addr_len, host, sizeof(host), service, sizeof(service), NI_DGRAM | NI_NUMERICSERV | NI_NUMERICHOST)) { - snprintf(buf, sizeof(buf) - 1, (peer->endpoint.ss_family == AF_INET6 && strchr(host, ':')) ? "[%s]:%s" : "%s:%s", host, service); + if (!getnameinfo(&peer->endpoint.addr, addr_len, host, sizeof(host), service, sizeof(service), NI_DGRAM | NI_NUMERICSERV | NI_NUMERICHOST)) { + snprintf(buf, sizeof(buf) - 1, (peer->endpoint.addr.sa_family == AF_INET6 && strchr(host, ':')) ? "[%s]:%s" : "%s:%s", host, service); printf("Endpoint = %s\n", buf); } } |