* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
-/* $Core: libIRCDasyncdns */
+/* $Core */
/*
dns.cpp - Nonblocking DNS functions.
#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
DNSRequest* watch;
int watchid;
public:
- RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(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)
{
}
this->rr_class = 1;
this->type = qt;
-
+
DNS::EmptyHeader(payload,header,length);
#ifdef IPV6
/* Is the DNS connection down? */
if (this->GetFd() == -1)
return NULL;
-
+
/* Create an id */
id = this->PRNG() & DNS::MAX_REQUEST_ID;
#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());
/* DNS::Rehash() sets this to a valid ptr
*/
this->cache = NULL;
-
+
/* Again, DNS::Rehash() sets this to a
* valid value
*/
DNSHeader h;
int id;
int length;
-
+
if ((length = this->MakePayload(name, DNS_QUERY_A, 1, (unsigned char*)&h.payload)) == -1)
return -1;
}
/** Start lookup of an IP address to a hostname */
-int DNS::GetName(const insp_inaddr *ip)
+int DNS::GetName(const irc::sockets::insp_inaddr *ip)
{
char query[128];
DNSHeader h;
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));
+ DNSRequest* req = this->AddQuery(&h, id, irc::sockets::insp_ntoa(*ip));
if ((!req) || (req->SendRequests(&h, length, DNS_QUERY_PTR) == -1))
return -1;
default:
break;
-
}
/* Build the reply with the id and hostname/ip in it */
/* XXX: We actually initialise 'rr' here including its ttl field */
if (curanswer == result_we_want)
DNS::FillResourceRecord(&rr,&header.payload[i]);
-
+
i += 10;
if (rr.type != this->type)
{
else
return NULL;
}
-
+
void DNS::DelCache(const std::string &source)
{
cache->erase(source.c_str());
}
}
- insp_inaddr binip;
+ irc::sockets::insp_inaddr binip;
switch (querytype)
{
break;
case DNS_QUERY_PTR:
- if (insp_aton(source.c_str(), &binip) > 0)
+ if (irc::sockets::insp_aton(source.c_str(), &binip) > 0)
{
/* Valid ip address */
this->myid = ServerInstance->Res->GetName(&binip);
res = this->GetResult(resultnum);
ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result %d id %d", resultnum, res.id);
-
+
/* Is there a usable request id? */
if (res.id != -1)
{
{
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] = NULL;
}
}
-
+
if (ServerInstance && ServerInstance->stats)
ServerInstance->stats->statsDns++;
}
resultnum++;
}
-
+
/** Add a derived Resolver to the working set */
bool DNS::AddResolverClass(Resolver* r)
{
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 = (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();
return val;
}
-
-