X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=28ceac68948f1bfd273f82db9b90936cba1cf78e;hb=21f9acdb6c5c35b26d926f75845135f16c3c54e9;hp=4cf6b1968cdd7c2bc3e4d6478c2861ed8b77f8b3;hpb=ac36ca514e1be51d3ca7ce73bb8653ca2f08f0ce;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dns.cpp b/src/dns.cpp index 4cf6b1968..28ceac689 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -11,6 +11,8 @@ * --------------------------------------------------- */ +/* $Core: libIRCDasyncdns */ + /* dns.cpp - Nonblocking DNS functions. Very very loosely based on the firedns library, @@ -21,18 +23,23 @@ Please do not assume that firedns works like this, looks like this, walks like this or tastes like this. */ +#ifndef WIN32 #include #include #include #include #include +#else +#include "inspircd_win32wrapper.h" +#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_sockaddr; using irc::sockets::insp_inaddr; using irc::sockets::insp_ntoa; using irc::sockets::insp_aton; @@ -95,39 +102,40 @@ 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(); - DNSInfo ResultIsReady(DNSHeader &h, int length); + DNSInfo ResultIsReady(DNSHeader &h, int length, int result_we_want); 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, time(NULL)), ServerInstance(SI), watch(watching), watchid(id) { } - void Tick(time_t TIME) + void Tick(time_t) { if (ServerInstance->Res->requests[watchid] == watch) { @@ -146,7 +154,7 @@ class RequestTimeout : public InspTimer }; /* 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 id, const std::string &original) : dnsobj(dns), ServerInstance(Instance) { res = new unsigned char[512]; *res = 0; @@ -218,31 +226,22 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp sockaddr_in6 addr; memset(&addr,0,sizeof(addr)); memcpy(&addr.sin6_addr,&dnsobj->myserver6,sizeof(addr.sin6_addr)); - addr.sin6_family = AF_FAMILY; + addr.sin6_family = AF_INET6; addr.sin6_port = htons(DNS::QUERY_PORT); - if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) == -1) + if (ServerInstance->SE->SendTo(dnsobj, payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12) return -1; } else +#endif { sockaddr_in addr; memset(&addr,0,sizeof(addr)); memcpy(&addr.sin_addr.s_addr,&dnsobj->myserver4,sizeof(addr.sin_addr)); - addr.sin_family = AF_FAMILY; + addr.sin_family = AF_INET; addr.sin_port = htons(DNS::QUERY_PORT); - if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) == -1) + 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_FAMILY; - addr.sin_port = htons(DNS::QUERY_PORT); - if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) == -1) - return -1; -#endif - return 0; } @@ -308,13 +307,14 @@ int DNS::PruneCache() void DNS::Rehash() { ip6munge = false; + int portpass = 0; if (this->GetFd() > -1) { 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 */ @@ -339,10 +339,13 @@ void DNS::Rehash() if (strchr(ServerInstance->Config->DNSServer,':')) { this->socketfamily = AF_INET6; - inet_pton(AF_INET6, &this->myserver6, ServerInstance->Config->DNSServer); + inet_pton(AF_INET6, ServerInstance->Config->DNSServer, &this->myserver6); } else + { inet_aton(ServerInstance->Config->DNSServer, &this->myserver4); + portpass = -1; + } #else inet_aton(ServerInstance->Config->DNSServer, &this->myserver4); #endif @@ -350,16 +353,17 @@ void DNS::Rehash() /* Initialize mastersocket */ int s = 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) { - /* Bind the port */ - if (!ServerInstance->BindSocket(this->GetFd(), 0, ServerInstance->Config->DNSServer, false)) + /* Bind the port - port 0 INADDR_ANY */ + if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false)) { /* Failed to bind */ - shutdown(this->GetFd(),2); - close(this->GetFd()); + ServerInstance->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); this->SetFd(-1); } @@ -371,8 +375,8 @@ 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->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); this->SetFd(-1); } } @@ -537,7 +541,6 @@ int DNS::GetName(const insp_inaddr *ip) /** Start lookup of an IP address to a hostname */ int DNS::GetNameForce(const char *ip, ForceProtocol fp) { - ServerInstance->Log(DEBUG,"GetNameForce: %s", ip); char query[128]; DNSHeader h; int id; @@ -548,7 +551,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp) in6_addr i; if (inet_pton(AF_INET6, ip, &i) > 0) { - ServerInstance->Log(DEBUG,"Resolve to ipv6"); DNS::MakeIP6Int(query, &i); } else @@ -561,7 +563,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp) in_addr i; if (inet_aton(ip, &i)) { - ServerInstance->Log(DEBUG,"Resolve to ipv4"); unsigned char* c = (unsigned char*)&i.s_addr; sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]); } @@ -604,23 +605,28 @@ void DNS::MakeIP6Int(char* query, const in6_addr *ip) } /** Return the next id which is ready, and the result attached to it */ -DNSResult DNS::GetResult() +DNSResult DNS::GetResult(int resultnum) { /* Fetch dns query response and decide where it belongs */ DNSHeader header; DNSRequest *req; unsigned char buffer[sizeof(DNSHeader)]; - sockaddr from; - socklen_t x = sizeof(from); - const char* ipaddr_from = ""; + sockaddr* from = new sockaddr[2]; +#ifdef IPV6 + 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(),buffer,sizeof(DNSHeader),0,&from,&x); + int length = ServerInstance->SE->RecvFrom(this, (char*)buffer, sizeof(DNSHeader), 0, from, &x); /* Did we get the whole header? */ if (length < 12) { /* Nope - something screwed up. */ + delete[] from; return DNSResult(-1,"",0,""); } @@ -634,12 +640,20 @@ DNSResult DNS::GetResult() * -- Thanks jilles for pointing this one out. */ #ifdef IPV6 - ipaddr_from = insp_ntoa(((sockaddr_in6*)&from)->sin6_addr); - port_from = ntohs(((sockaddr_in6*)&from)->sin6_port); -#else - ipaddr_from = insp_ntoa(((sockaddr_in*)&from)->sin_addr); - port_from = ntohs(((sockaddr_in*)&from)->sin_port); + 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); + } + else #endif + { + ipaddr_from = inet_ntoa(((sockaddr_in*)from)->sin_addr); + port_from = ntohs(((sockaddr_in*)from)->sin_port); + } + + delete[] from; /* We cant perform this security check if you're using 4in6. * Tough luck to you, choose one or't other! @@ -678,7 +692,7 @@ DNSResult DNS::GetResult() * When its finished it will return a DNSInfo which is a pair of * unsigned char* resource record data, and an error message. */ - DNSInfo data = req->ResultIsReady(header, length); + DNSInfo data = req->ResultIsReady(header, length, resultnum); std::string resultstr; /* Check if we got a result, if we didnt, its an error */ @@ -709,15 +723,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) { @@ -738,7 +744,7 @@ DNSResult DNS::GetResult() * as the last parameter on the line with a value ":1". */ if (*formatted == ':') - resultstr = "0" + resultstr; + resultstr.insert(0, "0"); } break; @@ -763,7 +769,7 @@ DNSResult DNS::GetResult() } /** A result is ready, process it */ -DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) +DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_want) { int i = 0; int q = 0; @@ -833,7 +839,9 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) return std::make_pair((unsigned char*)NULL,"Incorrectly sized DNS reply"); /* XXX: We actually initialise 'rr' here including its ttl field */ - DNS::FillResourceRecord(&rr,&header.payload[i]); + if (curanswer == result_we_want) + DNS::FillResourceRecord(&rr,&header.payload[i]); + i += 10; if (rr.type != this->type) { @@ -850,7 +858,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 more records"); if (i + rr.rdlength > (unsigned int)length) return std::make_pair((unsigned char*)NULL,"Resource record larger than stated"); @@ -906,14 +914,14 @@ 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; } @@ -935,7 +943,7 @@ void DNS::DelCache(const std::string &source) void Resolver::TriggerCachedResult() { if (CQ) - OnLookupComplete(CQ->data, time_left, true); + OnLookupComplete(CQ->data, time_left, true, 0); } /** High level abstraction of dns used by application at large */ @@ -1012,7 +1020,7 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, } /** Called when an error occurs */ -void Resolver::OnError(ResolverError e, const std::string &errormessage) +void Resolver::OnError(ResolverError, const std::string&) { /* Nothing in here */ } @@ -1035,50 +1043,63 @@ 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(); - /* Is there a usable request id? */ - if (res.id != -1) + int resultnum = 0; + DNSResult res(0,"",0,""); + res.id = 0; + ServerInstance->Log(DEBUG,"Handle DNS event"); + while ((res.id & ERROR_MASK) == 0) { - /* Its an error reply */ - if (res.id & ERROR_MASK) + res = this->GetResult(resultnum); + + ServerInstance->Log(DEBUG,"Result %d id %d", resultnum, res.id); + + /* Is there a usable request id? */ + if (res.id != -1) { - /* Mask off the error bit */ - res.id -= ERROR_MASK; - /* Marshall the error to the correct class */ - if (Classes[res.id]) + /* Its an error reply */ + if (res.id & ERROR_MASK) { - if (ServerInstance && ServerInstance->stats) - ServerInstance->stats->statsDnsBad++; - Classes[res.id]->OnError(RESOLVER_NXDOMAIN, res.result); - delete Classes[res.id]; - Classes[res.id] = NULL; + /* Mask off the error bit */ + res.id -= ERROR_MASK; + /* Marshall the error to the correct class */ + if (Classes[res.id]) + { + if (ServerInstance && ServerInstance->stats) + ServerInstance->stats->statsDnsBad++; + Classes[res.id]->OnError(RESOLVER_NXDOMAIN, res.result); + delete Classes[res.id]; + Classes[res.id] = NULL; + } + break; } - } - else - { - /* It is a non-error result, marshall the result to the correct class */ - if (Classes[res.id]) + else { - if (ServerInstance && ServerInstance->stats) - ServerInstance->stats->statsDnsGood++; - - if (!this->GetCache(res.original.c_str())) - this->cache->insert(std::make_pair(res.original.c_str(), CachedQuery(res.result, res.ttl))); - - Classes[res.id]->OnLookupComplete(res.result, res.ttl, false); - delete Classes[res.id]; - Classes[res.id] = NULL; + /* It is a non-error result, marshall the result to the correct class */ + if (Classes[res.id]) + { + if (ServerInstance && ServerInstance->stats) + ServerInstance->stats->statsDnsGood++; + + if (!this->GetCache(res.original.c_str())) + this->cache->insert(std::make_pair(res.original.c_str(), CachedQuery(res.result, res.ttl))); + + Classes[res.id]->OnLookupComplete(res.result, res.ttl, false, resultnum); + delete Classes[res.id]; + Classes[res.id] = NULL; + } } + + if (ServerInstance && ServerInstance->stats) + ServerInstance->stats->statsDns++; } - if (ServerInstance && ServerInstance->stats) - ServerInstance->stats->statsDns++; + resultnum++; } } - + /** Add a derived Resolver to the working set */ bool DNS::AddResolverClass(Resolver* r) { @@ -1136,7 +1157,7 @@ unsigned long DNS::PRNG() 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) - s->BoundPortCount; + val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->Config->ports.size(); return val; }