Change IP address storage in User to use more IPv4/IPv6 common code

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

diff --git a/include/dns.h b/include/dns.h
index e93672f6755f6f77c873e830c52f13fb4b96ccf3..fa42952965afae652a4c33bd7b241885f165bc94 100644 (file)
--- a/include/dns.h
+++ b/include/dns.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.
@@ -103,10 +103,10 @@ class CoreExport CachedQuery : public classbase
 
 /** DNS cache information. Holds IPs mapped to hostnames, and hostnames mapped to IPs.
  */
-#ifndef WIN32
-typedef nspace::hash_map<irc::string, CachedQuery, nspace::hash<irc::string> > dnscache;
-#else
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
 typedef nspace::hash_map<irc::string, CachedQuery, nspace::hash_compare<irc::string> > dnscache;
+#else
+typedef nspace::hash_map<irc::string, CachedQuery, nspace::hash<irc::string> > dnscache;
 #endif
 
 /**
@@ -117,10 +117,9 @@ enum ResolverError
        RESOLVER_NOERROR        =       0,
        RESOLVER_NSDOWN         =       1,
        RESOLVER_NXDOMAIN       =       2,
-       RESOLVER_NOTREADY       =       3,
-       RESOLVER_BADIP          =       4,
-       RESOLVER_TIMEOUT        =       5,
-       RESLOVER_FORCEUNLOAD    =       6
+       RESOLVER_BADIP          =       3,
+       RESOLVER_TIMEOUT        =       4,
+       RESOLVER_FORCEUNLOAD    =       5
 };
 
 /**
@@ -285,10 +284,8 @@ class CoreExport Resolver : public Extensible
         * result, this is the number of seconds remaining before refresh/expiry.
         * @param cached True if the result is a cached result, false if it was requested
         * from the DNS server.
-        * @param resultnum Result number, for records with multiple matching results.
-        * Normally, you will only want to act on this when the result is 0.
         */
-       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0) = 0;
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) = 0;
 
        /**
         * If an error occurs (such as NXDOMAIN, no domain name found) then this method
@@ -451,9 +448,8 @@ class CoreExport DNS : public EventHandler
        /**
         * Fetch the result string (an ip or host)
         * and/or an error message to go with it.
-        * @param resultnum Result number to fetch
         */
-       DNSResult GetResult(int resultnum);
+       DNSResult GetResult();
 
        /**
         * Handle a SocketEngine read event