summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2009-04-24 12:16:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-25 16:29:38 (GMT)
commit785a9857496ae1b71b168f6d79306ca233ec0cd6 (patch)
treeda380e42df7032933f59fe9c527a1a8887afdd11 /connect.c
parent911198f6c09e2a60451cf1a295ce4532ff11781c (diff)
downloadgit-785a9857496ae1b71b168f6d79306ca233ec0cd6.zip
git-785a9857496ae1b71b168f6d79306ca233ec0cd6.tar.gz
git-785a9857496ae1b71b168f6d79306ca233ec0cd6.tar.bz2
connect: replace inet_ntop with getnameinfo
inet_ntop is not protocol independent. getnameinfo(3) is part of POSIX and is available when getaddrinfo(3) is. This code is only compiled when NO_IPV6 isn't defined. The old method was buggy anyway, not every ipv6 address was converted properly because the buffer (addr) was too small. Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/connect.c b/connect.c
index 7636bf9..f6b8ba6 100644
--- a/connect.c
+++ b/connect.c
@@ -177,18 +177,11 @@ static enum protocol get_protocol(const char *name)
static const char *ai_name(const struct addrinfo *ai)
{
- static char addr[INET_ADDRSTRLEN];
- if ( AF_INET == ai->ai_family ) {
- struct sockaddr_in *in;
- in = (struct sockaddr_in *)ai->ai_addr;
- inet_ntop(ai->ai_family, &in->sin_addr, addr, sizeof(addr));
- } else if ( AF_INET6 == ai->ai_family ) {
- struct sockaddr_in6 *in;
- in = (struct sockaddr_in6 *)ai->ai_addr;
- inet_ntop(ai->ai_family, &in->sin6_addr, addr, sizeof(addr));
- } else {
+ static char addr[NI_MAXHOST];
+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, addr, sizeof(addr), NULL, 0,
+ NI_NUMERICHOST) != 0)
strcpy(addr, "(unknown)");
- }
+
return addr;
}