Removed functions used to access to cache entries attribute from outside

The functions have been moved to the webserver class in order to enhance
the protection level

Author: Sebastiano Merlino

src/http_response.cpp

@@ -30,15 +30,10 @@ using namespace std;
 namespace httpserver
 {
 
-void unlock_on_close::do_action()
-{
-    details::unlock_cache_entry(elem);
-}
-
 cache_response::~cache_response()
 {
     if(ce != 0x0)
-        details::unlock_cache_entry(ce);
+        webserver::unlock_cache_entry(ce);
 }
 
 const std::vector<std::pair<std::string, std::string> > http_response::get_headers()
@@ -169,7 +164,7 @@ void cache_response::get_raw_response(MHD_Response** response, webserver* ws)
     if(ce == 0x0)
         r = ws->get_from_cache(content, &valid, &ce, true, false);
     else
-        details::get_response(ce, &r);
+        webserver::get_response(ce, &r);
     r->get_raw_response(response, ws);
     r->decorate_response(*response); //It is done here to avoid to search two times for the same element
 

src/httpserver/http_response.hpp

@@ -81,21 +81,6 @@ class closure_action
         friend class http_response;
 };
 
-class unlock_on_close : public closure_action
-{
-    public:
-        unlock_on_close(cache_entry* elem, bool deletable = true) : closure_action(deletable), elem(elem) { }
-        unlock_on_close(const unlock_on_close& b) : closure_action(elem), elem(b.elem) { }
-        unlock_on_close& operator = (const unlock_on_close& b)
-        {
-            elem = b.elem;
-            return *this;
-        }
-        virtual void do_action();
-    private:
-        cache_entry* elem;
-};
-
 /**
  * Class representing an abstraction for an Http Response. It is used from classes using these apis to send information through http protocol.
 **/

src/httpserver/webserver.hpp

@@ -63,9 +63,6 @@ namespace details
     struct modded_request;
     struct cache_manager;
     struct daemon_item;
-    void unlock_cache_entry(cache_entry*);
-    void lock_cache_entry(cache_entry*);
-    void get_response(cache_entry*, http_response** res);
 }
 
 using namespace http;
@@ -402,6 +399,10 @@ class webserver
             void **con_cls, int upgrade_socket
         );
 
+        static void unlock_cache_entry(cache_entry*);
+        static void lock_cache_entry(cache_entry*);
+        static void get_response(cache_entry*, http_response** res);
+
         int bodyless_requests_answer(MHD_Connection* connection,
             const char* url, const char* method,
             const char* version, struct details::modded_request* mr

src/webserver.cpp

@@ -284,26 +284,6 @@ struct cache_entry
     }
 };
 
-namespace details
-{
-
-void unlock_cache_entry(cache_entry* ce)
-{
-    ce->unlock();
-}
-
-void lock_cache_entry(cache_entry* ce)
-{
-    ce->lock();
-}
-
-void get_response(cache_entry* ce, http_response** res)
-{
-    *res = ce->response.ptr();
-}
-
-};
-
 using namespace http;
 
 int policy_callback (void *, const struct sockaddr*, socklen_t);
@@ -1888,4 +1868,19 @@ void webserver::clean_cache()
     pthread_rwlock_unlock(&cache_guard);
 }
 
+void webserver::unlock_cache_entry(cache_entry* ce)
+{
+    ce->unlock();
+}
+
+void webserver::lock_cache_entry(cache_entry* ce)
+{
+    ce->lock();
+}
+
+void webserver::get_response(cache_entry* ce, http_response** res)
+{
+    *res = ce->response.ptr();
+}
+
 };