*/
enum HttpState
{
- HTTP_LISTEN = 0,
- HTTP_SERVE_WAIT_REQUEST = 1, /* Waiting for a full request */
- HTTP_SERVE_RECV_POSTDATA = 2, /* Waiting to finish recieving POST data */
- HTTP_SERVE_SEND_DATA = 3 /* Sending response */
+ HTTP_SERVE_WAIT_REQUEST = 0, /* Waiting for a full request */
+ HTTP_SERVE_RECV_POSTDATA = 1, /* Waiting to finish recieving POST data */
+ HTTP_SERVE_SEND_DATA = 2 /* Sending response */
};
/** A socket used for HTTP transport
public:
- HttpServerSocket(InspIRCd* SI, std::string shost, int iport, bool listening, unsigned long maxtime, FileReader* index_page) : BufferedSocket(SI, shost, iport, listening, maxtime), index(index_page), postsize(0)
- {
- InternalState = HTTP_LISTEN;
- }
-
HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0)
{
InternalState = HTTP_SERVE_WAIT_REQUEST;
{
}
- virtual int OnIncomingConnection(int newsock, char* ip)
- {
- if (InternalState == HTTP_LISTEN)
- {
- new HttpServerSocket(this->Instance, newsock, ip, index);
- }
- return true;
- }
-
virtual void OnClose()
{
}
SendHeaders(data.length(), response, empty);
this->Write(data);
- this->FlushWriteBuffer();
}
void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
if (request_type.empty() || uri.empty() || http_version.empty())
{
SendHTTPError(400);
- SetWrite();
return;
}
if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
{
SendHTTPError(400);
- SetWrite();
return;
}
if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
{
SendHTTPError(505);
- SetWrite();
return;
}
HTTPHeaders empty;
SendHeaders(index->ContentSize(), 200, empty);
this->Write(index->Contents());
- this->FlushWriteBuffer();
- SetWrite();
}
else
{
if (!claimed)
{
SendHTTPError(404);
- SetWrite();
}
}
}
}
-
- bool OnWriteReady()
- {
- Instance->Logs->Log("m_httpd",DEBUG,"OnWriteReady()");
- return false;
- }
-
void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
{
SendHeaders(n->str().length(), response, *hheaders);
this->Write(n->str());
- this->FlushWriteBuffer();
- SetWrite();
+ }
+};
+
+/** Spawn HTTP sockets from a listener
+ */
+class HttpListener : public ListenSocketBase
+{
+ FileReader* index;
+
+ public:
+ HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr)
+ {
+ this->index = idx;
}
- void SetWrite()
+ virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
{
- Instance->Logs->Log("m_httpd",DEBUG,"SetWrite()");
- this->WaitingForWriteEvent = true;
- Instance->SE->WantWrite(this);
+ new HttpServerSocket(ServerInstance, nfd, (char *)incomingip.c_str(), index); // ugly cast courtesy of bufferedsocket
}
};
class ModuleHttpServer : public Module
{
- std::vector<HttpServerSocket*> httpsocks;
+ std::vector<HttpServerSocket *> httpsocks;
+ std::vector<HttpListener *> httplisteners;
public:
void ReadConfig()
std::string bindip;
std::string indexfile;
FileReader* index;
- HttpServerSocket* http;
+ HttpListener *http;
ConfigReader c(ServerInstance);
- httpsocks.clear();
+ httpsocks.clear(); // XXX this will BREAK if this module is made rehashable
+ httplisteners.clear();
for (int i = 0; i < c.Enumerate("http"); i++)
{
index = new FileReader(ServerInstance, indexfile);
if (!index->Exists())
throw ModuleException("Can't read index file: "+indexfile);
- http = new HttpServerSocket(ServerInstance, bindip, port, true, 0, index);
- httpsocks.push_back(http);
+ http = new HttpListener(ServerInstance, index, port, (char *)bindip.c_str()); // XXX this cast SUCKS.
+ httplisteners.push_back(http);
}
}
virtual ~ModuleHttpServer()
{
+ for (size_t i = 0; i < httplisteners.size(); i++)
+ {
+ delete httplisteners[i];
+ }
+
for (size_t i = 0; i < httpsocks.size(); i++)
{
ServerInstance->SE->DelFd(httpsocks[i]);