X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=94a01e64c9cedbf60bfa70c3dfaee096bf07adce;hb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;hp=fab9631b79baca213f072c1307730111b8397ea3;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dns.cpp b/src/dns.cpp index fab9631b7..94a01e64c 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. @@ -11,6 +11,8 @@ * --------------------------------------------------- */ +/* $Core */ + /* dns.cpp - Nonblocking DNS functions. Very very loosely based on the firedns library, @@ -32,17 +34,11 @@ 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" #include "socket.h" -using irc::sockets::insp_inaddr; -using irc::sockets::insp_ntoa; -using irc::sockets::insp_aton; -using irc::sockets::OpenTCPSocket; - /** Masks to mask off the responses we get from the DNSRequest methods */ enum QueryInfo @@ -100,6 +96,7 @@ 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(); @@ -107,32 +104,37 @@ class DNSRequest int SendRequests(const DNSHeader *header, const int length, QueryType qt); }; -class CacheTimer : public InspTimer +class CacheTimer : public Timer { private: InspIRCd* ServerInstance; DNS* dns; public: CacheTimer(InspIRCd* Instance, DNS* thisdns) - : InspTimer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { } + : Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { } - virtual void Tick(time_t TIME) + virtual void Tick(time_t) { dns->PruneCache(); } }; -class RequestTimeout : public InspTimer +class RequestTimeout : public Timer { InspIRCd* ServerInstance; DNSRequest* watch; int watchid; public: - RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : InspTimer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id) + RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, SI->Time()), ServerInstance(SI), watch(watching), watchid(id) { } + ~RequestTimeout() + { + if (ServerInstance->Res) + Tick(0); + } - void Tick(time_t TIME) + void Tick(time_t) { if (ServerInstance->Res->requests[watchid] == watch) { @@ -144,19 +146,18 @@ class RequestTimeout : public InspTimer ServerInstance->Res->Classes[watchid] = NULL; } ServerInstance->Res->requests[watchid] = NULL; - DELETE(watch); - return; + delete watch; } } }; /* Allocate the processing buffer */ -DNSRequest::DNSRequest(InspIRCd* Instance, DNS* dns, int id, const std::string &original) : dnsobj(dns) +DNSRequest::DNSRequest(InspIRCd* Instance, DNS* dns, int rid, const std::string &original) : dnsobj(dns), ServerInstance(Instance) { res = new unsigned char[512]; *res = 0; orig = original; - RequestTimeout* RT = new RequestTimeout(Instance->Config->dns_timeout ? Instance->Config->dns_timeout : 5, Instance, this, id); + 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 */ } @@ -210,14 +211,15 @@ inline void DNS::EmptyHeader(unsigned char *output, const DNSHeader *header, con /** Send requests we have previously built down the UDP socket */ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryType qt) { + ServerInstance->Logs->Log("RESOLVER", DEBUG,"DNSRequest::SendRequests"); + unsigned char payload[sizeof(DNSHeader)]; this->rr_class = 1; this->type = qt; - + DNS::EmptyHeader(payload,header,length); -#ifdef IPV6 if (this->dnsobj->socketfamily == AF_INET6) { sockaddr_in6 addr; @@ -225,7 +227,7 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp memcpy(&addr.sin6_addr,&dnsobj->myserver6,sizeof(addr.sin6_addr)); addr.sin6_family = AF_INET6; addr.sin6_port = htons(DNS::QUERY_PORT); - if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12) + if (ServerInstance->SE->SendTo(dnsobj, payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12) return -1; } else @@ -235,19 +237,11 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp memcpy(&addr.sin_addr.s_addr,&dnsobj->myserver4,sizeof(addr.sin_addr)); addr.sin_family = AF_INET; addr.sin_port = htons(DNS::QUERY_PORT); - if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12) + if (ServerInstance->SE->SendTo(dnsobj, (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12) return -1; } -#else - sockaddr_in addr; - memset(&addr,0,sizeof(addr)); - memcpy(&addr.sin_addr.s_addr, &dnsobj->myserver4, sizeof(addr.sin_addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(DNS::QUERY_PORT); - if (sendto(dnsobj->GetFd(), (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12) - return -1; -#endif + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Sent OK"); return 0; } @@ -257,7 +251,7 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id, const char* original) /* Is the DNS connection down? */ if (this->GetFd() == -1) return NULL; - + /* Create an id */ id = this->PRNG() & DNS::MAX_REQUEST_ID; @@ -319,8 +313,8 @@ void DNS::Rehash() { if (ServerInstance && ServerInstance->SE) ServerInstance->SE->DelFd(this); - shutdown(this->GetFd(), 2); - close(this->GetFd()); + ServerInstance->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); this->SetFd(-1); /* Rehash the cache */ @@ -334,14 +328,13 @@ void DNS::Rehash() if ((strstr(ServerInstance->Config->DNSServer,"::ffff:") == (char*)&ServerInstance->Config->DNSServer) || (strstr(ServerInstance->Config->DNSServer,"::FFFF:") == (char*)&ServerInstance->Config->DNSServer)) { - ServerInstance->Log(DEFAULT,"WARNING: Using IPv4 addresses over IPv6 forces some DNS checks to be disabled."); - ServerInstance->Log(DEFAULT," This should not cause a problem, however it is recommended you migrate"); - ServerInstance->Log(DEFAULT," to a true IPv6 environment."); + ServerInstance->Logs->Log("RESOLVER",DEFAULT,"WARNING: Using IPv4 addresses over IPv6 forces some DNS checks to be disabled."); + ServerInstance->Logs->Log("RESOLVER",DEFAULT," This should not cause a problem, however it is recommended you migrate"); + ServerInstance->Logs->Log("RESOLVER",DEFAULT," to a true IPv6 environment."); this->ip6munge = true; } this->socketfamily = AF_INET; -#ifdef IPV6 if (strchr(ServerInstance->Config->DNSServer,':')) { this->socketfamily = AF_INET6; @@ -352,13 +345,11 @@ 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 = OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM); + int s = irc::sockets::OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM); this->SetFd(s); + ServerInstance->SE->NonBlocking(this->GetFd()); /* Have we got a socket and is it nonblocking? */ if (this->GetFd() != -1) @@ -367,8 +358,9 @@ void DNS::Rehash() if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false)) { /* Failed to bind */ - shutdown(this->GetFd(),2); - close(this->GetFd()); + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Error binding dns socket"); + ServerInstance->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); this->SetFd(-1); } @@ -379,19 +371,24 @@ void DNS::Rehash() { if (!ServerInstance->SE->AddFd(this)) { - ServerInstance->Log(DEFAULT,"Internal error starting DNS - hostnames will NOT resolve."); - shutdown(this->GetFd(),2); - close(this->GetFd()); + ServerInstance->Logs->Log("RESOLVER",DEFAULT,"Internal error starting DNS - hostnames will NOT resolve."); + ServerInstance->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); this->SetFd(-1); } } } } + else + { + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Error creating dns socket"); + } } /** Initialise the DNS UDP socket so that we can send requests */ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance) { + ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS::DNS"); /* Clear the Resolver class table */ memset(Classes,0,sizeof(Classes)); @@ -405,7 +402,7 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance) /* DNS::Rehash() sets this to a valid ptr */ this->cache = NULL; - + /* Again, DNS::Rehash() sets this to a * valid value */ @@ -463,7 +460,7 @@ int DNS::GetIP(const char *name) DNSHeader h; int id; int length; - + if ((length = this->MakePayload(name, DNS_QUERY_A, 1, (unsigned char*)&h.payload)) == -1) return -1; @@ -511,38 +508,6 @@ int DNS::GetCName(const char *alias) return id; } -/** Start lookup of an IP address to a hostname */ -int DNS::GetName(const 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, 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) { @@ -550,7 +515,7 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp) DNSHeader h; int id; int length; -#ifdef SUPPORT_IP6LINKS + if (fp == PROTOCOL_IPV6) { in6_addr i; @@ -563,7 +528,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp) return -1; } else -#endif { in_addr i; if (inet_aton(ip, &i)) @@ -591,7 +555,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp) */ void DNS::MakeIP6Int(char* query, const in6_addr *ip) { -#ifdef SUPPORT_IP6LINKS const char* hex = "0123456789abcdef"; for (int index = 31; index >= 0; index--) /* for() loop steps twice per byte */ { @@ -604,9 +567,6 @@ void DNS::MakeIP6Int(char* query, const in6_addr *ip) *query++ = '.'; /* Seperator */ } strcpy(query,"ip6.arpa"); /* Suffix the string */ -#else - *query = 0; -#endif } /** Return the next id which is ready, and the result attached to it */ @@ -616,21 +576,17 @@ DNSResult DNS::GetResult() DNSHeader header; DNSRequest *req; unsigned char buffer[sizeof(DNSHeader)]; - sockaddr* from = new sockaddr[2]; -#ifdef IPV6 + irc::sockets::sockaddrs from; socklen_t x = this->socketfamily == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6); -#else - socklen_t x = sizeof(sockaddr_in); -#endif const char* ipaddr_from; unsigned short int port_from = 0; - int length = _recvfrom(this->GetFd(),(char*)buffer,sizeof(DNSHeader),0,from,&x); + + int length = ServerInstance->SE->RecvFrom(this, (char*)buffer, sizeof(DNSHeader), 0, &from.sa, &x); /* Did we get the whole header? */ if (length < 12) { /* Nope - something screwed up. */ - delete[] from; return DNSResult(-1,"",0,""); } @@ -643,22 +599,18 @@ DNSResult DNS::GetResult() * * -- Thanks jilles for pointing this one out. */ -#ifdef IPV6 char nbuf[MAXBUF]; if (this->socketfamily == AF_INET6) { - ipaddr_from = inet_ntop(AF_INET6, &((sockaddr_in6*)from)->sin6_addr, nbuf, sizeof(nbuf)); - port_from = ntohs(((sockaddr_in6*)from)->sin6_port); + ipaddr_from = inet_ntop(AF_INET6, &from.in6.sin6_addr, nbuf, sizeof(nbuf)); + port_from = ntohs(from.in6.sin6_port); } else -#endif { - ipaddr_from = inet_ntoa(((sockaddr_in*)from)->sin_addr); - port_from = ntohs(((sockaddr_in*)from)->sin_port); + ipaddr_from = inet_ntoa(from.in4.sin_addr); + port_from = ntohs(from.in4.sin_port); } - delete[] from; - /* We cant perform this security check if you're using 4in6. * Tough luck to you, choose one or't other! */ @@ -727,15 +679,7 @@ DNSResult DNS::GetResult() case DNS_QUERY_AAAA: { - snprintf(formatted,40,"%x:%x:%x:%x:%x:%x:%x:%x", - (ntohs(data.first[0]) + ntohs(data.first[1] << 8)), - (ntohs(data.first[2]) + ntohs(data.first[3] << 8)), - (ntohs(data.first[4]) + ntohs(data.first[5] << 8)), - (ntohs(data.first[6]) + ntohs(data.first[7] << 8)), - (ntohs(data.first[8]) + ntohs(data.first[9] << 8)), - (ntohs(data.first[10]) + ntohs(data.first[11] << 8)), - (ntohs(data.first[12]) + ntohs(data.first[13] << 8)), - (ntohs(data.first[14]) + ntohs(data.first[15] << 8))); + inet_ntop(AF_INET6, data.first, formatted, sizeof(formatted)); char* c = strstr(formatted,":0:"); if (c != NULL) { @@ -770,7 +714,6 @@ DNSResult DNS::GetResult() default: break; - } /* Build the reply with the id and hostname/ip in it */ @@ -793,6 +736,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) rr.type = DNS_QUERY_NONE; rr.rdlength = 0; rr.ttl = 1; /* GCC is a whiney bastard -- see the XXX below. */ + rr.rr_class = 0; /* Same for VC++ */ if (!(header.flags1 & FLAGS_MASK_QR)) return std::make_pair((unsigned char*)NULL,"Not a query result"); @@ -852,7 +796,9 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) /* XXX: We actually initialise 'rr' here including its ttl field */ DNS::FillResourceRecord(&rr,&header.payload[i]); + i += 10; + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver: rr.type is %d and this.type is %d rr.class %d this.class %d", rr.type, this->type, rr.rr_class, this->rr_class); if (rr.type != this->type) { curanswer++; @@ -868,7 +814,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) break; } if ((unsigned int)curanswer == header.ancount) - return std::make_pair((unsigned char*)NULL,"No valid answers"); + return std::make_pair((unsigned char*)NULL,"No A, AAAA or PTR type answers (" + ConvToStr(header.ancount) + " answers)"); if (i + rr.rdlength > (unsigned int)length) return std::make_pair((unsigned char*)NULL,"Resource record larger than stated"); @@ -924,16 +870,17 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) res[rr.rdlength] = 0; break; } - return std::make_pair(res,"No error");; + return std::make_pair(res,"No error"); } /** Close the master socket */ DNS::~DNS() { - shutdown(this->GetFd(), 2); - close(this->GetFd()); + ServerInstance->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); ServerInstance->Timers->DelTimer(this->PruneTimer); - delete this->PruneTimer; + if (cache) + delete cache; } CachedQuery* DNS::GetCache(const std::string &source) @@ -944,7 +891,7 @@ CachedQuery* DNS::GetCache(const std::string &source) else return NULL; } - + void DNS::DelCache(const std::string &source) { cache->erase(source.c_str()); @@ -959,6 +906,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) { + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver::Resolver"); cached = false; CQ = ServerInstance->Res->GetCache(source); @@ -976,28 +924,12 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, } } - insp_inaddr binip; - switch (querytype) { case DNS_QUERY_A: this->myid = ServerInstance->Res->GetIP(source.c_str()); break; - case DNS_QUERY_PTR: - if (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); @@ -1027,10 +959,14 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, /* We shouldnt get here really */ return; } + else + { + ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS request id %d", this->myid); + } } /** Called when an error occurs */ -void Resolver::OnError(ResolverError e, const std::string &errormessage) +void Resolver::OnError(ResolverError, const std::string&) { /* Nothing in here */ } @@ -1053,10 +989,17 @@ Module* Resolver::GetCreator() } /** Process a socket read event */ -void DNS::HandleEvent(EventType et, int errornum) +void DNS::HandleEvent(EventType, int) { /* Fetch the id and result of the next available packet */ - DNSResult res = this->GetResult(); + DNSResult res(0,"",0,""); + res.id = 0; + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Handle DNS event"); + + res = this->GetResult(); + + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result id %d", res.id); + /* Is there a usable request id? */ if (res.id != -1) { @@ -1074,6 +1017,7 @@ void DNS::HandleEvent(EventType et, int errornum) delete Classes[res.id]; Classes[res.id] = NULL; } + return; } else { @@ -1100,6 +1044,7 @@ void DNS::HandleEvent(EventType et, int errornum) /** Add a derived Resolver to the working set */ bool DNS::AddResolverClass(Resolver* r) { + ServerInstance->Logs->Log("RESOLVER",DEBUG,"AddResolverClass 0x%08lx", (unsigned long)r); /* Check the pointers validity and the id's validity */ if ((r) && (r->GetId() > -1)) { @@ -1137,7 +1082,7 @@ void DNS::CleanResolvers(Module* module) { if (Classes[i]->GetCreator() == module) { - Classes[i]->OnError(RESLOVER_FORCEUNLOAD, "Parent module is unloading"); + Classes[i]->OnError(RESOLVER_FORCEUNLOAD, "Parent module is unloading"); delete Classes[i]; Classes[i] = NULL; } @@ -1148,22 +1093,12 @@ void DNS::CleanResolvers(Module* module) /** Generate pseudo-random number */ unsigned long DNS::PRNG() { -#ifndef WIN32 unsigned long val = 0; timeval n; serverstats* s = ServerInstance->stats; gettimeofday(&n,NULL); - val = (n.tv_usec ^ getpid() ^ geteuid() ^ (this->currid++)) ^ s->statsAccept + n.tv_sec; - val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad; - val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->Config->ports.size(); + val = (n.tv_usec ^ (getpid() ^ geteuid()) ^ ((this->currid++)) ^ s->statsAccept) + n.tv_sec; + val = val + (s->statsCollisions ^ s->statsDnsGood) - s->statsDnsBad; + val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->ports.size(); return val; -#else - unsigned long val = 0; - serverstats* s = ServerInstance->stats; - val = (time(NULL) ^ GetCurrentProcessId() ^ GetCurrentThreadId() ^ (this->currid++)) ^ s->statsAccept + time(NULL); - val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad; - val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv); - return val; -#endif } -