Dont try and cloak remote clients

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a72ee2534d1aef105a1f097d50b85b50d0a07538..a34f438f9d0bb8d7b13be62353193a2df72b6ec6 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -56,7 +56,6 @@
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
@@ -818,16 +817,15 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 
                        case X_ESTAB_DNS:
                                /* Handles instances of the Resolver class,
-                                * a simple class extended by modules for
+                                * a simple class extended by modules and the core for
                                 * nonblocking resolving of addresses.
                                 */
-
-                               dns_deal_with_classes(activefds[activefd]);
+                               this->Res->MarshallReads(activefds[activefd]);
                        break;
 
                        case X_LISTEN:
 
-                               log(DEBUG,"Type: X_LISTEN_MODULE: fd=%d",activefds[activefd]);
+                               log(DEBUG,"Type: X_LISTEN: fd=%d",activefds[activefd]);
 
                                /* It's a listener */
                                uslen = sizeof(sock_us);
@@ -864,15 +862,17 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                                        }
                                        stats->statsAccept++;
 #ifdef IPV6
+                                       log(DEBUG,"Add ipv6 client");
                                        AddClient(incomingSockfd, in_port, false, client.sin6_addr);
 #else
+                                       log(DEBUG,"Add ipv4 client");
                                        AddClient(incomingSockfd, in_port, false, client.sin_addr);
 #endif
-                                       log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
+                                       log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd);
                                }
                                else
                                {
-                                       log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno));
+                                       log(DEBUG,"Accept failed on fd %d: %s",incomingSockfd,strerror(errno));
                                        shutdown(incomingSockfd,2);
                                        close(incomingSockfd);
                                        stats->statsRefused++;
@@ -896,7 +896,7 @@ int InspIRCd::Run()
 {
        /* Until THIS point, ServerInstance == NULL */
        
-       init_dns();
+       this->Res = new DNS();
 
        LoadAllModules(this);