Fixed logic to get ip and port.

etr · etr · commit fc37c08ed179 · 2018-12-23T07:01:22.000Z
Added tests to verify the logic.
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -30,6 +30,7 @@
 #else
 #include <sys/socket.h>
 #include <netdb.h>
+#include <arpa/inet.h>
 #endif
 #include <sstream>
 #include <iomanip>
@@ -246,15 +247,15 @@ std::string get_ip_str(
 
     if(sa)
     {
-        int addrlen = sizeof(sockaddr_in);
+        char to_ret[NI_MAXHOST];
         if (AF_INET6 == sa->sa_family)
         {
-            addrlen = sizeof(sockaddr_in6);
+            inet_ntop(AF_INET6, &(((sockaddr_in6*) sa)->sin6_addr), to_ret, INET6_ADDRSTRLEN);
+            result = to_ret;
         }
-
-        char to_ret[NI_MAXHOST];
-        if (0 == getnameinfo(sa, addrlen, to_ret, NI_MAXHOST, NULL, 0, NI_NUMERICHOST))
+        else
         {
+            inet_ntop(AF_INET, &(((sockaddr_in*) sa)->sin_addr), to_ret, INET_ADDRSTRLEN);
             result = to_ret;
         }
     }
@@ -269,17 +270,17 @@ unsigned short get_port(const struct sockaddr* sa)
         switch(sa->sa_family)
         {
             case AF_INET:
-                return ((struct sockaddr_in *)sa)->sin_port;
+                return ((struct sockaddr_in*) sa)->sin_port;
             case AF_INET6:
-                return ((struct sockaddr_in *)sa)->sin_port;
+                return ((struct sockaddr_in6*) sa)->sin6_port;
             default:
                 return 0;
         }
     }
     return 0;
 }
 
-size_t http_unescape (char *val)
+size_t http_unescape(char *val)
 {
     char *rpos = val;
     char *wpos = val;
diff --git a/test/unit/http_utils_test.cpp b/test/unit/http_utils_test.cpp
@@ -87,12 +87,27 @@ LT_BEGIN_AUTO_TEST(http_utils_suite, ip_to_str)
     ip4addr.sin_port = htons(3490);
     ip4addr.sin_addr.s_addr = inet_addr("127.0.0.1");
 
-    string result = "";
-    result = http::get_ip_str((struct sockaddr *) &ip4addr);
+    string result = http::get_ip_str((struct sockaddr*) &ip4addr);
+    unsigned short port = http::get_port((struct sockaddr*) &ip4addr);
 
     LT_CHECK_EQ(result, "127.0.0.1");
+    LT_CHECK_EQ(port, htons(3490));
 LT_END_AUTO_TEST(ip_to_str)
 
+LT_BEGIN_AUTO_TEST(http_utils_suite, ip_to_str6)
+    struct sockaddr_in6 ip6addr;
+
+    ip6addr.sin6_family = AF_INET6;
+    ip6addr.sin6_port = htons(3490);
+    inet_pton(AF_INET6, "2001:db8:8714:3a90::12", &(ip6addr.sin6_addr));
+
+    string result = http::get_ip_str((struct sockaddr *) &ip6addr);
+    unsigned short port = http::get_port((struct sockaddr*) &ip6addr);
+
+    LT_CHECK_EQ(result, "2001:db8:8714:3a90::12");
+    LT_CHECK_EQ(port, htons(3490));
+LT_END_AUTO_TEST(ip_to_str6)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#else`
`31`	`31`	`#include <sys/socket.h>`
`32`	`32`	`#include <netdb.h>`
	`33`	`+#include <arpa/inet.h>`
`33`	`34`	`#endif`
`34`	`35`	`#include <sstream>`
`35`	`36`	`#include <iomanip>`
`@@ -246,15 +247,15 @@ std::string get_ip_str(`
`246`	`247`
`247`	`248`	`if(sa)`
`248`	`249`	`{`
`249`		`- int addrlen = sizeof(sockaddr_in);`
	`250`	`+ char to_ret[NI_MAXHOST];`
`250`	`251`	`if (AF_INET6 == sa->sa_family)`
`251`	`252`	`{`
`252`		`- addrlen = sizeof(sockaddr_in6);`
	`253`	`+ inet_ntop(AF_INET6, &(((sockaddr_in6*) sa)->sin6_addr), to_ret, INET6_ADDRSTRLEN);`
	`254`	`+ result = to_ret;`
`253`	`255`	`}`
`254`		`-`
`255`		`- char to_ret[NI_MAXHOST];`
`256`		`- if (0 == getnameinfo(sa, addrlen, to_ret, NI_MAXHOST, NULL, 0, NI_NUMERICHOST))`
	`256`	`+ else`
`257`	`257`	`{`
	`258`	`+ inet_ntop(AF_INET, &(((sockaddr_in*) sa)->sin_addr), to_ret, INET_ADDRSTRLEN);`
`258`	`259`	`result = to_ret;`
`259`	`260`	`}`
`260`	`261`	`}`
`@@ -269,17 +270,17 @@ unsigned short get_port(const struct sockaddr* sa)`
`269`	`270`	`switch(sa->sa_family)`
`270`	`271`	`{`
`271`	`272`	`case AF_INET:`
`272`		`- return ((struct sockaddr_in *)sa)->sin_port;`
	`273`	`+ return ((struct sockaddr_in*) sa)->sin_port;`
`273`	`274`	`case AF_INET6:`
`274`		`- return ((struct sockaddr_in *)sa)->sin_port;`
	`275`	`+ return ((struct sockaddr_in6*) sa)->sin6_port;`
`275`	`276`	`default:`
`276`	`277`	`return 0;`
`277`	`278`	`}`
`278`	`279`	`}`
`279`	`280`	`return 0;`
`280`	`281`	`}`
`281`	`282`
`282`		`-size_t http_unescape (char *val)`
	`283`	`+size_t http_unescape(char *val)`
`283`	`284`	`{`
`284`	`285`	`char *rpos = val;`
`285`	`286`	`char *wpos = val;`