X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=f088055f87bf6b27079f1fd1ec282e34f8b24f46;hb=7a672d42e4173e274ac0ee31331d41e45801facc;hp=85d620982630435ca0e604a5993a8b81e1ce998f;hpb=164998f1e6e2cb885fb4d630ded29ed5191218c8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dns.cpp b/src/dns.cpp index 85d620982..f088055f8 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 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. @@ -101,7 +101,7 @@ class DNSRequest DNSRequest(InspIRCd* Instance, DNS* dns, int id, const std::string &original); ~DNSRequest(); - DNSInfo ResultIsReady(DNSHeader &h, int length, int result_we_want); + DNSInfo ResultIsReady(DNSHeader &h, int length); int SendRequests(const DNSHeader *header, const int length, QueryType qt); }; @@ -214,7 +214,7 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp this->rr_class = 1; this->type = qt; - + DNS::EmptyHeader(payload,header,length); #ifdef IPV6 @@ -250,7 +250,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; @@ -405,7 +405,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 +463,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; @@ -550,7 +550,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 +563,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp) return -1; } else -#endif { in_addr i; if (inet_aton(ip, &i)) @@ -591,7 +590,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,34 +602,26 @@ 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 */ -DNSResult DNS::GetResult(int resultnum) +DNSResult DNS::GetResult() { /* Fetch dns query response and decide where it belongs */ 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 = ServerInstance->SE->RecvFrom(this, (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,""); } @@ -648,18 +638,16 @@ DNSResult DNS::GetResult(int resultnum) 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! */ @@ -697,7 +685,7 @@ DNSResult DNS::GetResult(int resultnum) * 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, resultnum); + DNSInfo data = req->ResultIsReady(header, length); std::string resultstr; /* Check if we got a result, if we didnt, its an error */ @@ -763,7 +751,6 @@ DNSResult DNS::GetResult(int resultnum) default: break; - } /* Build the reply with the id and hostname/ip in it */ @@ -774,7 +761,7 @@ DNSResult DNS::GetResult(int resultnum) } /** A result is ready, process it */ -DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_want) +DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length) { int i = 0; int q = 0; @@ -845,10 +832,10 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w return std::make_pair((unsigned char*)NULL,"Incorrectly sized DNS reply"); /* XXX: We actually initialise 'rr' here including its ttl field */ - if (curanswer == result_we_want) - DNS::FillResourceRecord(&rr,&header.payload[i]); - + 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++; @@ -864,7 +851,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w break; } if ((unsigned int)curanswer == header.ancount) - return std::make_pair((unsigned char*)NULL,"No more answers (" + ConvToStr(header.ancount) + " answers, wanted #" + ConvToStr(result_we_want) + ")"); + 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"); @@ -939,7 +926,7 @@ CachedQuery* DNS::GetCache(const std::string &source) else return NULL; } - + void DNS::DelCache(const std::string &source) { cache->erase(source.c_str()); @@ -948,7 +935,7 @@ void DNS::DelCache(const std::string &source) void Resolver::TriggerCachedResult() { if (CQ) - OnLookupComplete(CQ->data, time_left, true, 0); + OnLookupComplete(CQ->data, time_left, true); } /** High level abstraction of dns used by application at large */ @@ -1056,15 +1043,14 @@ Module* Resolver::GetCreator() void DNS::HandleEvent(EventType, int) { /* Fetch the id and result of the next available packet */ - int resultnum = 0; DNSResult res(0,"",0,""); res.id = 0; ServerInstance->Logs->Log("RESOLVER",DEBUG,"Handle DNS event"); - res = this->GetResult(resultnum); + res = this->GetResult(); + + ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result id %d", res.id); - ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result %d id %d", resultnum, res.id); - /* Is there a usable request id? */ if (res.id != -1) { @@ -1091,23 +1077,21 @@ void DNS::HandleEvent(EventType, int) { 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); + Classes[res.id]->OnLookupComplete(res.result, res.ttl, false); delete Classes[res.id]; Classes[res.id] = NULL; } } - + if (ServerInstance && ServerInstance->stats) ServerInstance->stats->statsDns++; } - - resultnum++; } - + /** Add a derived Resolver to the working set */ bool DNS::AddResolverClass(Resolver* r) { @@ -1149,7 +1133,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; } @@ -1166,8 +1150,6 @@ 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) - ServerInstance->Config->ports.size(); + val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->ports.size(); return val; } - -