X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=3d3bc947fee2cfbee4f045e04b56b5eeb0730687;hb=11e67c494a9a1e7796c7b6ec0a60c88019181020;hp=63bde0eccb46e5819b213d33f71df21f8d4cf32a;hpb=21f7e4a8cdad2f29fda2768215c3a5352a9fa632;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dns.cpp b/src/dns.cpp
index 63bde0ecc..3d3bc947f 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -121,7 +121,7 @@ class CacheTimer : public Timer
 	DNS* dns;
  public:
 	CacheTimer(DNS* thisdns)
-		: Timer(3600, ServerInstance->Time(), true), dns(thisdns) { }
+		: Timer(5*60, ServerInstance->Time(), true), dns(thisdns) { }
 
 	virtual void Tick(time_t)
 	{
@@ -160,8 +160,10 @@ class RequestTimeout : public Timer
 	}
 };
 
-CachedQuery::CachedQuery(const std::string &res, unsigned int ttl) : data(res)
+CachedQuery::CachedQuery(const std::string &res, QueryType qt, unsigned int ttl) : data(res), type(qt)
 {
+	if (ttl > 5*60)
+		ttl = 5*60;
 	expires = ServerInstance->Time() + ttl;
 }
 
@@ -677,19 +679,13 @@ DNSResult DNS::GetResult()
 
 			case DNS_QUERY_AAAA:
 			{
-				inet_ntop(AF_INET6, data.first, formatted, sizeof(formatted));
-				char* c = strstr(formatted,":0:");
-				if (c != NULL)
+				if (!inet_ntop(AF_INET6, data.first, formatted, sizeof(formatted)))
 				{
-					memmove(c+1,c+2,strlen(c+2) + 1);
-					c += 2;
-					while (memcmp(c,"0:",2) == 0)
-						memmove(c,c+2,strlen(c+2) + 1);
-					if (memcmp(c,"0",2) == 0)
-						*c = 0;
-					if (memcmp(formatted,"0::",3) == 0)
-						memmove(formatted,formatted + 1, strlen(formatted + 1) + 1);
+					std::string ro = req->orig;
+					delete req;
+					return DNSResult(this_id | ERROR_MASK, "inet_ntop() failed", 0, ro);
 				}
+
 				resultstr = formatted;
 
 				/* Special case. Sending ::1 around between servers
@@ -706,8 +702,16 @@ DNSResult DNS::GetResult()
 				/* Identical handling to PTR */
 
 			case DNS_QUERY_PTR:
+			{
 				/* Reverse lookups just come back as char* */
 				resultstr = std::string((const char*)data.first);
+				if (resultstr.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-") != std::string::npos)
+				{
+					std::string ro = req->orig;
+					delete req;
+					return DNSResult(this_id | ERROR_MASK, "Invalid char(s) in reply", 0, ro);
+				}
+			}
 			break;
 
 			default:
@@ -716,8 +720,9 @@ DNSResult DNS::GetResult()
 
 		/* Build the reply with the id and hostname/ip in it */
 		std::string ro = req->orig;
+		DNSResult result = DNSResult(this_id,resultstr,ttl,ro,req->type);
 		delete req;
-		return DNSResult(this_id,resultstr,ttl,ro);
+		return result;
 	}
 }
 
@@ -945,11 +950,12 @@ Resolver::Resolver(const std::string &source, QueryType qt, bool &cached, Module
 		{
 			ServerInstance->Res->DelCache(source);
 		}
-		else
+		else if (CQ->type == qt)
 		{
 			cached = true;
 			return;
 		}
+		CQ = NULL;
 	}
 
 	switch (querytype)
@@ -1054,7 +1060,11 @@ void DNS::HandleEvent(EventType, int)
 					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)));
+				{
+					if (cache->size() >= MAX_CACHE_SIZE)
+						cache->clear();
+					this->cache->insert(std::make_pair(res.original.c_str(), CachedQuery(res.result, res.type, res.ttl)));
+				}
 
 				Classes[res.id]->OnLookupComplete(res.result, res.ttl, false);
 				delete Classes[res.id];