diff options
| author |   eric <eric@openbsd.org> | 2012-04-15 21:42:58 +0000 |
|---|---|---|
| committer | eric <eric@openbsd.org> | 2012-04-15 21:42:58 +0000 |
| commit | 68cad45c03231783b0da81f6a64d823fad170129 (patch) | |
| tree | a545480f1d1246863d6863e0870c7e1cad9580f4 /lib/libc/asr/asr_debug.c | |
| parent | Use the proper symbol name for __guard in the workaround for the (diff) | |
| download | wireguard-openbsd-68cad45c03231783b0da81f6a64d823fad170129.tar.xz wireguard-openbsd-68cad45c03231783b0da81f6a64d823fad170129.zip | |
calling getnameinfo here is a bad idea. use inet_ntop.
Diffstat (limited to 'lib/libc/asr/asr_debug.c')
| -rw-r--r-- | lib/libc/asr/asr_debug.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/libc/asr/asr_debug.c b/lib/libc/asr/asr_debug.c index 1305633c352..47fb2337795 100644 --- a/lib/libc/asr/asr_debug.c +++ b/lib/libc/asr/asr_debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asr_debug.c,v 1.1 2012/04/14 09:24:18 eric Exp $ */ +/* $OpenBSD: asr_debug.c,v 1.2 2012/04/15 21:42:58 eric Exp $ */ /* * Copyright (c) 2010-2012 Eric Faurot <eric@openbsd.org> * @@ -263,12 +263,15 @@ print_header(struct header *h, char *buf, size_t max, int noid) static char * print_host(const struct sockaddr *sa, char *buf, size_t len) { - int e; - - if ((e = getnameinfo(sa, sa->sa_len, - buf, len, NULL, 0, NI_NUMERICHOST)) != 0) { + switch (sa->sa_family) { + case AF_INET: + inet_ntop(AF_INET, &((struct sockaddr_in*)sa)->sin_addr, buf, len); + break; + case AF_INET6: + inet_ntop(AF_INET6, &((struct sockaddr_in6*)sa)->sin6_addr, buf, len); + break; + default: buf[0] = '\0'; - return (NULL); } return (buf); } |