* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
+/* $Core */
+
/*
dns.cpp - Nonblocking DNS functions.
Very very loosely based on the firedns library,
#include <arpa/inet.h>
#else
#include "inspircd_win32wrapper.h"
+#include "inspircd_se_config.h"
#endif
#include "dns.h"
#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
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)
{
ServerInstance->Res->Classes[watchid] = NULL;
}
ServerInstance->Res->requests[watchid] = NULL;
- DELETE(watch);
+ delete watch;
return;
}
}
};
/* 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 rid, const std::string &original) : dnsobj(dns), ServerInstance(Instance)
{
res = new unsigned char[512];
*res = 0;
orig = original;
- RequestTimeout* RT = new RequestTimeout(Instance->Config->dns_timeout ? Instance->Config->dns_timeout : 5, Instance, this, id);
+ RequestTimeout* RT = new RequestTimeout(Instance->Config->dns_timeout ? Instance->Config->dns_timeout : 5, Instance, this, rid);
Instance->Timers->AddTimer(RT); /* The timer manager frees this */
}
/** Send requests we have previously built down the UDP socket */
int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryType qt)
{
+ ServerInstance->Logs->Log("RESOLVER", DEBUG,"DNSRequest::SendRequests");
+
unsigned char payload[sizeof(DNSHeader)];
this->rr_class = 1;
memcpy(&addr.sin6_addr,&dnsobj->myserver6,sizeof(addr.sin6_addr));
addr.sin6_family = AF_INET6;
addr.sin6_port = htons(DNS::QUERY_PORT);
- if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
+ 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_INET;
addr.sin_port = htons(DNS::QUERY_PORT);
- if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
+ 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_INET;
- addr.sin_port = htons(DNS::QUERY_PORT);
- if (sendto(dnsobj->GetFd(), (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
- return -1;
-#endif
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Sent OK");
return 0;
}
{
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 */
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());
/* Have we got a socket and is it nonblocking? */
if (this->GetFd() != -1)
if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false))
{
/* Failed to bind */
- shutdown(this->GetFd(),2);
- close(this->GetFd());
+ 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.");
- shutdown(this->GetFd(),2);
- close(this->GetFd());
+ 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->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->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;
}
/** 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;
const char* ipaddr_from;
unsigned short int port_from = 0;
- int length = recvfrom(this->GetFd(),(char*)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)
* 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 */
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)
{
* as the last parameter on the line with a value ":1".
*/
if (*formatted == ':')
- resultstr = "0" + resultstr;
+ resultstr.insert(0, "0");
}
break;
}
/** 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;
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");
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)
{
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 answers (" + ConvToStr(header.ancount) + " answers, wanted #" + ConvToStr(result_we_want) + ")");
if (i + rr.rdlength > (unsigned int)length)
return std::make_pair((unsigned char*)NULL,"Resource record larger than stated");
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;
}
CachedQuery* DNS::GetCache(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 */
Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, bool &cached, Module* creator) : ServerInstance(Instance), Creator(creator), input(source), querytype(qt)
{
+ 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);
/* We shouldnt get here really */
return;
}
+ else
+ {
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS request id %d", this->myid);
+ }
}
/** Called when an error occurs */
-void Resolver::OnError(ResolverError e, const std::string &errormessage)
+void Resolver::OnError(ResolverError, const std::string&)
{
/* Nothing in here */
}
}
/** 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();
+ int resultnum = 0;
+ DNSResult res(0,"",0,"");
+ res.id = 0;
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Handle DNS event");
+
+ 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)
{
delete Classes[res.id];
Classes[res.id] = NULL;
}
+ return;
}
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);
+ 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++;
}
-}
+ resultnum++;
+}
+
/** Add a derived Resolver to the working set */
bool DNS::AddResolverClass(Resolver* 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))
{
/** Generate pseudo-random number */
unsigned long DNS::PRNG()
{
-#ifndef WIN32
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 = (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;
-#else
- unsigned long val = 0;
- serverstats* s = ServerInstance->stats;
- val = (time(NULL) ^ GetCurrentProcessId() ^ GetCurrentThreadId() ^ (this->currid++)) ^ s->statsAccept + time(NULL);
- val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad;
- val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv);
- return val;
-#endif
}
+