diff options
| author |   itojun <itojun@openbsd.org> | 2002-06-08 21:15:27 +0000 |
|---|---|---|
| committer | itojun <itojun@openbsd.org> | 2002-06-08 21:15:27 +0000 |
| commit | da4139ca17db822467d269ffc402a068f00bd898 (patch) | |
| tree | 1a3eeb12034fd54a064115c7c0620df702ed14b2 /usr.bin/ssh/sshconnect.c | |
| parent | Change remaining read-only lookup tables to const, suggestion drahn@ (diff) | |
| download | wireguard-openbsd-da4139ca17db822467d269ffc402a068f00bd898.tar.xz wireguard-openbsd-da4139ca17db822467d269ffc402a068f00bd898.zip | |
always use getnameinfo. (diag message only)
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index a41a84abd62..da49ee0b410 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.120 2002/05/23 19:24:30 markus Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.121 2002/06/08 21:15:27 itojun Exp $"); #include <openssl/bn.h> @@ -42,21 +42,11 @@ extern char *__progname; static const char * sockaddr_ntop(struct sockaddr *sa) { - void *addr; - static char addrbuf[INET6_ADDRSTRLEN]; + static char addrbuf[NI_MAXHOST]; - switch (sa->sa_family) { - case AF_INET: - addr = &((struct sockaddr_in *)sa)->sin_addr; - break; - case AF_INET6: - addr = &((struct sockaddr_in6 *)sa)->sin6_addr; - break; - default: - /* This case should be protected against elsewhere */ + if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf), NULL, 0, + NI_NUMERICHOST) != 0) abort(); /* XXX abort is bad -- do something else */ - } - inet_ntop(sa->sa_family, addr, addrbuf, sizeof(addrbuf)); return addrbuf; } |