X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=ec19ed397f9ec2f02a2adc60354f560e7a7711b3;hb=4cc6e5e14fdbde499481dbab5ab2ad1257b8af9c;hp=612a47260bdcb15935c17eb3df9a1643410adddd;hpb=d0d36795e807cf72295c6e73813e0c2daa0a71e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dns.cpp b/src/dns.cpp
index 612a47260..ec19ed397 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -108,14 +108,14 @@ class DNSRequest
 	int SendRequests(const DNSHeader *header, const int length, QueryType qt);
 };
 
-class CacheTimer : public InspTimer
+class CacheTimer : public Timer
 {
  private:
 	InspIRCd* ServerInstance;
 	DNS* dns;
  public:
 	CacheTimer(InspIRCd* Instance, DNS* thisdns)
-		: InspTimer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { }
+		: Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { }
 
 	virtual void Tick(time_t TIME)
 	{
@@ -123,13 +123,13 @@ class CacheTimer : public InspTimer
 	}
 };
 
-class RequestTimeout : public InspTimer
+class RequestTimeout : public Timer
 {
 	InspIRCd* ServerInstance;
 	DNSRequest* watch;
 	int watchid;
  public:
-	RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : InspTimer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id)
+	RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id)
 	{
 	}
 
@@ -721,15 +721,7 @@ DNSResult DNS::GetResult(int resultnum)
 
 			case DNS_QUERY_AAAA:
 			{
-				snprintf(formatted,40,"%x:%x:%x:%x:%x:%x:%x:%x",
-						(ntohs(data.first[0]) + ntohs(data.first[1] << 8)),
-						(ntohs(data.first[2]) + ntohs(data.first[3] << 8)),
-						(ntohs(data.first[4]) + ntohs(data.first[5] << 8)),
-						(ntohs(data.first[6]) + ntohs(data.first[7] << 8)),
-						(ntohs(data.first[8]) + ntohs(data.first[9] << 8)),
-						(ntohs(data.first[10]) + ntohs(data.first[11] << 8)),
-						(ntohs(data.first[12]) + ntohs(data.first[13] << 8)),
-						(ntohs(data.first[14]) + ntohs(data.first[15] << 8)));
+				inet_ntop(AF_INET6, data.first, formatted, sizeof(formatted));
 				char* c = strstr(formatted,":0:");
 				if (c != NULL)
 				{