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>
Benjamin Kramer committed
Apr 24, 2009 at 14:16 UTC
785a9857496ae1b71b168f6d79306ca233ec0cd6
1 file changed
+4
-11
connect.c
+4
-11
@@ -177,18 +177,11 @@ static enum protocol get_protocol(const char *name)
177
178
static const char *ai_name(const struct addrinfo *ai)
179
{
180
- static char addr[INET_ADDRSTRLEN];
181
- if ( AF_INET == ai->ai_family ) {
182
- struct sockaddr_in *in;
183
- in = (struct sockaddr_in *)ai->ai_addr;
184
- inet_ntop(ai->ai_family, &in->sin_addr, addr, sizeof(addr));
185
- } else if ( AF_INET6 == ai->ai_family ) {
186
- struct sockaddr_in6 *in;
187
- in = (struct sockaddr_in6 *)ai->ai_addr;
188
- inet_ntop(ai->ai_family, &in->sin6_addr, addr, sizeof(addr));
189
- } else {
180
+ static char addr[NI_MAXHOST];
181
+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, addr, sizeof(addr), NULL, 0,
182
+ NI_NUMERICHOST) != 0)
183
strcpy(addr, "(unknown)");
191
- }
184
+
185
return addr;
186
}
187