Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[user/henk/code/inspircd.git] / src / modules / m_httpd.cpp

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 3d47ed0427969e84364be7d6d3a0ddca145e2459..b1dc7b6101ee93cc964a5aa534459207b0b2e469 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -21,16 +21,17 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspsocket.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 #include "httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
 
 class ModuleHttp;
 
-static Server *Srv;
+
+
 static ModuleHttp* HttpModule;
-extern time_t TIME;
 static bool claimed;
 
 enum HttpState
@@ -48,13 +49,13 @@ class HttpSocket : public InspSocket
 
  public:
 
-       HttpSocket(std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(host, port, listening, maxtime), index(index_page)
+       HttpSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page)
        {
-               log(DEBUG,"HttpSocket constructor");
+               SI->Log(DEBUG,"HttpSocket constructor");
                InternalState = HTTP_LISTEN;
        }
 
-       HttpSocket(int newfd, char* ip, FileReader* ind) : InspSocket(newfd, ip), index(ind)
+       HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind)
        {
                InternalState = HTTP_SERVE_WAIT_REQUEST;
        }
@@ -63,8 +64,8 @@ class HttpSocket : public InspSocket
        {
                if (InternalState == HTTP_LISTEN)
                {
-                       HttpSocket* s = new HttpSocket(newsock, ip, index);
-                       Srv->AddSocket(s);
+                       HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
+                       s = s; /* Stop GCC whining */
                }
                return true;
        }
@@ -164,14 +165,22 @@ class HttpSocket : public InspSocket
                }
        }
 
-       void SendHeaders(unsigned long size, int response, std::string &extraheaders)
+       void SendHeaders(unsigned long size, int response, const std::string &extraheaders)
        {
-               struct tm *timeinfo = localtime(&TIME);
+               time_t local = this->Instance->Time();
+               struct tm *timeinfo = localtime(&local);
                this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: ");
                this->Write(asctime(timeinfo));
-               this->Write(extraheaders);
+               if (extraheaders.empty())
+               {
+                       this->Write("Content-Type: text/html\r\n");
+               }
+               else
+               {
+                       this->Write(extraheaders);
+               }
                this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+
-                               "\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n");
+                               "\r\nConnection: close\r\n\r\n");
        }
 
        virtual bool OnDataReady()
@@ -197,7 +206,7 @@ class HttpSocket : public InspSocket
 
                                if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
                                {
-                                       SendHeaders(0, 505);
+                                       SendHeaders(0, 505, "");
                                }
                                else
                                {
@@ -211,12 +220,12 @@ class HttpSocket : public InspSocket
                                                claimed = false;
                                                HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP());
                                                Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
-                                               e.Send();
+                                               e.Send(this->Instance);
 
                                                if (!claimed)
                                                {
                                                        SendHeaders(0, 404, "");
-                                                       log(DEBUG,"Page not claimed, 404");
+                                                       Instance->Log(DEBUG,"Page not claimed, 404");
                                                }
                                        }
                                }
@@ -236,7 +245,7 @@ class HttpSocket : public InspSocket
 
        void Page(std::stringstream* n, int response, std::string& extraheaders)
        {
-               log(DEBUG,"Sending page");
+               Instance->Log(DEBUG,"Sending page");
                SendHeaders(n->str().length(), response, extraheaders);
                this->Write(n->str());
        }
@@ -249,7 +258,7 @@ class ModuleHttp : public Module
        std::string bindip;
        std::string indexfile;
 
-       FileReader index;
+       FileReader* index;
 
        HttpSocket* http;
 
@@ -257,27 +266,28 @@ class ModuleHttp : public Module
 
        void ReadConfig()
        {
-               ConfigReader c;
+               ConfigReader c(ServerInstance);
                this->host = c.ReadValue("http", "host", 0);
                this->bindip = c.ReadValue("http", "ip", 0);
                this->port = c.ReadInteger("http", "port", 0, true);
                this->indexfile = c.ReadValue("http", "index", 0);
 
-               index.LoadFile(this->indexfile);
+               if (index)
+               {
+                       delete index;
+                       index = NULL;
+               }
+               index = new FileReader(ServerInstance, this->indexfile);
        }
 
        void CreateListener()
        {
-               http = new HttpSocket(this->bindip, this->port, true, 0, &index);
-               if ((http) && (http->GetState() == I_LISTENING))
-               {
-                       Srv->AddSocket(http);
-               }
+               http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, index);
        }
 
-       ModuleHttp(Server* Me) : Module::Module(Me)
+       ModuleHttp(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
+               index = NULL;
                ReadConfig();
                CreateListener();
        }
@@ -288,7 +298,7 @@ class ModuleHttp : public Module
 
        char* OnRequest(Request* request)
        {
-               log(DEBUG,"Got HTTPDocument object");
+               ServerInstance->Log(DEBUG,"Got HTTPDocument object");
                claimed = true;
                HTTPDocument* doc = (HTTPDocument*)request->GetData();
                HttpSocket* sock = (HttpSocket*)doc->sock;
@@ -303,12 +313,12 @@ class ModuleHttp : public Module
 
        virtual ~ModuleHttp()
        {
-               Srv->DelSocket(http);
+               ServerInstance->SE->DelFd(http);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER);
        }
 };
 
@@ -324,7 +334,7 @@ class ModuleHttpFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                HttpModule = new ModuleHttp(Me);
                return HttpModule;