Remove more classbase

[user/henk/code/inspircd.git] / src / modules / httpd.h

diff --git a/src/modules/httpd.h b/src/modules/httpd.h
index 59e099f80992fada01da70897be77d3debdcdaa3..97148d413cab69ba2a51cf28a3fe748920cc5e18 100644 (file)
--- a/src/modules/httpd.h
+++ b/src/modules/httpd.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -27,7 +27,7 @@ class HTTPHeaders
  protected:
        std::map<std::string,std::string> headers;
  public:
-       
+
        /** Set the value of a header
         * Sets the value of the named header. If the header is already present, it will be replaced
         */
@@ -35,7 +35,7 @@ class HTTPHeaders
        {
                headers[name] = data;
        }
-       
+
        /** Set the value of a header, only if it doesn't exist already
         * Sets the value of the named header. If the header is already present, it will NOT be updated
         */
@@ -44,21 +44,21 @@ class HTTPHeaders
                if (!IsSet(name))
                        SetHeader(name, data);
        }
-       
+
        /** Remove the named header
         */
        void RemoveHeader(const std::string &name)
        {
                headers.erase(name);
        }
-       
+
        /** Remove all headers
         */
        void Clear()
        {
                headers.clear();
        }
-       
+
        /** Get the value of a header
         * @return The value of the header, or an empty string
         */
@@ -67,10 +67,10 @@ class HTTPHeaders
                std::map<std::string,std::string>::iterator it = headers.find(name);
                if (it == headers.end())
                        return std::string();
-               
+
                return it->second;
        }
-       
+
        /** Check if the given header is specified
         * @return true if the header is specified
         */
@@ -79,41 +79,42 @@ class HTTPHeaders
                std::map<std::string,std::string>::iterator it = headers.find(name);
                return (it != headers.end());
        }
-       
+
        /** Get all headers, formatted by the HTTP protocol
         * @return Returns all headers, formatted according to the HTTP protocol. There is no request terminator at the end
         */
        std::string GetFormattedHeaders()
        {
                std::string re;
-               
+
                for (std::map<std::string,std::string>::iterator i = headers.begin(); i != headers.end(); i++)
                        re += i->first + ": " + i->second + "\r\n";
-               
+
                return re;
        }
 };
 
+class HttpServerSocket;
+
 /** This class represents a HTTP request.
- * It will be sent to all modules as the data section of
- * an Event.
  */
-class HTTPRequest : public classbase
+class HTTPRequest : public Event
 {
  protected:
        std::string type;
        std::string document;
        std::string ipaddr;
        std::string postdata;
-       
+
  public:
 
        HTTPHeaders *headers;
-       
+       int errorcode;
+
        /** A socket pointer, which you must return in your HTTPDocument class
         * if you reply to this request.
         */
-       void* sock;
+       HttpServerSocket* sock;
 
        /** Initialize HTTPRequest.
         * This constructor is called by m_httpd.so to initialize the class.
@@ -124,8 +125,9 @@ class HTTPRequest : public classbase
         * @param ip The IP address making the web request.
         * @param pdata The post data (content after headers) received with the request, up to Content-Length in size
         */
-       HTTPRequest(const std::string &request_type, const std::string &uri, HTTPHeaders* hdr, void* opaque, const std::string &ip, const std::string &pdata)
-               : type(request_type), document(uri), ipaddr(ip), postdata(pdata), headers(hdr), sock(opaque)
+       HTTPRequest(Module* me, const std::string &eventid, const std::string &request_type, const std::string &uri,
+               HTTPHeaders* hdr, HttpServerSocket* socket, const std::string &ip, const std::string &pdata)
+               : Event(me, eventid), type(request_type), document(uri), ipaddr(ip), postdata(pdata), headers(hdr), sock(socket)
        {
        }
 
@@ -170,20 +172,13 @@ class HTTPRequest : public classbase
  * When you initialize this class you may initialize it with all components required to
  * form a valid HTTP response, including document data, headers, and a response code.
  */
-class HTTPDocument : public classbase
+class HTTPDocumentResponse : public Request
 {
- protected:
-
+ public:
        std::stringstream* document;
        int responsecode;
-
- public:
-
        HTTPHeaders headers;
-       
-       /** The socket pointer from an earlier HTTPRequest
-        */
-       void* sock;
+       HTTPRequest& src;
 
        /** Initialize a HTTPRequest ready for sending to m_httpd.so.
         * @param opaque The socket pointer you obtained from the HTTPRequest at an earlier time
@@ -192,32 +187,9 @@ class HTTPDocument : public classbase
         * based upon the response code.
         * @param extra Any extra headers to include with the defaults, seperated by carriage return and linefeed.
         */
-       HTTPDocument(void* opaque, std::stringstream* doc, int response) : document(doc), responsecode(response), sock(opaque)
-       {
-       }
-
-       /** Get the document text.
-        * @return The document text
-        */
-       std::stringstream* GetDocument()
-       {
-               return this->document;
-       }
-
-       /** Get the document size.
-        * @return the size of the document text in bytes
-        */
-       unsigned long GetDocumentSize()
-       {
-               return this->document->str().length();
-       }
-
-       /** Get the response code.
-        * @return The response code
-        */
-       int GetResponseCode()
+       HTTPDocumentResponse(Module* me, HTTPRequest& req, std::stringstream* doc, int response)
+               : Request(me, req.source, "HTTP-DOC"), document(doc), responsecode(response), src(req)
        {
-               return this->responsecode;
        }
 };