Fix double dot in half-cloaked resolved hosts

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

diff --git a/include/dns.h b/include/dns.h
index 3682bbe1db3a56486a77ad17e18f8b57e31d7d9d..76a69b6e453043b51b25331ae0acdd392e6b6f7e 100644 (file)
--- a/include/dns.h
+++ b/include/dns.h
@@ -184,10 +184,6 @@ enum ForceProtocol
 class CoreExport Resolver : public Extensible
 {
  protected:
-       /**
-        * Pointer to creator
-        */
-       InspIRCd* ServerInstance;
        /**
         * Pointer to creator module (if any, or NULL)
         */
@@ -255,7 +251,7 @@ class CoreExport Resolver : public Extensible
         * whilst lookups are in progress, they can be safely removed and your module will not
         * crash the server.
         */
-       Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, bool &cached, Module* creator = NULL);
+       Resolver(const std::string &source, QueryType qt, bool &cached, Module* creator = NULL);
 
        /**
         * The default destructor does nothing.
@@ -312,11 +308,6 @@ class CoreExport DNS : public EventHandler
 {
  private:
 
-       /**
-        * Creator/Owner object
-        */
-       InspIRCd* ServerInstance;
-
        /**
         * The maximum value of a dns request id,
         * 16 bits wide, 0xFFFF.
@@ -328,14 +319,6 @@ class CoreExport DNS : public EventHandler
         */
        int currid;
 
-       /**
-        * 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.
-        */
-       bool ip6munge;
-
        /**
         * Currently cached items
         */
@@ -353,21 +336,7 @@ class CoreExport DNS : public EventHandler
 
  public:
 
-       /**
-        * Server address being used currently
-        */
-       int socketfamily;
-
-#ifdef IPV6
-       /**
-        * IPV6 server address
-        */
-       in6_addr myserver6;
-#endif
-       /**
-        * IPV4 server address
-        */
-       in_addr myserver4;
+       irc::sockets::sockaddrs myserver;
 
        /**
         * Currently active Resolver classes
@@ -448,7 +417,7 @@ class CoreExport DNS : public EventHandler
         * The constructor initialises the dns socket,
         * and clears the request lists.
         */
-       DNS(InspIRCd* Instance);
+       DNS();
 
        /**
         * Re-initialize the DNS subsystem.