X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=a28881ad2f4d00667ad5d722d9bc88a0e8f78cd1;hb=934d9a6a184b7a8600fcda30e012ba6f29f17b64;hp=f088055f87bf6b27079f1fd1ec282e34f8b24f46;hpb=a64a4665e0a2898ec08cf5996bdbf63c2567310e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dns.cpp b/src/dns.cpp index f088055f8..a28881ad2 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -34,7 +34,6 @@ looks like this, walks like this or tastes like this. #include "inspircd_se_config.h" #endif -#include "dns.h" #include "inspircd.h" #include "socketengine.h" #include "configreader.h" @@ -97,9 +96,8 @@ class DNSRequest DNS* dnsobj; /* DNS caller (where we get our FD from) */ unsigned long ttl; /* Time to live */ std::string orig; /* Original requested name/ip */ - InspIRCd* ServerInstance; - DNSRequest(InspIRCd* Instance, DNS* dns, int id, const std::string &original); + DNSRequest(DNS* dns, int id, const std::string &original); ~DNSRequest(); DNSInfo ResultIsReady(DNSHeader &h, int length); int SendRequests(const DNSHeader *header, const int length, QueryType qt); @@ -108,11 +106,10 @@ class DNSRequest class CacheTimer : public Timer { private: - InspIRCd* ServerInstance; DNS* dns; public: - CacheTimer(InspIRCd* Instance, DNS* thisdns) - : Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { } + CacheTimer(DNS* thisdns) + : Timer(3600, ServerInstance->Time(), true), dns(thisdns) { } virtual void Tick(time_t) { @@ -122,13 +119,17 @@ class CacheTimer : public Timer class RequestTimeout : public Timer { - InspIRCd* ServerInstance; DNSRequest* watch; int watchid; public: - RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, SI->Time()), ServerInstance(SI), watch(watching), watchid(id) + RequestTimeout(unsigned long n, DNSRequest* watching, int id) : Timer(n, ServerInstance->Time()), watch(watching), watchid(id) { } + ~RequestTimeout() + { + if (ServerInstance->Res) + Tick(0); + } void Tick(time_t) { @@ -143,19 +144,18 @@ class RequestTimeout : public Timer } ServerInstance->Res->requests[watchid] = NULL; delete watch; - return; } } }; /* Allocate the processing buffer */ -DNSRequest::DNSRequest(InspIRCd* Instance, DNS* dns, int rid, const std::string &original) : dnsobj(dns), ServerInstance(Instance) +DNSRequest::DNSRequest(DNS* dns, int rid, const std::string &original) : dnsobj(dns) { res = new unsigned char[512]; *res = 0; orig = original; - RequestTimeout* RT = new RequestTimeout(Instance->Config->dns_timeout ? Instance->Config->dns_timeout : 5, Instance, this, rid); - Instance->Timers->AddTimer(RT); /* The timer manager frees this */ + RequestTimeout* RT = new RequestTimeout(ServerInstance->Config->dns_timeout ? ServerInstance->Config->dns_timeout : 5, this, rid); + ServerInstance->Timers->AddTimer(RT); /* The timer manager frees this */ } /* Deallocate the processing buffer */ @@ -217,7 +217,6 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp DNS::EmptyHeader(payload,header,length); -#ifdef IPV6 if (this->dnsobj->socketfamily == AF_INET6) { sockaddr_in6 addr; @@ -229,7 +228,6 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp return -1; } else -#endif { sockaddr_in addr; memset(&addr,0,sizeof(addr)); @@ -258,7 +256,7 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id, const char* original) while (requests[id]) id = this->PRNG() & DNS::MAX_REQUEST_ID; - DNSRequest* req = new DNSRequest(ServerInstance, this, id, original); + DNSRequest* req = new DNSRequest(this, id, original); header->id[0] = req->id[0] = id >> 8; header->id[1] = req->id[1] = id & 0xFF; @@ -334,7 +332,6 @@ void DNS::Rehash() } this->socketfamily = AF_INET; -#ifdef IPV6 if (strchr(ServerInstance->Config->DNSServer,':')) { this->socketfamily = AF_INET6; @@ -345,9 +342,6 @@ void DNS::Rehash() inet_aton(ServerInstance->Config->DNSServer, &this->myserver4); portpass = -1; } -#else - inet_aton(ServerInstance->Config->DNSServer, &this->myserver4); -#endif /* Initialize mastersocket */ int s = irc::sockets::OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM); @@ -372,7 +366,7 @@ void DNS::Rehash() /* Hook the descriptor into the socket engine */ if (ServerInstance && ServerInstance->SE) { - if (!ServerInstance->SE->AddFd(this)) + if (!ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE)) { ServerInstance->Logs->Log("RESOLVER",DEFAULT,"Internal error starting DNS - hostnames will NOT resolve."); ServerInstance->SE->Shutdown(this, 2); @@ -389,7 +383,7 @@ void DNS::Rehash() } /** Initialise the DNS UDP socket so that we can send requests */ -DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance) +DNS::DNS() { ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS::DNS"); /* Clear the Resolver class table */ @@ -415,7 +409,7 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance) */ this->Rehash(); - this->PruneTimer = new CacheTimer(ServerInstance, this); + this->PruneTimer = new CacheTimer(this); ServerInstance->Timers->AddTimer(this->PruneTimer); } @@ -511,38 +505,6 @@ int DNS::GetCName(const char *alias) return id; } -/** Start lookup of an IP address to a hostname */ -int DNS::GetName(const irc::sockets::insp_inaddr *ip) -{ - char query[128]; - DNSHeader h; - int id; - int length; - -#ifdef IPV6 - unsigned char* c = (unsigned char*)&ip->s6_addr; - if (c[0] == 0 && c[1] == 0 && c[2] == 0 && c[3] == 0 && - c[4] == 0 && c[5] == 0 && c[6] == 0 && c[7] == 0 && - c[8] == 0 && c[9] == 0 && c[10] == 0xFF && c[11] == 0xFF) - sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[15],c[14],c[13],c[12]); - else - DNS::MakeIP6Int(query, (in6_addr*)ip); -#else - unsigned char* c = (unsigned char*)&ip->s_addr; - sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]); -#endif - - if ((length = this->MakePayload(query, DNS_QUERY_PTR, 1, (unsigned char*)&h.payload)) == -1) - return -1; - - DNSRequest* req = this->AddQuery(&h, id, irc::sockets::insp_ntoa(*ip)); - - if ((!req) || (req->SendRequests(&h, length, DNS_QUERY_PTR) == -1)) - return -1; - - return id; -} - /** Start lookup of an IP address to a hostname */ int DNS::GetNameForce(const char *ip, ForceProtocol fp) { @@ -634,7 +596,6 @@ DNSResult DNS::GetResult() * * -- Thanks jilles for pointing this one out. */ -#ifdef IPV6 char nbuf[MAXBUF]; if (this->socketfamily == AF_INET6) { @@ -642,7 +603,6 @@ DNSResult DNS::GetResult() port_from = ntohs(from.in6.sin6_port); } else -#endif { ipaddr_from = inet_ntoa(from.in4.sin_addr); port_from = ntohs(from.in4.sin_port); @@ -916,6 +876,8 @@ DNS::~DNS() ServerInstance->SE->Shutdown(this, 2); ServerInstance->SE->Close(this); ServerInstance->Timers->DelTimer(this->PruneTimer); + if (cache) + delete cache; } CachedQuery* DNS::GetCache(const std::string &source) @@ -939,7 +901,7 @@ void Resolver::TriggerCachedResult() } /** High level abstraction of dns used by application at large */ -Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, bool &cached, Module* creator) : ServerInstance(Instance), Creator(creator), input(source), querytype(qt) +Resolver::Resolver(const std::string &source, QueryType qt, bool &cached, Module* creator) : Creator(creator), input(source), querytype(qt) { ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver::Resolver"); cached = false; @@ -959,28 +921,12 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, } } - irc::sockets::insp_inaddr binip; - switch (querytype) { case DNS_QUERY_A: this->myid = ServerInstance->Res->GetIP(source.c_str()); break; - case DNS_QUERY_PTR: - if (irc::sockets::insp_aton(source.c_str(), &binip) > 0) - { - /* Valid ip address */ - this->myid = ServerInstance->Res->GetName(&binip); - } - else - { - this->OnError(RESOLVER_BADIP, "Bad IP address for reverse lookup"); - throw ModuleException("Resolver: Bad IP address"); - return; - } - break; - case DNS_QUERY_PTR4: querytype = DNS_QUERY_PTR; this->myid = ServerInstance->Res->GetNameForce(source.c_str(), PROTOCOL_IPV4);