Manage ipv6 in get_ip_str function

GMercat · web-flow · commit c535126a2087 · 2017-11-07T18:37:02.000+01:00
sockaddr_in (IPv4) is the same size as sockaddr, which is why getnameinfo() is working for IPv4. But sockaddr_in6 (IPv6) is larger than sockaddr, which is why getnameinfo() fails.
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -244,9 +244,21 @@ void get_ip_str(
 {
     if(sa)
     {
+        int addrlen = sizeof(sockaddr_in);
+        if (AF_INET6 == sa->sa_family)
+        {
+            addrlen = sizeof(sockaddr_in6);
+        }
+
         char to_ret[NI_MAXHOST];
-        getnameinfo(sa, sizeof (struct sockaddr), to_ret, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-        result = to_ret;
+        if (0 == getnameinfo(sa, addrlen, to_ret, NI_MAXHOST, NULL, 0, NI_NUMERICHOST))
+        {
+            result = to_ret;
+        }
+        else
+        {
+            result.clear();
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -244,9 +244,21 @@ void get_ip_str(`
`244`	`244`	`{`
`245`	`245`	`if(sa)`
`246`	`246`	`{`
	`247`	`+ int addrlen = sizeof(sockaddr_in);`
	`248`	`+ if (AF_INET6 == sa->sa_family)`
	`249`	`+ {`
	`250`	`+ addrlen = sizeof(sockaddr_in6);`
	`251`	`+ }`
	`252`	`+`
`247`	`253`	`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`	`+ }`
	`258`	`+ else`
	`259`	`+ {`
	`260`	`+ result.clear();`
	`261`	`+ }`
`250`	`262`	`}`
`251`	`263`	`}`
`252`	`264`