Parametrized mask value

Sebastiano Merlino · Sebastiano Merlino · commit e792f12718d5 · 2012-04-14T20:08:23.000+02:00
diff --git a/src/HttpUtils.cpp b/src/HttpUtils.cpp
@@ -293,13 +293,13 @@ ip_representation::ip_representation(const struct sockaddr* ip)
             pieces[i/2] = ((u_char*)&(((struct sockaddr_in6 *)ip)->sin6_addr))[i] + 16 * ((u_char*)&(((struct sockaddr_in6 *)ip)->sin6_addr))[i+1];
         }
     }
-    mask = 65535;
+    mask = DEFAULT_MASK_VALUE;
 }
 
 ip_representation::ip_representation(const std::string& ip)
 {
     std::vector<std::string> parts;
-    mask = 65535;
+    mask = DEFAULT_MASK_VALUE;
     std::fill(pieces, pieces + 16, 0);
     if(ip.find(':') != std::string::npos) //IPV6
     {
diff --git a/src/httpserver/HttpUtils.hpp b/src/httpserver/HttpUtils.hpp
@@ -31,6 +31,8 @@
 #include <gnutls/gnutls.h>
 #endif
 
+#define DEFAULT_MASK_VALUE 65535
+
 namespace httpserver {
 namespace http {
 
@@ -275,7 +277,7 @@ struct ip_representation
 
     ip_representation(HttpUtils::IPVersion_T ip_version) : ip_version(ip_version)
     {
-        mask = 65535;
+        mask = DEFAULT_MASK_VALUE;
         std::fill(pieces, pieces + 16, 0);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -293,13 +293,13 @@ ip_representation::ip_representation(const struct sockaddr* ip)`
`293`	`293`	`pieces[i/2] = ((u_char)&(((struct sockaddr_in6 )ip)->sin6_addr))[i] + 16 * ((u_char)&(((struct sockaddr_in6 )ip)->sin6_addr))[i+1];`
`294`	`294`	`}`
`295`	`295`	`}`
`296`		`- mask = 65535;`
	`296`	`+ mask = DEFAULT_MASK_VALUE;`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`ip_representation::ip_representation(const std::string& ip)`
`300`	`300`	`{`
`301`	`301`	`std::vector<std::string> parts;`
`302`		`- mask = 65535;`
	`302`	`+ mask = DEFAULT_MASK_VALUE;`
`303`	`303`	`std::fill(pieces, pieces + 16, 0);`
`304`	`304`	`if(ip.find(':') != std::string::npos) //IPV6`
`305`	`305`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`#include <gnutls/gnutls.h>`
`32`	`32`	`#endif`
`33`	`33`
	`34`	`+#define DEFAULT_MASK_VALUE 65535`
	`35`	`+`
`34`	`36`	`namespace httpserver {`
`35`	`37`	`namespace http {`
`36`	`38`
`@@ -275,7 +277,7 @@ struct ip_representation`
`275`	`277`
`276`	`278`	`ip_representation(HttpUtils::IPVersion_T ip_version) : ip_version(ip_version)`
`277`	`279`	`{`
`278`		`- mask = 65535;`
	`280`	`+ mask = DEFAULT_MASK_VALUE;`
`279`	`281`	`std::fill(pieces, pieces + 16, 0);`
`280`	`282`	`}`
`281`	`283`