X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=a28881ad2f4d00667ad5d722d9bc88a0e8f78cd1;hb=934d9a6a184b7a8600fcda30e012ba6f29f17b64;hp=396cc56df258fdb5c69eca8c88975fc219405521;hpb=77d5c9f765702a06a1ad77f239d1cbe2d9b11662;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dns.cpp b/src/dns.cpp
index 396cc56df..a28881ad2 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -34,7 +34,6 @@ looks like this, walks like this or tastes like this.
 #include "inspircd_se_config.h"
 #endif
 
-#include "dns.h"
 #include "inspircd.h"
 #include "socketengine.h"
 #include "configreader.h"
@@ -97,9 +96,8 @@ class DNSRequest
 	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 SendRequests(const DNSHeader *header, const int length, QueryType qt);
@@ -108,11 +106,10 @@ class DNSRequest
 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)
 	{
@@ -122,13 +119,17 @@ class CacheTimer : public Timer
 
 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)
 	{
@@ -143,19 +144,18 @@ class RequestTimeout : public Timer
 			}
 			ServerInstance->Res->requests[watchid] = NULL;
 			delete watch;
-			return;
 		}
 	}
 };
 
 /* 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 */
@@ -217,7 +217,6 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp
 
 	DNS::EmptyHeader(payload,header,length);
 
-#ifdef IPV6
 	if (this->dnsobj->socketfamily == AF_INET6)
 	{
 		sockaddr_in6 addr;
@@ -229,7 +228,6 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp
 			return -1;
 	}
 	else
-#endif
 	{
 		sockaddr_in addr;
 		memset(&addr,0,sizeof(addr));
@@ -258,7 +256,7 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id, const char* original)
 	while (requests[id])
 		id = this->PRNG() & DNS::MAX_REQUEST_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;
@@ -334,7 +332,6 @@ void DNS::Rehash()
 	}
 
 	this->socketfamily = AF_INET;
-#ifdef IPV6
 	if (strchr(ServerInstance->Config->DNSServer,':'))
 	{
 		this->socketfamily = AF_INET6;
@@ -345,9 +342,6 @@ void DNS::Rehash()
 		inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
 		portpass = -1;
 	}
-#else
-	inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
-#endif
 
 	/* Initialize mastersocket */
 	int s = irc::sockets::OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM);
@@ -372,7 +366,7 @@ void DNS::Rehash()
 			/* 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);
@@ -389,7 +383,7 @@ void DNS::Rehash()
 }
 
 /** 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 */
@@ -415,7 +409,7 @@ DNS::DNS(InspIRCd* Instance) : ServerInstance(Instance)
 	 */
 	this->Rehash();
 
-	this->PruneTimer = new CacheTimer(ServerInstance, this);
+	this->PruneTimer = new CacheTimer(this);
 
 	ServerInstance->Timers->AddTimer(this->PruneTimer);
 }
@@ -602,7 +596,6 @@ DNSResult DNS::GetResult()
 	 *
 	 * -- Thanks jilles for pointing this one out.
 	 */
-#ifdef IPV6
 	char nbuf[MAXBUF];
 	if (this->socketfamily == AF_INET6)
 	{
@@ -610,7 +603,6 @@ DNSResult DNS::GetResult()
 		port_from = ntohs(from.in6.sin6_port);
 	}
 	else
-#endif
 	{
 		ipaddr_from = inet_ntoa(from.in4.sin_addr);
 		port_from = ntohs(from.in4.sin_port);
@@ -884,6 +876,8 @@ DNS::~DNS()
 	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)
@@ -907,7 +901,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)
+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;