Refactor port binding, warning not yet tested fully

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 768208e3aec1e423f078bffea0e494cc2a5b8877..b6721de09cbcafc37d244975740320d1b3e15e41 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -16,7 +16,6 @@
 #include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
-#include "cull_list.h"
 
 /* Version two, now with optimized expiry!
  *
@@ -27,7 +26,7 @@
  *     items, and the other list holds permanent items (ones which will expire).
  *     Items which are on the permanent list are NEVER checked at all by the
  *     expire_lines() function.
- * (2) The temporary xline lists are always kept in strict numerical order, keyed by 
+ * (2) The temporary xline lists are always kept in strict numerical order, keyed by
  *     current time + duration. This means that the line which is due to expire the
  *     soonest is always pointed at by vector::begin(), so a simple while loop can
  *     very efficiently, very quickly and above all SAFELY pick off the first few
@@ -69,9 +68,8 @@ bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* ipmask = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);
-       conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
        return true;
 }
 
@@ -79,9 +77,8 @@ bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* nick = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);
-       conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
        return true;
 }
 
@@ -89,9 +86,8 @@ bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* host = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);
-       conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
        return true;
 }
 
@@ -99,9 +95,8 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* host = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);
-       conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
        return true;
 }
 
@@ -133,9 +128,9 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso
        IdentHostPair ih = IdentSplit(hostmask);
 
        bool ret = del_gline(hostmask);
-       
+
        GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
-       
+
        if (duration)
        {
                glines.push_back(item);
@@ -145,7 +140,7 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso
        {
                pglines.push_back(item);
        }
-       
+
        return !ret;
 }
 
@@ -418,7 +413,7 @@ GLine* XLineManager::matches_gline(userrec* user, bool permonly)
 }
 
 ELine* XLineManager::matches_exception(userrec* user, bool permonly)
-{                      
+{
        if ((elines.empty()) && (pelines.empty()))
                return NULL;
        char host2[MAXBUF];
@@ -469,7 +464,7 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
                        return;
                }
        }
-       return ;        
+       return ;
 }
 
 void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
@@ -483,7 +478,7 @@ void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
                        return;
                }
        }
-       for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)        
+       for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
        {
                if (!strcasecmp(host,(*i)->hostmask))
                {
@@ -658,13 +653,16 @@ void XLineManager::expire_lines()
                ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration);
                qlines.erase(i);
        }
-       
+
 }
 
 // applies lines, removing clients and changing nicks etc as applicable
 
 void XLineManager::apply_lines(const int What)
 {
+       if (!What)
+               return;
+
        if (What & APPLY_PERM_ONLY)
        {
                char reason[MAXBUF];
@@ -672,7 +670,6 @@ void XLineManager::apply_lines(const int What)
                if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
                        return;
 
-               CullList* Goners = new CullList(ServerInstance);
                XLine* check = NULL;
                for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
                {
@@ -687,7 +684,10 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_gline(u,true)))
                                {
                                        snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -696,7 +696,10 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_kline(u,true)))
                                {
                                        snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -705,7 +708,10 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_qline(u->nick,true)))
                                {
                                        snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
 
@@ -714,13 +720,13 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_zline(u->GetIPString(),true)))
                                {
                                        snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                }
-
-               Goners->Apply();
-               DELETE(Goners);
        }
        else
        {
@@ -729,8 +735,7 @@ void XLineManager::apply_lines(const int What)
                if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
                (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
                        return;
-       
-               CullList* Goners = new CullList(ServerInstance);
+
                XLine* check = NULL;
                for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
                {
@@ -747,7 +752,10 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_gline(u)))
                                {
                                        snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                        if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
@@ -755,7 +763,10 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_kline(u)))
                                {
                                        snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                        if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
@@ -763,21 +774,24 @@ void XLineManager::apply_lines(const int What)
                                if ((check = matches_qline(u->nick)))
                                {
                                        snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                        if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
                        {
                                if ((check = matches_zline(u->GetIPString())))
                                {
-                                       snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
-                                       Goners->AddItem(u,reason);
+                                       snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);
+                                       if (ServerInstance->Config->HideBans)
+                                               ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+                                       else
+                                               ServerInstance->GlobalCulls.AddItem(u, reason);
                                }
                        }
                }
-
-               Goners->Apply();
-               DELETE(Goners);
        }
 }