X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=fb9ea954c68d8ce5cf912daadc7ac19eb792f581;hb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;hp=81f280cd38ab1c5217e8dffdb25a02bd8778d45a;hpb=9a98d0858bd71afa6c6cfb14fcbc030f7951fd12;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 81f280cd3..fb9ea954c 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -22,12 +22,15 @@ using namespace std; #include "modules.h" #include "inspsocket.h" #include "helperfuncs.h" +#include "inspircd.h" #include "httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ class ModuleHttp; +extern InspIRCd* ServerInstance; + static Server *Srv; static ModuleHttp* HttpModule; extern time_t TIME; @@ -48,13 +51,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"); 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,7 +66,7 @@ class HttpSocket : public InspSocket { if (InternalState == HTTP_LISTEN) { - HttpSocket* s = new HttpSocket(newsock, ip, index); + HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index); Srv->AddSocket(s); } return true; @@ -275,7 +278,7 @@ class ModuleHttp : public Module void CreateListener() { - http = new HttpSocket(this->bindip, this->port, true, 0, &index); + http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, &index); if ((http) && (http->GetState() == I_LISTENING)) { Srv->AddSocket(http);