X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=75108d577893298baf1b94400342d43be59b1c2b;hb=6eeecaada5818d8dc1f3bb98c3e0916d195e3592;hp=0d822a17da46988007f0159e8192a6999835bad4;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dns.cpp b/src/dns.cpp
index 0d822a17d..75108d577 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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
@@ -106,7 +101,7 @@ class DNSRequest
 
 	DNSRequest(InspIRCd* Instance, 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);
 };
 
@@ -131,7 +126,7 @@ 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)
 	{
 	}
 
@@ -213,13 +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->Log(DEBUG,"DNSRequest::SendRequests");
+	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
@@ -245,7 +240,7 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp
 			return -1;
 	}
 
-	ServerInstance->Log(DEBUG,"Sent OK");
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Sent OK");
 	return 0;
 }
 
@@ -255,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;
 
@@ -332,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;
 	}
 
@@ -355,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());
 
@@ -366,7 +361,7 @@ void DNS::Rehash()
 		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);
@@ -379,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);
@@ -389,14 +384,14 @@ void DNS::Rehash()
 	}
 	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));
 
@@ -410,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
 	 */
@@ -468,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;
 
@@ -517,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;
@@ -540,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;
@@ -615,7 +610,7 @@ void DNS::MakeIP6Int(char* query, const in6_addr *ip)
 }
 
 /** 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;
@@ -702,7 +697,7 @@ DNSResult DNS::GetResult(int resultnum)
 	 * 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 */
@@ -768,7 +763,6 @@ DNSResult DNS::GetResult(int resultnum)
 
 			default:
 			break;
-			
 		}
 
 		/* Build the reply with the id and hostname/ip in it */
@@ -779,7 +773,7 @@ DNSResult DNS::GetResult(int resultnum)
 }
 
 /** 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;
@@ -791,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");
@@ -849,10 +844,10 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
 			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++;
@@ -868,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 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");
@@ -933,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)
@@ -944,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());
@@ -953,13 +947,13 @@ void DNS::DelCache(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)
 {
-	ServerInstance->Log(DEBUG,"Resolver::Resolver");
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Resolver::Resolver");
 	cached = false;
 
 	CQ = ServerInstance->Res->GetCache(source);
@@ -977,7 +971,7 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
 		}
 	}
 
-	insp_inaddr binip;
+	irc::sockets::insp_inaddr binip;
 
 	switch (querytype)
 	{
@@ -986,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);
@@ -1030,7 +1024,7 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
 	}
 	else
 	{
-		ServerInstance->Log(DEBUG,"DNS request id %d", this->myid);
+		ServerInstance->Logs->Log("RESOLVER",DEBUG,"DNS request id %d", this->myid);
 	}
 }
 
@@ -1061,15 +1055,14 @@ Module* Resolver::GetCreator()
 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");
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Handle DNS event");
 
-	res = this->GetResult(resultnum);
+	res = this->GetResult();
+
+	ServerInstance->Logs->Log("RESOLVER",DEBUG,"Result id %d", res.id);
 
-	ServerInstance->Log(DEBUG,"Result %d id %d", resultnum, res.id);
-	
 	/* Is there a usable request id? */
 	if (res.id != -1)
 	{
@@ -1096,27 +1089,25 @@ void DNS::HandleEvent(EventType, int)
 			{
 				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);
+				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 */
 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))
 	{
@@ -1154,7 +1145,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;
 			}
@@ -1169,9 +1160,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 += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->Config->ports.size();
+	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->ports.size();
 	return val;
 }
-