X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=8526d5be22bc4735db1a51c1220b49f77700403b;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;hp=a28881ad2f4d00667ad5d722d9bc88a0e8f78cd1;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dns.cpp b/src/dns.cpp index a28881ad2..8526d5be2 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -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 @@ -31,7 +31,6 @@ looks like this, walks like this or tastes like this. #include #else #include "inspircd_win32wrapper.h" -#include "inspircd_se_config.h" #endif #include "inspircd.h" @@ -148,6 +147,17 @@ class RequestTimeout : public Timer } }; +CachedQuery::CachedQuery(const std::string &res, unsigned int ttl) : data(res) +{ + expires = ServerInstance->Time() + ttl; +} + +int CachedQuery::CalcTTLRemaining() +{ + int n = expires - ServerInstance->Time(); + return (n < 0 ? 0 : n); +} + /* Allocate the processing buffer */ DNSRequest::DNSRequest(DNS* dns, int rid, const std::string &original) : dnsobj(dns) { @@ -217,26 +227,8 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp DNS::EmptyHeader(payload,header,length); - if (this->dnsobj->socketfamily == AF_INET6) - { - sockaddr_in6 addr; - memset(&addr,0,sizeof(addr)); - memcpy(&addr.sin6_addr,&dnsobj->myserver6,sizeof(addr.sin6_addr)); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons(DNS::QUERY_PORT); - if (ServerInstance->SE->SendTo(dnsobj, 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 (ServerInstance->SE->SendTo(dnsobj, (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12) - return -1; - } + if (ServerInstance->SE->SendTo(dnsobj, payload, length + 12, 0, &(dnsobj->myserver.sa), sa_size(dnsobj->myserver)) != length+12) + return -1; ServerInstance->Logs->Log("RESOLVER",DEBUG,"Sent OK"); return 0; @@ -250,11 +242,9 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id, const char* original) return NULL; /* Create an id */ - id = this->PRNG() & DNS::MAX_REQUEST_ID; - - /* If this id is already 'in flight', pick another. */ - while (requests[id]) - id = this->PRNG() & DNS::MAX_REQUEST_ID; + do { + id = ServerInstance->GenRandomInt(DNS::MAX_REQUEST_ID); + } while (requests[id]); DNSRequest* req = new DNSRequest(this, id, original); @@ -303,7 +293,6 @@ int DNS::PruneCache() void DNS::Rehash() { - ip6munge = false; int portpass = 0; if (this->GetFd() > -1) @@ -323,34 +312,17 @@ void DNS::Rehash() this->cache = new dnscache(); } - if ((strstr(ServerInstance->Config->DNSServer,"::ffff:") == (char*)&ServerInstance->Config->DNSServer) || (strstr(ServerInstance->Config->DNSServer,"::FFFF:") == (char*)&ServerInstance->Config->DNSServer)) - { - 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; - if (strchr(ServerInstance->Config->DNSServer,':')) - { - this->socketfamily = AF_INET6; - inet_pton(AF_INET6, ServerInstance->Config->DNSServer, &this->myserver6); - } - else - { - inet_aton(ServerInstance->Config->DNSServer, &this->myserver4); - portpass = -1; - } + irc::sockets::aptosa(ServerInstance->Config->DNSServer, DNS::QUERY_PORT, myserver); /* Initialize mastersocket */ - int s = irc::sockets::OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM); + int s = socket(myserver.sa.sa_family, SOCK_DGRAM, 0); this->SetFd(s); - ServerInstance->SE->NonBlocking(this->GetFd()); /* Have we got a socket and is it nonblocking? */ if (this->GetFd() != -1) { + ServerInstance->SE->SetReuse(s); + ServerInstance->SE->NonBlocking(s); /* Bind the port - port 0 INADDR_ANY */ if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false)) { @@ -574,9 +546,8 @@ DNSResult DNS::GetResult() DNSRequest *req; unsigned char buffer[sizeof(DNSHeader)]; irc::sockets::sockaddrs from; - socklen_t x = this->socketfamily == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6); - const char* ipaddr_from; - unsigned short int port_from = 0; + memset(&from, 0, sizeof(from)); + socklen_t x = sizeof(from); int length = ServerInstance->SE->RecvFrom(this, (char*)buffer, sizeof(DNSHeader), 0, &from.sa, &x); @@ -592,31 +563,13 @@ DNSResult DNS::GetResult() * is not 53. * A user could in theory still spoof dns packets anyway * but this is less trivial than just sending garbage - * to the client, which is possible without this check. + * to the server, which is possible without this check. * * -- Thanks jilles for pointing this one out. */ - char nbuf[MAXBUF]; - if (this->socketfamily == AF_INET6) - { - ipaddr_from = inet_ntop(AF_INET6, &from.in6.sin6_addr, nbuf, sizeof(nbuf)); - port_from = ntohs(from.in6.sin6_port); - } - else - { - ipaddr_from = inet_ntoa(from.in4.sin_addr); - port_from = ntohs(from.in4.sin_port); - } - - /* We cant perform this security check if you're using 4in6. - * Tough luck to you, choose one or't other! - */ - if (!ip6munge) + if (memcmp(&from, &myserver, sizeof(irc::sockets::sockaddrs))) { - if ((port_from != DNS::QUERY_PORT) || (strcasecmp(ipaddr_from, ServerInstance->Config->DNSServer))) - { - return DNSResult(-1,"",0,""); - } + return DNSResult(-1,"",0,""); } /* Put the read header info into a header class */ @@ -1086,16 +1039,3 @@ void DNS::CleanResolvers(Module* module) } } } - -/** Generate pseudo-random number */ -unsigned long DNS::PRNG() -{ - 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->ports.size(); - return val; -}