Change Extensible to use strongly typed entries

[user/henk/code/inspircd.git] / src / dns.cpp

diff --git a/src/dns.cpp b/src/dns.cpp
index 75108d577893298baf1b94400342d43be59b1c2b..94a01e64c9cedbf60bfa70c3dfaee096bf07adce 100644 (file)
--- 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"
@@ -129,6 +128,11 @@ class RequestTimeout : public Timer
        RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, SI->Time()), ServerInstance(SI), watch(watching), watchid(id)
        {
        }
+       ~RequestTimeout()
+       {
+               if (ServerInstance->Res)
+                       Tick(0);
+       }
 
        void Tick(time_t)
        {
@@ -143,7 +147,6 @@ class RequestTimeout : public Timer
                        }
                        ServerInstance->Res->requests[watchid] = NULL;
                        delete watch;
-                       return;
                }
        }
 };
@@ -217,7 +220,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 +231,6 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp
                        return -1;
        }
        else
-#endif
        {
                sockaddr_in addr;
                memset(&addr,0,sizeof(addr));
@@ -334,7 +335,6 @@ void DNS::Rehash()
        }
 
        this->socketfamily = AF_INET;
-#ifdef IPV6
        if (strchr(ServerInstance->Config->DNSServer,':'))
        {
                this->socketfamily = AF_INET6;
@@ -345,9 +345,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);
@@ -511,38 +508,6 @@ int DNS::GetCName(const char *alias)
        return id;
 }
 
-/** Start lookup of an IP address to a hostname */
-int DNS::GetName(const irc::sockets::insp_inaddr *ip)
-{
-       char query[128];
-       DNSHeader h;
-       int id;
-       int length;
-
-#ifdef IPV6
-       unsigned char* c = (unsigned char*)&ip->s6_addr;
-       if (c[0] == 0 && c[1] == 0 && c[2] == 0 && c[3] == 0 &&
-           c[4] == 0 && c[5] == 0 && c[6] == 0 && c[7] == 0 &&
-           c[8] == 0 && c[9] == 0 && c[10] == 0xFF && c[11] == 0xFF)
-               sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[15],c[14],c[13],c[12]);
-       else
-               DNS::MakeIP6Int(query, (in6_addr*)ip);
-#else
-       unsigned char* c = (unsigned char*)&ip->s_addr;
-       sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]);
-#endif
-
-       if ((length = this->MakePayload(query, DNS_QUERY_PTR, 1, (unsigned char*)&h.payload)) == -1)
-               return -1;
-
-       DNSRequest* req = this->AddQuery(&h, id, irc::sockets::insp_ntoa(*ip));
-
-       if ((!req) || (req->SendRequests(&h, length, DNS_QUERY_PTR) == -1))
-               return -1;
-
-       return id;
-}
-
 /** Start lookup of an IP address to a hostname */
 int DNS::GetNameForce(const char *ip, ForceProtocol fp)
 {
@@ -550,7 +515,7 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp)
        DNSHeader h;
        int id;
        int length;
-#ifdef SUPPORT_IP6LINKS
+
        if (fp == PROTOCOL_IPV6)
        {
                in6_addr i;
@@ -563,7 +528,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp)
                        return -1;
        }
        else
-#endif
        {
                in_addr i;
                if (inet_aton(ip, &i))
@@ -591,7 +555,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp)
  */
 void DNS::MakeIP6Int(char* query, const in6_addr *ip)
 {
-#ifdef SUPPORT_IP6LINKS
        const char* hex = "0123456789abcdef";
        for (int index = 31; index >= 0; index--) /* for() loop steps twice per byte */
        {
@@ -604,9 +567,6 @@ void DNS::MakeIP6Int(char* query, const in6_addr *ip)
                *query++ = '.'; /* Seperator */
        }
        strcpy(query,"ip6.arpa"); /* Suffix the string */
-#else
-       *query = 0;
-#endif
 }
 
 /** Return the next id which is ready, and the result attached to it */
@@ -616,22 +576,17 @@ DNSResult DNS::GetResult()
        DNSHeader header;
        DNSRequest *req;
        unsigned char buffer[sizeof(DNSHeader)];
-       sockaddr* from = new sockaddr[2];
-#ifdef IPV6
+       irc::sockets::sockaddrs from;
        socklen_t x = this->socketfamily == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
-#else
-       socklen_t x = sizeof(sockaddr_in);
-#endif
        const char* ipaddr_from;
        unsigned short int port_from = 0;
 
-       int length = ServerInstance->SE->RecvFrom(this, (char*)buffer, sizeof(DNSHeader), 0, from, &x);
+       int length = ServerInstance->SE->RecvFrom(this, (char*)buffer, sizeof(DNSHeader), 0, &from.sa, &x);
 
        /* Did we get the whole header? */
        if (length < 12)
        {
                /* Nope - something screwed up. */
-               delete[] from;
                return DNSResult(-1,"",0,"");
        }
 
@@ -644,22 +599,18 @@ DNSResult DNS::GetResult()
         *
         * -- Thanks jilles for pointing this one out.
         */
-#ifdef IPV6
        char nbuf[MAXBUF];
        if (this->socketfamily == AF_INET6)
        {
-               ipaddr_from = inet_ntop(AF_INET6, &((sockaddr_in6*)from)->sin6_addr, nbuf, sizeof(nbuf));
-               port_from = ntohs(((sockaddr_in6*)from)->sin6_port);
+               ipaddr_from = inet_ntop(AF_INET6, &from.in6.sin6_addr, nbuf, sizeof(nbuf));
+               port_from = ntohs(from.in6.sin6_port);
        }
        else
-#endif
        {
-               ipaddr_from = inet_ntoa(((sockaddr_in*)from)->sin_addr);
-               port_from = ntohs(((sockaddr_in*)from)->sin_port);
+               ipaddr_from = inet_ntoa(from.in4.sin_addr);
+               port_from = ntohs(from.in4.sin_port);
        }
 
-       delete[] from;
-
        /* We cant perform this security check if you're using 4in6.
         * Tough luck to you, choose one or't other!
         */
@@ -928,6 +879,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)
@@ -971,28 +924,12 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
                }
        }
 
-       irc::sockets::insp_inaddr binip;
-
        switch (querytype)
        {
                case DNS_QUERY_A:
                        this->myid = ServerInstance->Res->GetIP(source.c_str());
                break;
 
-               case DNS_QUERY_PTR:
-                       if (irc::sockets::insp_aton(source.c_str(), &binip) > 0)
-                       {
-                               /* Valid ip address */
-                               this->myid = ServerInstance->Res->GetName(&binip);
-                       }
-                       else
-                       {
-                               this->OnError(RESOLVER_BADIP, "Bad IP address for reverse lookup");
-                               throw ModuleException("Resolver: Bad IP address");
-                               return;
-                       }
-               break;
-
                case DNS_QUERY_PTR4:
                        querytype = DNS_QUERY_PTR;
                        this->myid = ServerInstance->Res->GetNameForce(source.c_str(), PROTOCOL_IPV4);