Create StreamSocket for IO hooking implementation

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

diff --git a/src/xline.cpp b/src/xline.cpp
index da46c2eee44926beb4d05635349280b4d58ce1a7..b15a7ce2b22c0b447185972ccf9e625b269eb0f4 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -18,7 +18,7 @@
 #include "bancache.h"
 
 /*
- * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and 
+ * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
  * efficient as we can this time so we can close this file and never ever touch it again ..
  *
  * Background:
@@ -167,17 +167,17 @@ bool XLineManager::AddLine(XLine* line, User* user)
 {
        ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
 
-       /* If the line exists, check if its an expired line */
+       if (line->duration && ServerInstance->Time() > line->expiry)
+               return false; // Don't apply expired XLines.
+
+       /* Don't apply duplicate xlines */
        ContainerIter x = lookup_lines.find(line->type);
        if (x != lookup_lines.end())
        {
                LookupIter i = x->second.find(line->Displayable());
                if (i != x->second.end())
                {
-                       if (i->second->duration && ServerInstance->Time() > i->second->expiry)
-                               ExpireLine(x, i);
-                       else
-                               return false;
+                       return false;
                }
        }
 
@@ -192,7 +192,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
        lookup_lines[line->type][line->Displayable()] = line;
        line->OnAdd();
 
-       FOREACH_MOD(I_OnAddLine,OnAddLine(user, line)); 
+       FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));
 
        return true;
 }
@@ -338,9 +338,14 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 // applies lines, removing clients and changing nicks etc as applicable
 void XLineManager::ApplyLines()
 {
-       for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+       std::vector<User*>::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
+       while (u2 != ServerInstance->Users->local_users.rend())
        {
-               User* u = (User*)(*u2);
+               User* u = *u2++;
+
+               // Don't ban people who are exempt.
+               if (u->exempt)
+                       continue;
 
                for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
                {
@@ -423,7 +428,7 @@ XLineManager::~XLineManager()
                i->second.clear();
        }
        lookup_lines.clear();
-       
+
 }
 
 void XLine::Apply(User* u)
@@ -438,7 +443,7 @@ bool XLine::IsBurstable()
 void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 {
        char sreason[MAXBUF];
-       snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
+       snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason.c_str());
        if (*ServerInstance->Config->MoronBanner)
                u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner);
 
@@ -477,7 +482,7 @@ bool KLine::Matches(User *u)
 
 void KLine::Apply(User* u)
 {
-       DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
+       DefaultApply(u, "K", (this->identmask ==  "*") ? true : false);
 }
 
 bool GLine::Matches(User *u)
@@ -498,8 +503,8 @@ bool GLine::Matches(User *u)
 }
 
 void GLine::Apply(User* u)
-{       
-       DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
+{
+       DefaultApply(u, "G", (this->identmask == "*") ? true : false);
 }
 
 bool ELine::Matches(User *u)
@@ -531,7 +536,7 @@ bool ZLine::Matches(User *u)
 }
 
 void ZLine::Apply(User* u)
-{       
+{
        DefaultApply(u, "Z", true);
 }
 
@@ -545,7 +550,7 @@ bool QLine::Matches(User *u)
 }
 
 void QLine::Apply(User* u)
-{       
+{
        /* Force to uuid on apply of qline, no need to disconnect any more :) */
        u->ForceNickChange(u->uuid.c_str());
 }
@@ -595,27 +600,32 @@ void ELine::OnAdd()
 
 void ELine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void QLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",
+               nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void ZLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",
+               ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void KLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void GLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 const char* ELine::Displayable()
@@ -635,12 +645,12 @@ const char* GLine::Displayable()
 
 const char* ZLine::Displayable()
 {
-       return ipaddr;
+       return ipaddr.c_str();
 }
 
 const char* QLine::Displayable()
 {
-       return nick;
+       return nick.c_str();
 }
 
 bool KLine::IsBurstable()
@@ -681,4 +691,3 @@ XLineFactory* XLineManager::GetFactory(const std::string &type)
 
        return n->second;
 }
-