X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=50fdee34b03e91987de547178a62f92dcb846a6f;hb=71f7e47bcd7b72d7999daa9f061c8850b5a6521b;hp=c1f7758b0aa1f051c7d6ebf6a9d8290b00f0e922;hpb=ab6a7318e36bd8e0a259cd9eef3694a0f0e8684a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dns.cpp b/src/dns.cpp
index c1f7758b0..50fdee34b 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDasyncdns */
+/* $Core */
 
 /*
 dns.cpp - Nonblocking DNS functions.
@@ -40,11 +40,6 @@ looks like this, walks like this or tastes like this.
 #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
@@ -119,7 +114,7 @@ class CacheTimer : public Timer
 	CacheTimer(InspIRCd* 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();
 	}
@@ -131,11 +126,11 @@ class RequestTimeout : public Timer
 	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)
 	{
 	}
 
-	void Tick(time_t TIME)
+	void Tick(time_t)
 	{
 		if (ServerInstance->Res->requests[watchid] == watch)
 		{
@@ -147,19 +142,19 @@ class RequestTimeout : public Timer
 				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), ServerInstance(Instance)
+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 */
 }
 
@@ -213,11 +208,13 @@ inline void DNS::EmptyHeader(unsigned char *output, const DNSHeader *header, con
 /** 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;
 	this->type = qt;
-		
+
 	DNS::EmptyHeader(payload,header,length);
 
 #ifdef IPV6
@@ -242,6 +239,8 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp
 		if (ServerInstance->SE->SendTo(dnsobj, (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
 			return -1;
 	}
+
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Sent OK");
 	return 0;
 }
 
@@ -251,7 +250,7 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id, const char* original)
 	/* Is the DNS connection down? */
 	if (this->GetFd() == -1)
 		return NULL;
-	
+
 	/* Create an id */
 	id = this->PRNG() & DNS::MAX_REQUEST_ID;
 
@@ -328,9 +327,9 @@ void DNS::Rehash()
 
 	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;
 	}
 
@@ -351,7 +350,7 @@ void DNS::Rehash()
 #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());
 
@@ -362,6 +361,7 @@ void DNS::Rehash()
 		if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false))
 		{
 			/* Failed to bind */
+			ServerInstance->Logs->Log("RESOLVER",DEBUG,"Error binding dns socket");
 			ServerInstance->SE->Shutdown(this, 2);
 			ServerInstance->SE->Close(this);
 			this->SetFd(-1);
@@ -374,7 +374,7 @@ void DNS::Rehash()
 			{
 				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);
@@ -382,11 +382,16 @@ void DNS::Rehash()
 			}
 		}
 	}
+	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));
 
@@ -400,7 +405,7 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
 	/* DNS::Rehash() sets this to a valid ptr
 	 */
 	this->cache = NULL;
-	
+
 	/* Again, DNS::Rehash() sets this to a
 	 * valid value
 	 */
@@ -458,7 +463,7 @@ int DNS::GetIP(const char *name)
 	DNSHeader h;
 	int id;
 	int length;
-	
+
 	if ((length = this->MakePayload(name, DNS_QUERY_A, 1, (unsigned char*)&h.payload)) == -1)
 		return -1;
 
@@ -507,7 +512,7 @@ int DNS::GetCName(const char *alias)
 }
 
 /** 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;
@@ -530,7 +535,7 @@ int DNS::GetName(const insp_inaddr *ip)
 	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;
@@ -758,7 +763,6 @@ DNSResult DNS::GetResult(int resultnum)
 
 			default:
 			break;
-			
 		}
 
 		/* Build the reply with the id and hostname/ip in it */
@@ -781,6 +785,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
 	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");
@@ -841,7 +846,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
 		/* 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)
 		{
@@ -858,7 +863,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
 		break;
 	}
 	if ((unsigned int)curanswer == header.ancount)
-		return std::make_pair((unsigned char*)NULL,"No more records");
+		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");
@@ -923,7 +928,6 @@ DNS::~DNS()
 	ServerInstance->SE->Shutdown(this, 2);
 	ServerInstance->SE->Close(this);
 	ServerInstance->Timers->DelTimer(this->PruneTimer);
-	delete this->PruneTimer;
 }
 
 CachedQuery* DNS::GetCache(const std::string &source)
@@ -934,7 +938,7 @@ CachedQuery* DNS::GetCache(const std::string &source)
 	else
 		return NULL;
 }
-	        
+
 void DNS::DelCache(const std::string &source)
 {
 	cache->erase(source.c_str());
@@ -949,6 +953,7 @@ void Resolver::TriggerCachedResult()
 /** 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);
@@ -966,7 +971,7 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
 		}
 	}
 
-	insp_inaddr binip;
+	irc::sockets::insp_inaddr binip;
 
 	switch (querytype)
 	{
@@ -975,7 +980,7 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
 		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);
@@ -1017,10 +1022,14 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
 		/* 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 */
 }
@@ -1043,66 +1052,65 @@ Module* Resolver::GetCreator()
 }
 
 /** 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 */
 	int resultnum = 0;
 	DNSResult res(0,"",0,"");
 	res.id = 0;
-	ServerInstance->Log(DEBUG,"Handle DNS event");
-	while ((res.id & ERROR_MASK) == 0)
-	{
-		res = this->GetResult(resultnum);
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Handle DNS event");
+
+	res = this->GetResult(resultnum);
 
-		ServerInstance->Log(DEBUG,"Result %d id %d", resultnum, res.id);
-	
-		/* Is there a usable request id? */
-		if (res.id != -1)
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result %d id %d", resultnum, res.id);
+
+	/* Is there a usable request id? */
+	if (res.id != -1)
+	{
+		/* Its an error reply */
+		if (res.id & ERROR_MASK)
 		{
-			/* Its an error reply */
-			if (res.id & ERROR_MASK)
+			/* Mask off the error bit */
+			res.id -= ERROR_MASK;
+			/* Marshall the error to the correct class */
+			if (Classes[res.id])
 			{
-				/* Mask off the error bit */
-				res.id -= ERROR_MASK;
-				/* Marshall the error to the correct class */
-				if (Classes[res.id])
-				{
-					if (ServerInstance && ServerInstance->stats)
-						ServerInstance->stats->statsDnsBad++;
-					Classes[res.id]->OnError(RESOLVER_NXDOMAIN, res.result);
-					delete Classes[res.id];
-					Classes[res.id] = NULL;
-				}
-				break;
+				if (ServerInstance && ServerInstance->stats)
+					ServerInstance->stats->statsDnsBad++;
+				Classes[res.id]->OnError(RESOLVER_NXDOMAIN, res.result);
+				delete Classes[res.id];
+				Classes[res.id] = NULL;
 			}
-			else
+			return;
+		}
+		else
+		{
+			/* It is a non-error result, marshall the result to the correct class */
+			if (Classes[res.id])
 			{
-				/* It is a non-error result, marshall the result to the correct class */
-				if (Classes[res.id])
-				{
-					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, resultnum);
-					delete Classes[res.id];
-					Classes[res.id] = NULL;
-				}
+				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, resultnum);
+				delete Classes[res.id];
+				Classes[res.id] = NULL;
 			}
-	
-			if (ServerInstance && ServerInstance->stats)
-				ServerInstance->stats->statsDns++;
 		}
 
-		resultnum++;
+		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))
 	{
@@ -1140,7 +1148,7 @@ void DNS::CleanResolvers(Module* module)
 		{
 			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;
 			}
@@ -1155,9 +1163,8 @@ unsigned long DNS::PRNG()
 	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;
 }
-