* ---------------------------------------------------
*/
-/* $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
/** Send requests we have previously built down the UDP socket */
int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryType qt)
{
- ServerInstance->Log(DEBUG,"DNSRequest::SendRequests");
+ ServerInstance->Logs->Log("RESOLVER", DEBUG,"DNSRequest::SendRequests");
unsigned char payload[sizeof(DNSHeader)];
return -1;
}
- ServerInstance->Log(DEBUG,"Sent OK");
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Sent OK");
return 0;
}
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;
}
#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());
if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false))
{
/* Failed to bind */
- ServerInstance->Log(DEBUG,"Error binding dns socket");
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Error binding dns socket");
ServerInstance->SE->Shutdown(this, 2);
ServerInstance->SE->Close(this);
this->SetFd(-1);
{
if (!ServerInstance->SE->AddFd(this))
{
- ServerInstance->Log(DEFAULT,"Internal error starting DNS - hostnames will NOT resolve.");
+ 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->Log(DEBUG,"Error creating dns socket");
+ 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->Log(DEBUG,"DNS::DNS");
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS::DNS");
/* Clear the Resolver class table */
memset(Classes,0,sizeof(Classes));
}
/** 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;
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");
ServerInstance->SE->Shutdown(this, 2);
ServerInstance->SE->Close(this);
ServerInstance->Timers->DelTimer(this->PruneTimer);
- delete this->PruneTimer;
}
CachedQuery* DNS::GetCache(const std::string &source)
/** 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->Log(DEBUG,"Resolver::Resolver");
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver::Resolver");
cached = false;
CQ = ServerInstance->Res->GetCache(source);
}
}
- 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);
}
else
{
- ServerInstance->Log(DEBUG,"DNS request id %d", this->myid);
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS request id %d", this->myid);
}
}
int resultnum = 0;
DNSResult res(0,"",0,"");
res.id = 0;
- ServerInstance->Log(DEBUG,"Handle DNS event");
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Handle DNS event");
res = this->GetResult(resultnum);
- ServerInstance->Log(DEBUG,"Result %d id %d", resultnum, res.id);
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result %d id %d", resultnum, res.id);
/* Is there a usable request id? */
if (res.id != -1)
/** Add a derived Resolver to the working set */
bool DNS::AddResolverClass(Resolver* r)
{
- ServerInstance->Log(DEBUG,"AddResolverClass %08lx", 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))
{
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;
}
+