Skip to content

Commit 8c05ebc

Browse files
authored
Merge pull request etr#116 from GMercat/fix_get_ip_str_for_ip6
Manage ipv6 in get_ip_str function
2 parents bd39cb4 + 5281246 commit 8c05ebc

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/http_utils.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,17 @@ void get_ip_str(
244244
{
245245
if(sa)
246246
{
247+
int addrlen = sizeof(sockaddr_in);
248+
if (AF_INET6 == sa->sa_family)
249+
{
250+
addrlen = sizeof(sockaddr_in6);
251+
}
252+
247253
char to_ret[NI_MAXHOST];
248-
getnameinfo(sa, sizeof (struct sockaddr), to_ret, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
249-
result = to_ret;
254+
if (0 == getnameinfo(sa, addrlen, to_ret, NI_MAXHOST, NULL, 0, NI_NUMERICHOST))
255+
{
256+
result = to_ret;
257+
}
250258
}
251259
}
252260

0 commit comments

Comments
 (0)