X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fdns.h;h=76a69b6e453043b51b25331ae0acdd392e6b6f7e;hb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;hp=c08de1ece139b21d5000fc41c8b5b925ceb65724;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/dns.h b/include/dns.h
index c08de1ece..76a69b6e4 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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
 };
 
 /**
@@ -160,12 +159,6 @@ enum QueryType
 	DNS_QUERY_PTR6	= 0xFFFE
 };
 
-#ifdef IPV6
-const QueryType DNS_QUERY_FORWARD = DNS_QUERY_AAAA;
-#else
-const QueryType DNS_QUERY_FORWARD = DNS_QUERY_A;
-#endif
-const QueryType DNS_QUERY_REVERSE = DNS_QUERY_PTR;
 /**
  * Used internally to force PTR lookups to use a certain protocol scemantics,
  * e.g. x.x.x.x.in-addr.arpa for v4, and *.ip6.arpa for v6.
@@ -191,10 +184,6 @@ enum ForceProtocol
 class CoreExport Resolver : public Extensible
 {
  protected:
-	/**
-	 * Pointer to creator
-	 */
-	InspIRCd* ServerInstance;
 	/**
 	 * Pointer to creator module (if any, or NULL)
 	 */
@@ -238,21 +227,12 @@ class CoreExport Resolver : public Extensible
 	 * the object to go 'out of scope' and cause a segfault in the core if the result
 	 * arrives at a later time.
 	 * @param source The IP or hostname to resolve
-	 * @param qt The query type to perform. If you just want to perform a forward
-	 * or reverse lookup, and you don't care wether you get ipv4 or ipv6, then use
-	 * the constants DNS_QUERY_FORWARD and DNS_QUERY_REVERSE, which automatically
-	 * select from 'A' record or 'AAAA' record lookups. However, if you want to resolve
-	 * a specific record type, resolution of 'A', 'AAAA', 'PTR' and 'CNAME' records
+	 * @param qt The query type to perform. Resolution of 'A', 'AAAA', 'PTR' and 'CNAME' records
 	 * is supported. Use one of the QueryType enum values to initiate this type of
 	 * lookup. Resolution of 'AAAA' ipv6 records is always supported, regardless of
 	 * wether InspIRCd is built with ipv6 support.
-	 * If you attempt to resolve a 'PTR' record using DNS_QUERY_PTR, and InspIRCd is
-	 * built with ipv6 support, the 'PTR' record will be formatted to ipv6 specs,
-	 * e.g. x.x.x.x.x....ip6.arpa. otherwise it will be formatted to ipv4 specs,
-	 * e.g. x.x.x.x.in-addr.arpa. This translation is automatic.
-	 * To get around this automatic behaviour, you must use one of the values
-	 * DNS_QUERY_PTR4 or DNS_QUERY_PTR6 to force ipv4 or ipv6 behaviour on the lookup,
-	 * irrespective of what protocol InspIRCd has been built for.
+	 * To look up reverse records, specify one of DNS_QUERY_PTR4 or DNS_QUERY_PTR6 depending
+	 * on the type of address you are looking up.
 	 * @param cached The constructor will set this boolean to true or false depending
 	 * on whether the DNS lookup you are attempting is cached (and not expired) or not.
 	 * If the value is cached, upon return this will be set to true, otherwise it will
@@ -271,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.
@@ -285,10 +265,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
@@ -330,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.
@@ -346,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
 	 */
@@ -371,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
@@ -423,14 +374,6 @@ class CoreExport DNS : public EventHandler
 	 */
 	int GetIP(const char* name);
 
-	/**
-	 * Start the lookup of a hostname from an ip,
-	 * always using the protocol inspircd is built for,
-	 * e.g. use ipv6 reverse lookup when built for ipv6,
-	 * or ipv4 lookup when built for ipv4.
-	 */
-	int GetName(const irc::sockets::insp_inaddr* ip);
-
 	/**
 	 * Start lookup of a hostname from an ip, but
 	 * force a specific protocol to be used for the lookup
@@ -451,9 +394,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
@@ -475,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.