kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index e8591c31924a557c3779a2b48ab52e5e177d7296..7468d0890886d460e070f63f7e0c3d0f6317e914 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -33,10 +33,6 @@ using namespace std;
 #include <sstream>
 #include <vector>
 #include <deque>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
 #include "users.h"
 #include "ctables.h"
 #include "globals.h"
@@ -48,7 +44,6 @@ using namespace std;
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
@@ -84,14 +79,14 @@ void ProcessUser(userrec* cu)
 
        log(DEBUG,"Processing user with fd %d",cu->fd);
 
-       if (Config->GetIOHook(cu->port))
+       if (Config->GetIOHook(cu->GetPort()))
        {
                int result2 = 0;
                int MOD_RESULT = 0;
 
                try
                {
-                       MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
+                       MOD_RESULT = Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->fd,data,65535,result2);
                        log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
                }
                catch (ModuleException& modexcept)
@@ -173,9 +168,9 @@ void ProcessUser(userrec* cu)
                                }
                                else
                                {
-                                       WriteOpers("*** Excess flood from %s",(char*)insp_ntoa(current->ip4));
-                                       log(DEFAULT,"Excess flood from: %s",(char*)insp_ntoa(current->ip4));
-                                       add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4));
+                                       WriteOpers("*** Excess flood from %s",current->GetIPString());
+                                       log(DEFAULT,"Excess flood from: %s",current->GetIPString());
+                                       add_zline(120,Config->ServerName,"Flood from unregistered connection",current->GetIPString());
                                        apply_lines(APPLY_ZLINES);
                                }
 
@@ -190,9 +185,9 @@ void ProcessUser(userrec* cu)
                                }
                                else
                                {
-                                       WriteOpers("*** Excess flood from %s",(char*)insp_ntoa(current->ip4));
-                                       log(DEFAULT,"Excess flood from: %s",(char*)insp_ntoa(current->ip4));
-                                       add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4));
+                                       WriteOpers("*** Excess flood from %s",current->GetIPString());
+                                       log(DEFAULT,"Excess flood from: %s",current->GetIPString());
+                                       add_zline(120,Config->ServerName,"Flood from unregistered connection",current->GetIPString());
                                        apply_lines(APPLY_ZLINES);
                                }
 
@@ -226,7 +221,7 @@ void ProcessUser(userrec* cu)
                                        }
                                        else
                                        {
-                                               add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)insp_ntoa(current->ip4));
+                                               add_zline(120,Config->ServerName,"Flood from unregistered connection",current->GetIPString());
                                                apply_lines(APPLY_ZLINES);
                                        }