Note to self, cast time_t to long int for printf... thanks Ankit for pointing this...

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

diff --git a/src/dns.cpp b/src/dns.cpp
index 447b90781ba0d8436053ae2422fcc82fd4b39618..0801fc76c247def976c0a5fb877deb2ea7a9aad1 100644 (file)
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDasyncdns */
+/* $Core */
 
 /*
 dns.cpp - Nonblocking DNS functions.
@@ -40,11 +40,6 @@ looks like this, walks like this or tastes like this.
 #include "configreader.h"
 #include "socket.h"
 
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_ntoa;
-using irc::sockets::insp_aton;
-using irc::sockets::OpenTCPSocket;
-
 /** Masks to mask off the responses we get from the DNSRequest methods
  */
 enum QueryInfo
@@ -131,7 +126,7 @@ class RequestTimeout : public Timer
        DNSRequest* watch;
        int watchid;
  public:
-       RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id)
+       RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, SI->Time()), ServerInstance(SI), watch(watching), watchid(id)
        {
        }
 
@@ -355,7 +350,7 @@ void DNS::Rehash()
 #endif
 
        /* Initialize mastersocket */
-       int s = OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM);
+       int s = irc::sockets::OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM);
        this->SetFd(s);
        ServerInstance->SE->NonBlocking(this->GetFd());
 
@@ -517,7 +512,7 @@ int DNS::GetCName(const char *alias)
 }
 
 /** Start lookup of an IP address to a hostname */
-int DNS::GetName(const insp_inaddr *ip)
+int DNS::GetName(const irc::sockets::insp_inaddr *ip)
 {
        char query[128];
        DNSHeader h;
@@ -540,7 +535,7 @@ int DNS::GetName(const insp_inaddr *ip)
        if ((length = this->MakePayload(query, DNS_QUERY_PTR, 1, (unsigned char*)&h.payload)) == -1)
                return -1;
 
-       DNSRequest* req = this->AddQuery(&h, id, insp_ntoa(*ip));
+       DNSRequest* req = this->AddQuery(&h, id, irc::sockets::insp_ntoa(*ip));
 
        if ((!req) || (req->SendRequests(&h, length, DNS_QUERY_PTR) == -1))
                return -1;
@@ -791,6 +786,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
        rr.type = DNS_QUERY_NONE;
        rr.rdlength = 0;
        rr.ttl = 1;     /* GCC is a whiney bastard -- see the XXX below. */
+       rr.rr_class = 0; /* Same for VC++ */
 
        if (!(header.flags1 & FLAGS_MASK_QR))
                return std::make_pair((unsigned char*)NULL,"Not a query result");
@@ -933,7 +929,6 @@ DNS::~DNS()
        ServerInstance->SE->Shutdown(this, 2);
        ServerInstance->SE->Close(this);
        ServerInstance->Timers->DelTimer(this->PruneTimer);
-       delete this->PruneTimer;
 }
 
 CachedQuery* DNS::GetCache(const std::string &source)
@@ -977,7 +972,7 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
                }
        }
 
-       insp_inaddr binip;
+       irc::sockets::insp_inaddr binip;
 
        switch (querytype)
        {
@@ -986,7 +981,7 @@ Resolver::Resolver(InspIRCd* Instance, const std::string &source, QueryType qt,
                break;
 
                case DNS_QUERY_PTR:
-                       if (insp_aton(source.c_str(), &binip) > 0)
+                       if (irc::sockets::insp_aton(source.c_str(), &binip) > 0)
                        {
                                /* Valid ip address */
                                this->myid = ServerInstance->Res->GetName(&binip);
@@ -1116,7 +1111,7 @@ void DNS::HandleEvent(EventType, int)
 /** Add a derived Resolver to the working set */
 bool DNS::AddResolverClass(Resolver* r)
 {
-       ServerInstance->Logs->Log("RESOLVER",DEBUG,"AddResolverClass %08lx", r);
+       ServerInstance->Logs->Log("RESOLVER",DEBUG,"AddResolverClass 0x%08lx", (unsigned long)r);
        /* Check the pointers validity and the id's validity */
        if ((r) && (r->GetId() > -1))
        {
@@ -1169,9 +1164,10 @@ unsigned long DNS::PRNG()
        timeval n;
        serverstats* s = ServerInstance->stats;
        gettimeofday(&n,NULL);
-       val = (n.tv_usec ^ getpid() ^ geteuid() ^ (this->currid++)) ^ s->statsAccept + n.tv_sec;
-       val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad;
+       val = (n.tv_usec ^ (getpid() ^ geteuid()) ^ ((this->currid++)) ^ s->statsAccept) + n.tv_sec;
+       val = val + (s->statsCollisions ^ s->statsDnsGood) - s->statsDnsBad;
        val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->Config->ports.size();
        return val;
 }
 
+