Skip to content

Commit

Permalink
connect: replace inet_ntop with getnameinfo
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benjamin Kramer authored and Junio C Hamano committed Apr 25, 2009
1 parent 911198f commit 785a985
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 785a985

Please sign in to comment.