Remove individual read buffers inside of BufferedSocket, use the shared netbuffer...

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 219979dc93cdf96ebc3f24b15a25520eee5b433b..d917edb84b6bfd03f4a301594ba56ccd19091eb2 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -453,26 +453,32 @@ bool Channel::IsBanned(User* user)
 
 bool Channel::IsExtBanned(User *user, char type)
 {
-       // XXX. do we need events?
        char mask[MAXBUF];
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(I_OnCheckExtBan,OnCheckExtBan(user, this, type));
 
-       snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
-
-       for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+       if (MOD_RESULT == -1)
+               return true;
+       else if (MOD_RESULT == 0)
        {
-               if (i->data[0] != type || i->data[1] != ':')
-                       continue;
-
-               // Iterate past char and : to get to the mask without doing a data copy(!)
-               std::string maskptr = i->data.substr(2);
+               snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
 
-               /* This allows CIDR ban matching
-                *
-                *        Full masked host                             Full unmasked host                     IP with/without CIDR
-                */
-               if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true)))
+               for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
                {
-                       return true;
+                       if (i->data[0] != type || i->data[1] != ':')
+                               continue;
+
+                       // Iterate past char and : to get to the mask without doing a data copy(!)
+                       std::string maskptr = i->data.substr(2);
+
+                       /* This allows CIDR ban matching
+                        *
+                        *        Full masked host                             Full unmasked host                     IP with/without CIDR
+                       */
+                       if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true)))
+                       {
+                               return true;
+                       }
                }
        }
 
@@ -482,8 +488,10 @@ bool Channel::IsExtBanned(User *user, char type)
 /* Channel::PartUser
  * remove a channel from a users record, and return the number of users left.
  * Therefore, if this function returns 0 the caller should delete the Channel.
+ *
+ * XXX: bleh, string copy of reason, fixme! -- w00t
  */
-long Channel::PartUser(User *user, const char* reason)
+long Channel::PartUser(User *user, std::string &reason)
 {
        bool silent = false;
 
@@ -493,10 +501,10 @@ long Channel::PartUser(User *user, const char* reason)
        UCListIter i = user->chans.find(this);
        if (i != user->chans.end())
        {
-               FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent));
+               FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason, silent));
 
                if (!silent)
-                       this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason ? " :" : "", reason ? reason : "");
+                       this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : ":", reason.c_str());
 
                user->chans.erase(i);
                this->RemoveAllPrefixes(user);