This needs some general QA-ing. Add support to new parser (introduced in 1.1) for...

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

diff --git a/src/dns.cpp b/src/dns.cpp
index a3e1a8b171ddd8a55d1698aade2e348c2ba3855d..33dba1abb72a2e14f3838379bde0185a034e4690 100644 (file)
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -32,7 +32,6 @@ looks like this, walks like this or tastes like this.
 #include "configreader.h"
 #include "socket.h"
 
-using irc::sockets::insp_sockaddr;
 using irc::sockets::insp_inaddr;
 using irc::sockets::insp_ntoa;
 using irc::sockets::insp_aton;
@@ -541,7 +540,6 @@ int DNS::GetName(const insp_inaddr *ip)
 /** Start lookup of an IP address to a hostname */
 int DNS::GetNameForce(const char *ip, ForceProtocol fp)
 {
-       ServerInstance->Log(DEBUG,"GetNameForce: %s", ip);
        char query[128];
        DNSHeader h;
        int id;
@@ -552,7 +550,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp)
                in6_addr i;
                if (inet_pton(AF_INET6, ip, &i) > 0)
                {
-                       ServerInstance->Log(DEBUG,"Resolve to ipv6");
                        DNS::MakeIP6Int(query, &i);
                }
                else
@@ -565,7 +562,6 @@ int DNS::GetNameForce(const char *ip, ForceProtocol fp)
                in_addr i;
                if (inet_aton(ip, &i))
                {
-                       ServerInstance->Log(DEBUG,"Resolve to ipv4");
                        unsigned char* c = (unsigned char*)&i.s_addr;
                        sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]);
                }
@@ -625,8 +621,6 @@ DNSResult DNS::GetResult()
 
        int length = recvfrom(this->GetFd(),buffer,sizeof(DNSHeader),0,from,&x);
 
-       ServerInstance->Log(DEBUG,"Recv %d.", length);
-
        /* Did we get the whole header? */
        if (length < 12)
        {
@@ -670,7 +664,6 @@ DNSResult DNS::GetResult()
        {
                if ((port_from != DNS::QUERY_PORT) || (strcasecmp(ipaddr_from, ServerInstance->Config->DNSServer)))
                {
-                       ServerInstance->Log(DEBUG,"Doesnt match security: port_from=%d ipaddr_from=%s",port_from,ipaddr_from);
                        return DNSResult(-1,"",0,"");
                }
        }
@@ -1060,7 +1053,6 @@ Module* Resolver::GetCreator()
 /** Process a socket read event */
 void DNS::HandleEvent(EventType et, int errornum)
 {
-       ServerInstance->Log(DEBUG,"Marshall dns reads");
        /* Fetch the id and result of the next available packet */
        DNSResult res = this->GetResult();
        /* Is there a usable request id? */