X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fdns.h;h=b22a2032e5eedd32c797df2c928dae6b0462adc9;hb=cfac6a9562764dd1530ed39767630e26934c4685;hp=e9c5fe924269d2880ffa5b3a61220e02041603a3;hpb=403fe8fd978eca00f07aebd7c3d1771075563e14;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/dns.h b/include/dns.h index e9c5fe924..b22a2032e 100644 --- a/include/dns.h +++ b/include/dns.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -35,12 +35,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "socket.h" #include "hashcomp.h" -class Module; - /** * Result status, used internally */ -class CoreExport DNSResult : public classbase +class CoreExport DNSResult { public: /** Result ID @@ -72,7 +70,7 @@ typedef std::pair DNSInfo; /** Cached item stored in the query cache. */ -class CoreExport CachedQuery : public classbase +class CoreExport CachedQuery { public: /** The cached result data, an IP or hostname @@ -86,27 +84,20 @@ class CoreExport CachedQuery : public classbase * @param res The result data, an IP or hostname * @param ttl The time-to-live value of the query result */ - CachedQuery(const std::string &res, unsigned int ttl) : data(res) - { - expires = time(NULL) + ttl; - } + CachedQuery(const std::string &res, unsigned int ttl); /** Returns the number of seconds remaining before this * cache item has expired and should be removed. */ - int CalcTTLRemaining() - { - int n = (int)expires - (int)time(NULL); - return (n < 0 ? 0 : n); - } + int CalcTTLRemaining(); }; /** DNS cache information. Holds IPs mapped to hostnames, and hostnames mapped to IPs. */ -#ifndef WIN32 -typedef nspace::hash_map > dnscache; -#else +#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED) typedef nspace::hash_map > dnscache; +#else +typedef nspace::hash_map dnscache; #endif /** @@ -122,21 +113,6 @@ enum ResolverError RESOLVER_FORCEUNLOAD = 5 }; -/** - * A DNS request - */ -class DNSRequest; - -/** - * A DNS packet header - */ -class DNSHeader; - -/** - * A DNS Resource Record (rr) - */ -struct ResourceRecord; - /** * Query and resource record types */ @@ -159,12 +135,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. @@ -187,17 +157,13 @@ enum ForceProtocol * can occur by calling virtual methods, one is a success situation, and the other * an error situation. */ -class CoreExport Resolver : public Extensible +class CoreExport Resolver { protected: - /** - * Pointer to creator - */ - InspIRCd* ServerInstance; /** * Pointer to creator module (if any, or NULL) */ - Module* Creator; + ModuleRef Creator; /** * The input data, either a host or an IP address */ @@ -237,21 +203,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 @@ -270,7 +227,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); /** * The default destructor does nothing. @@ -284,10 +241,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 @@ -329,11 +284,6 @@ class CoreExport DNS : public EventHandler { private: - /** - * Creator/Owner object - */ - InspIRCd* ServerInstance; - /** * The maximum value of a dns request id, * 16 bits wide, 0xFFFF. @@ -345,14 +295,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 */ @@ -370,21 +312,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 @@ -422,14 +350,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 @@ -450,9 +370,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 @@ -474,7 +393,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. @@ -486,13 +405,6 @@ class CoreExport DNS : public EventHandler */ ~DNS(); - /** Portable random number generator, generates - * its random number from the ircd stats counters, - * effective user id, time of day and the rollover - * counter (currid) - */ - unsigned long PRNG(); - /** * Turn an in6_addr into a .ip6.arpa domain */