* | 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
#include <arpa/inet.h>
#else
#include "inspircd_win32wrapper.h"
-#include "inspircd_se_config.h"
#endif
-#include "dns.h"
#include "inspircd.h"
#include "socketengine.h"
#include "configreader.h"
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(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);
};
class CacheTimer : public Timer
{
private:
- InspIRCd* ServerInstance;
DNS* dns;
public:
- CacheTimer(InspIRCd* Instance, DNS* thisdns)
- : Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { }
+ CacheTimer(DNS* thisdns)
+ : Timer(3600, ServerInstance->Time(), true), dns(thisdns) { }
virtual void Tick(time_t)
{
class RequestTimeout : public Timer
{
- InspIRCd* ServerInstance;
DNSRequest* watch;
int watchid;
public:
- RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, SI->Time()), ServerInstance(SI), watch(watching), watchid(id)
+ RequestTimeout(unsigned long n, DNSRequest* watching, int id) : Timer(n, ServerInstance->Time()), watch(watching), watchid(id)
{
}
+ ~RequestTimeout()
+ {
+ if (ServerInstance->Res)
+ Tick(0);
+ }
void Tick(time_t)
{
}
ServerInstance->Res->requests[watchid] = NULL;
delete watch;
- return;
}
}
};
+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(InspIRCd* Instance, DNS* dns, int rid, const std::string &original) : dnsobj(dns), ServerInstance(Instance)
+DNSRequest::DNSRequest(DNS* dns, int rid, const std::string &original) : dnsobj(dns)
{
res = new unsigned char[512];
*res = 0;
orig = original;
- 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 */
+ RequestTimeout* RT = new RequestTimeout(ServerInstance->Config->dns_timeout ? ServerInstance->Config->dns_timeout : 5, this, rid);
+ ServerInstance->Timers->AddTimer(RT); /* The timer manager frees this */
}
/* Deallocate the processing buffer */
DNS::EmptyHeader(payload,header,length);
-#ifdef IPV6
- 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
-#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 (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;
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(ServerInstance, this, id, original);
+ DNSRequest* req = new DNSRequest(this, id, original);
header->id[0] = req->id[0] = id >> 8;
header->id[1] = req->id[1] = id & 0xFF;
void DNS::Rehash()
{
- ip6munge = false;
int portpass = 0;
if (this->GetFd() > -1)
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;
-#ifdef IPV6
- 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;
- }
-#else
- inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
-#endif
+ 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))
{
/* Hook the descriptor into the socket engine */
if (ServerInstance && ServerInstance->SE)
{
- if (!ServerInstance->SE->AddFd(this))
+ if (!ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE))
{
ServerInstance->Logs->Log("RESOLVER",DEFAULT,"Internal error starting DNS - hostnames will NOT resolve.");
ServerInstance->SE->Shutdown(this, 2);
}
/** Initialise the DNS UDP socket so that we can send requests */
-DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
+DNS::DNS()
{
ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS::DNS");
/* Clear the Resolver class table */
*/
this->Rehash();
- this->PruneTimer = new CacheTimer(ServerInstance, this);
+ this->PruneTimer = new CacheTimer(this);
ServerInstance->Timers->AddTimer(this->PruneTimer);
}
return id;
}
-/** Start lookup of an IP address to a hostname */
-int DNS::GetName(const irc::sockets::insp_inaddr *ip)
-{
- char query[128];
- DNSHeader h;
- int id;
- int length;
-
-#ifdef IPV6
- unsigned char* c = (unsigned char*)&ip->s6_addr;
- if (c[0] == 0 && c[1] == 0 && c[2] == 0 && c[3] == 0 &&
- c[4] == 0 && c[5] == 0 && c[6] == 0 && c[7] == 0 &&
- c[8] == 0 && c[9] == 0 && c[10] == 0xFF && c[11] == 0xFF)
- sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[15],c[14],c[13],c[12]);
- else
- DNS::MakeIP6Int(query, (in6_addr*)ip);
-#else
- unsigned char* c = (unsigned char*)&ip->s_addr;
- sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]);
-#endif
-
- if ((length = this->MakePayload(query, DNS_QUERY_PTR, 1, (unsigned char*)&h.payload)) == -1)
- return -1;
-
- DNSRequest* req = this->AddQuery(&h, id, irc::sockets::insp_ntoa(*ip));
-
- if ((!req) || (req->SendRequests(&h, length, DNS_QUERY_PTR) == -1))
- return -1;
-
- return id;
-}
-
/** Start lookup of an IP address to a hostname */
int DNS::GetNameForce(const char *ip, ForceProtocol fp)
{
DNSHeader h;
int id;
int length;
-#ifdef SUPPORT_IP6LINKS
+
if (fp == PROTOCOL_IPV6)
{
in6_addr i;
return -1;
}
else
-#endif
{
in_addr i;
if (inet_aton(ip, &i))
*/
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 */
{
*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
- 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;
+ irc::sockets::sockaddrs from;
+ memset(&from, 0, sizeof(from));
+ socklen_t x = sizeof(from);
- 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,"");
}
* 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.
*/
-#ifdef IPV6
- 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);
- }
- else
-#endif
- {
- ipaddr_from = inet_ntoa(((sockaddr_in*)from)->sin_addr);
- port_from = ntohs(((sockaddr_in*)from)->sin_port);
- }
-
- delete[] from;
-
- /* 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 */
* 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 */
}
/** 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;
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++;
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");
ServerInstance->SE->Shutdown(this, 2);
ServerInstance->SE->Close(this);
ServerInstance->Timers->DelTimer(this->PruneTimer);
+ if (cache)
+ delete cache;
}
CachedQuery* DNS::GetCache(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 */
-Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt, bool &cached, Module* creator) : ServerInstance(Instance), Creator(creator), input(source), querytype(qt)
+Resolver::Resolver(const std::string &source, QueryType qt, bool &cached, Module* creator) : Creator(creator), input(source), querytype(qt)
{
ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver::Resolver");
cached = false;
}
}
- irc::sockets::insp_inaddr binip;
-
switch (querytype)
{
case DNS_QUERY_A:
this->myid = ServerInstance->Res->GetIP(source.c_str());
break;
- case DNS_QUERY_PTR:
- if (irc::sockets::insp_aton(source.c_str(), &binip) > 0)
- {
- /* Valid ip address */
- this->myid = ServerInstance->Res->GetName(&binip);
- }
- else
- {
- this->OnError(RESOLVER_BADIP, "Bad IP address for reverse lookup");
- throw ModuleException("Resolver: Bad IP address");
- return;
- }
- break;
-
case DNS_QUERY_PTR4:
querytype = DNS_QUERY_PTR;
this->myid = ServerInstance->Res->GetNameForce(source.c_str(), PROTOCOL_IPV4);
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 %d id %d", resultnum, res.id);
+ ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result id %d", res.id);
/* Is there a usable request id? */
if (res.id != -1)
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 */
{
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;
}
}
}
}
-
-/** 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->Config->ports.size();
- return val;
-}
projects / user / henk / code / inspircd.git / blobdiff