Fixed computation of ip mask

etr · etr · commit 307113d10bc0 · 2018-12-24T00:58:54.000Z
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -475,7 +475,8 @@ ip_representation::ip_representation(const std::string& ip)
             else
             {
                 CLEAR_BIT(mask, y);
-                y++;
+                CLEAR_BIT(mask, y+1);
+                y+=2;
             }
         }
     }
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -302,7 +302,7 @@ struct ip_representation
     int weight() const
     {
         //variable-precision SWAR algorithm
-        unsigned int x = mask;
+        unsigned short x = mask;
         x = x - ((x >> 1) & 0x55555555);
         x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
         return (((x + (x >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;
diff --git a/test/unit/http_utils_test.cpp b/test/unit/http_utils_test.cpp
@@ -237,7 +237,7 @@ LT_BEGIN_AUTO_TEST(http_utils_suite, ip_representation6_str_mask)
     LT_CHECK_EQ(test_ip.pieces[14], 0);
     LT_CHECK_EQ(test_ip.pieces[15], 0);
 
-    LT_CHECK_EQ(test_ip.mask, 0xFCFF);
+    LT_CHECK_EQ(test_ip.mask, 0xF0FF);
 LT_END_AUTO_TEST(ip_representation6_str_mask)
 
 LT_BEGIN_AUTO_TEST(http_utils_suite, ip_representation6_str_nested)
@@ -366,6 +366,17 @@ LT_BEGIN_AUTO_TEST(http_utils_suite, ip_representation6_str_loopback)
     LT_CHECK_EQ(test_ip.mask, 0xFFFF);
 LT_END_AUTO_TEST(ip_representation6_str_loopback)
 
+LT_BEGIN_AUTO_TEST(http_utils_suite, ip_representation_weight)
+    LT_CHECK_EQ(http::ip_representation("::1").weight(), 16);
+    LT_CHECK_EQ(http::ip_representation("192.168.0.1").weight(), 16);
+    LT_CHECK_EQ(http::ip_representation("192.168.*.*").weight(), 14);
+    LT_CHECK_EQ(http::ip_representation("::ffff:192.0.*.*").weight(), 14);
+    LT_CHECK_EQ(http::ip_representation("2001:db8:8714:3a90:*:*").weight(), 12);
+    LT_CHECK_EQ(http::ip_representation("2001:db8:8714:3a90:8714:2001:db8:3a90").weight(), 16);
+    LT_CHECK_EQ(http::ip_representation("2001:db8:8714:3a90:8714:2001:*:*").weight(), 12);
+    LT_CHECK_EQ(http::ip_representation("*:*:*:*:*:*:*:*").weight(), 0);
+LT_END_AUTO_TEST(ip_representation_weight)
+
 LT_BEGIN_AUTO_TEST(http_utils_suite, ip_representation6_str_invalid)
     LT_CHECK_THROW(http::ip_representation("2001:db8:8714:3a90::12:4:4:4"));
 LT_END_AUTO_TEST(ip_representation6_str_invalid)

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,8 @@ ip_representation::ip_representation(const std::string& ip)`
`475`	`475`	`else`
`476`	`476`	`{`
`477`	`477`	`CLEAR_BIT(mask, y);`
`478`		`- y++;`
	`478`	`+ CLEAR_BIT(mask, y+1);`
	`479`	`+ y+=2;`
`479`	`480`	`}`
`480`	`481`	`}`
`481`	`482`	`}`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ struct ip_representation`
`302`	`302`	`int weight() const`
`303`	`303`	`{`
`304`	`304`	`//variable-precision SWAR algorithm`
`305`		`- unsigned int x = mask;`
	`305`	`+ unsigned short x = mask;`
`306`	`306`	`x = x - ((x >> 1) & 0x55555555);`
`307`	`307`	`x = (x & 0x33333333) + ((x >> 2) & 0x33333333);`
`308`	`308`	`return (((x + (x >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;`