Moved http_endpoint to details namespace

Sebastiano Merlino · Sebastiano Merlino · commit 2df924138c2e · 2012-09-15T13:02:52.000+02:00
diff --git a/src/http_endpoint.cpp b/src/http_endpoint.cpp
@@ -25,8 +25,12 @@ using namespace std;
 
 namespace httpserver
 {
+
 using namespace http;
 
+namespace details
+{
+
 //ENDPOINT
 http_endpoint::~http_endpoint()
 {
@@ -197,3 +201,5 @@ bool http_endpoint::match(const http_endpoint& url) const
 }
 
 };
+
+};
diff --git a/src/httpserver/http_endpoint.hpp b/src/httpserver/http_endpoint.hpp
@@ -35,6 +35,9 @@ namespace httpserver
 
 class webserver;
 
+namespace details
+{
+
 /**
  * Exception class throwed when a bad formatted http url is used
 **/
@@ -224,10 +227,12 @@ class http_endpoint
          * Boolean indicating if the regex is compiled
         **/
         bool reg_compiled;
-        friend class webserver;
+        friend class httpserver::webserver;
         template<typename, typename> friend struct std::pair;
         template<typename> friend struct std::less;
 };
 
+};
+
 };
 #endif
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -51,10 +51,13 @@ namespace httpserver {
 class http_resource;
 class http_response;
 class http_request;
-class http_endpoint;
-
 struct modded_request;
 
+namespace details
+{
+    class http_endpoint;
+}
+
 using namespace http;
 
 namespace http {
@@ -275,7 +278,7 @@ class webserver
         http_resource* method_not_acceptable_resource;
         http_resource* internal_error_resource;
 
-        std::map<http_endpoint, http_resource* > registered_resources;
+        std::map<details::http_endpoint, http_resource* > registered_resources;
 #ifdef USE_CPP_ZEROX
         std::unordered_set<ip_representation> bans;
         std::unordered_set<ip_representation> allowances;
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -410,14 +410,14 @@ bool webserver::stop()
 
 void webserver::register_resource(const string& resource, http_resource* http_resource, bool family)
 {
-    this->registered_resources[http_endpoint(resource, family, true, regex_checking)] = http_resource;
+    this->registered_resources[details::http_endpoint(resource, family, true, regex_checking)] = http_resource;
     if(method_not_acceptable_resource)
         http_resource->method_not_acceptable_resource = method_not_acceptable_resource;
 }
 
 void webserver::unregister_resource(const string& resource)
 {
-    this->registered_resources.erase(http_endpoint(resource));
+    this->registered_resources.erase(details::http_endpoint(resource));
 }
 
 void webserver::ban_ip(const string& ip)
@@ -722,17 +722,17 @@ int webserver::finalize_answer(MHD_Connection* connection, struct modded_request
     int to_ret = MHD_NO;
     struct MHD_Response *response = 0x0;
     http_response* dhrs = 0x0;
-    map<http_endpoint, http_resource* >::iterator found_endpoint;
+    map<details::http_endpoint, http_resource* >::iterator found_endpoint;
     bool found = false;
     if(!single_resource)
     {
-        http_endpoint endpoint(st_url, false, false, regex_checking);
+        details::http_endpoint endpoint(st_url, false, false, regex_checking);
         found_endpoint = registered_resources.find(endpoint);
         if(found_endpoint == registered_resources.end())
         {
             if(regex_checking)
             {
-                map<http_endpoint, http_resource* >::iterator it;
+                map<details::http_endpoint, http_resource* >::iterator it;
                 int len = -1;
                 int tot_len = -1;
                 for(it=registered_resources.begin(); it!=registered_resources.end(); ++it) 

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,12 @@ using namespace std;`
`25`	`25`
`26`	`26`	`namespace httpserver`
`27`	`27`	`{`
	`28`	`+`
`28`	`29`	`using namespace http;`
`29`	`30`
	`31`	`+namespace details`
	`32`	`+{`
	`33`	`+`
`30`	`34`	`//ENDPOINT`
`31`	`35`	`http_endpoint::~http_endpoint()`
`32`	`36`	`{`
`@@ -197,3 +201,5 @@ bool http_endpoint::match(const http_endpoint& url) const`
`197`	`201`	`}`
`198`	`202`
`199`	`203`	`};`
	`204`	`+`
	`205`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -410,14 +410,14 @@ bool webserver::stop()`
`410`	`410`
`411`	`411`	`void webserver::register_resource(const string& resource, http_resource* http_resource, bool family)`
`412`	`412`	`{`
`413`		`- this->registered_resources[http_endpoint(resource, family, true, regex_checking)] = http_resource;`
	`413`	`+ this->registered_resources[details::http_endpoint(resource, family, true, regex_checking)] = http_resource;`
`414`	`414`	`if(method_not_acceptable_resource)`
`415`	`415`	`http_resource->method_not_acceptable_resource = method_not_acceptable_resource;`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`void webserver::unregister_resource(const string& resource)`
`419`	`419`	`{`
`420`		`- this->registered_resources.erase(http_endpoint(resource));`
	`420`	`+ this->registered_resources.erase(details::http_endpoint(resource));`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`void webserver::ban_ip(const string& ip)`
`@@ -722,17 +722,17 @@ int webserver::finalize_answer(MHD_Connection* connection, struct modded_request`
`722`	`722`	`int to_ret = MHD_NO;`
`723`	`723`	`struct MHD_Response *response = 0x0;`
`724`	`724`	`http_response* dhrs = 0x0;`
`725`		`- map<http_endpoint, http_resource* >::iterator found_endpoint;`
	`725`	`+ map<details::http_endpoint, http_resource* >::iterator found_endpoint;`
`726`	`726`	`bool found = false;`
`727`	`727`	`if(!single_resource)`
`728`	`728`	`{`
`729`		`- http_endpoint endpoint(st_url, false, false, regex_checking);`
	`729`	`+ details::http_endpoint endpoint(st_url, false, false, regex_checking);`
`730`	`730`	`found_endpoint = registered_resources.find(endpoint);`
`731`	`731`	`if(found_endpoint == registered_resources.end())`
`732`	`732`	`{`
`733`	`733`	`if(regex_checking)`
`734`	`734`	`{`
`735`		`- map<http_endpoint, http_resource* >::iterator it;`
	`735`	`+ map<details::http_endpoint, http_resource* >::iterator it;`
`736`	`736`	`int len = -1;`
`737`	`737`	`int tot_len = -1;`
`738`	`738`	`for(it=registered_resources.begin(); it!=registered_resources.end(); ++it)`