Add m_hidechans: Adds usermode +I to hide an oper's channels from non-opers. Also...

[user/henk/code/inspircd.git] / include / dns.h

diff --git a/include/dns.h b/include/dns.h
index 93817e66f83deb5a4d4d0a93a99dd2e368361e4b..b011a9ddbd7762bb384cc6fe4ba5745bfd1fde79 100644 (file)
--- a/include/dns.h
+++ b/include/dns.h
@@ -37,8 +37,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <string>
 #include "inspircd_config.h"
-#include "socket.h"
 #include "base.h"
+#include "socketengine.h"
+#include "socket.h"
+
+using namespace std;
+using irc::sockets::insp_aton;
+using irc::sockets::insp_ntoa;
+using irc::sockets::insp_sockaddr;
+using irc::sockets::insp_inaddr;
+
+class InspIRCd;
 
 /**
  * Result status, used internally
@@ -59,7 +68,8 @@ enum ResolverError
        RESOLVER_NSDOWN         =       1,
        RESOLVER_NXDOMAIN       =       2,
        RESOLVER_NOTREADY       =       3,
-       RESOLVER_BADIP          =       4
+       RESOLVER_BADIP          =       4,
+       RESOLVER_TIMEOUT        =       5
 };
 
 /**
@@ -132,6 +142,10 @@ enum ForceProtocol
 class Resolver : public Extensible
 {
  protected:
+       /**
+        * Pointer to creator
+        */
+       InspIRCd* ServerInstance;
        /**
         * The input data, either a host or an IP address
         */
@@ -180,7 +194,7 @@ class Resolver : public Extensible
         * the network being down. This will also be thrown if an invalid IP address is
         * passed when resolving a 'PTR' record.
         */
-       Resolver(const std::string &source, QueryType qt);
+       Resolver(InspIRCd* Instance, const std::string &source, QueryType qt);
        /**
         * The default destructor does nothing.
         */
@@ -213,10 +227,12 @@ class Resolver : public Extensible
  * back to Resolver objects, based upon the request ID. You
  * should never use this class yourself.
  */
-class DNS : public Extensible
+class DNS : public EventHandler
 {
  private:
 
+       InspIRCd* ServerInstance;
+
        /**
         * The maximum value of a dns request id,
         * 16 bits wide, 0xFFFF.
@@ -233,20 +249,18 @@ class DNS : public Extensible
         */
        insp_inaddr myserver;
 
-       /**
-        * File descriptor being used to perform queries
-        */
-       static int MasterSocket;
-
        /**
         * A counter used to form part of the pseudo-random id
         */
        int currid;
 
        /**
-        * Currently active Resolver classes
+        * We have to turn off a few checks on received packets
+        * when people are using 4in6 (e.g. ::ffff:xxxx). This is
+        * a temporary kludge, Please let me know if you know how
+        * to fix it.
         */
-       Resolver* Classes[MAX_REQUEST_ID];
+       bool ip6munge;
 
        /**
         * Build a dns packet payload
@@ -254,6 +268,10 @@ class DNS : public Extensible
        int MakePayload(const char* name, const QueryType rr, const unsigned short rr_class, unsigned char* payload);
 
  public:
+       /**
+        * Currently active Resolver classes
+        */
+       Resolver* Classes[MAX_REQUEST_ID];
        /**
         * The port number DNS requests are made on,
         * and replies have as a source-port number.
@@ -272,11 +290,6 @@ class DNS : public Extensible
         * Empty out a header into a data stream ready for transmission "on the wire"
         */
        static void EmptyHeader(unsigned char *output, const DNSHeader *header, const int length);
-       /**
-        * Get the master socket fd, used internally
-        */
-       static int GetMasterSocket();
-
        /**
         * Start the lookup of an ipv4 from a hostname
         */
@@ -315,8 +328,9 @@ class DNS : public Extensible
 
        /**
         * Handle a SocketEngine read event
+        * Inherited from EventHandler
         */
-       void MarshallReads(int fd);
+       void HandleEvent(EventType et);
 
        /**
         * Add a Resolver* to the list of active classes
@@ -332,7 +346,7 @@ class DNS : public Extensible
         * The constructor initialises the dns socket,
         * and clears the request lists.
         */
-       DNS();
+       DNS(InspIRCd* Instance);
 
        /**
         * Destructor