Skip to content

Commit 785a985

Browse files
d0kgitster
authored andcommitted
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>
1 parent 911198f commit 785a985

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

connect.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -177,18 +177,11 @@ static enum protocol get_protocol(const char *name)
177177

178178
static const char *ai_name(const struct addrinfo *ai)
179179
{
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)
190183
strcpy(addr, "(unknown)");
191-
}
184+
192185
return addr;
193186
}
194187

0 commit comments

Comments
 (0)