Merge branch 'master+foreachneighbor'

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 77b7f81db21281f835f104fce93bcfec68e1a230..948538ff460d15162048800ceea8c77a218f5954 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -25,8 +25,6 @@
 
 #include "inspircd.h"
 #include "listmode.h"
-#include <cstdarg>
-#include "mode.h"
 
 namespace
 {
@@ -63,17 +61,17 @@ void Channel::SetTopic(User* u, const std::string& ntopic)
 
 Membership* Channel::AddUser(User* user)
 {
-       Membership*& memb = userlist[user];
-       if (memb)
+       std::pair<MemberMap::iterator, bool> ret = userlist.insert(std::make_pair(user, insp::aligned_storage<Membership>()));
+       if (!ret.second)
                return NULL;
 
-       memb = new Membership(user, this);
+       Membership* memb = new(ret.first->second) Membership(user, this);
        return memb;
 }
 
 void Channel::DelUser(User* user)
 {
-       UserMembIter it = userlist.find(user);
+       MemberMap::iterator it = userlist.find(user);
        if (it != userlist.end())
                DelUser(it);
 }
@@ -88,23 +86,22 @@ void Channel::CheckDestroy()
        if (res == MOD_RES_DENY)
                return;
 
+       // If the channel isn't in chanlist then it is already in the cull list, don't add it again
        chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
-       /* kill the record */
-       if (iter != ServerInstance->chanlist.end())
-       {
-               FOREACH_MOD(OnChannelDelete, (this));
-               ServerInstance->chanlist.erase(iter);
-       }
+       if ((iter == ServerInstance->chanlist.end()) || (iter->second != this))
+               return;
 
+       FOREACH_MOD(OnChannelDelete, (this));
+       ServerInstance->chanlist.erase(iter);
        ClearInvites();
        ServerInstance->GlobalCulls.AddItem(this);
 }
 
-void Channel::DelUser(const UserMembIter& membiter)
+void Channel::DelUser(const MemberMap::iterator& membiter)
 {
        Membership* memb = membiter->second;
        memb->cull();
-       delete memb;
+       memb->~Membership();
        userlist.erase(membiter);
 
        // If this channel became empty then it should be removed
@@ -113,7 +110,7 @@ void Channel::DelUser(const UserMembIter& membiter)
 
 Membership* Channel::GetUser(User* user)
 {
-       UserMembIter i = userlist.find(user);
+       MemberMap::iterator i = userlist.find(user);
        if (i == userlist.end())
                return NULL;
        return i->second;
@@ -138,10 +135,18 @@ void Channel::SetDefaultModes()
                                continue;
 
                        if (mode->GetNumParams(true))
+                       {
                                list.GetToken(parameter);
+                               // If the parameter begins with a ':' then it's invalid
+                               if (parameter.c_str()[0] == ':')
+                                       continue;
+                       }
                        else
                                parameter.clear();
 
+                       if ((mode->GetNumParams(true)) && (parameter.empty()))
+                               continue;
+
                        mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
                }
        }
@@ -292,17 +297,17 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
        return chan;
 }
 
-void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
+Membership* Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
 {
        if (IS_SERVER(user))
        {
                ServerInstance->Logs->Log("CHANNELS", LOG_DEBUG, "Attempted to join server user " + user->uuid + " to channel " + this->name);
-               return;
+               return NULL;
        }
 
        Membership* memb = this->AddUser(user);
        if (!memb)
-               return; // Already on the channel
+               return NULL; // Already on the channel
 
        user->chans.push_front(memb);
 
@@ -350,6 +355,7 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
        }
 
        FOREACH_MOD(OnPostJoin, (memb));
+       return memb;
 }
 
 bool Channel::IsBanned(User* user)
@@ -389,10 +395,10 @@ bool Channel::CheckBan(User* user, const std::string& mask)
                return false;
 
        const std::string nickIdent = user->nick + "!" + user->ident;
-       std::string prefix = mask.substr(0, at);
+       std::string prefix(mask, 0, at);
        if (InspIRCd::Match(nickIdent, prefix, NULL))
        {
-               std::string suffix = mask.substr(at + 1);
+               std::string suffix(mask, at + 1);
                if (InspIRCd::Match(user->host, suffix, NULL) ||
                        InspIRCd::Match(user->dhost, suffix, NULL) ||
                        InspIRCd::MatchCIDR(user->GetIPString(), suffix, NULL))
@@ -427,7 +433,7 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
  */
 void Channel::PartUser(User *user, std::string &reason)
 {
-       UserMembIter membiter = userlist.find(user);
+       MemberMap::iterator membiter = userlist.find(user);
 
        if (membiter != userlist.end())
        {
@@ -444,7 +450,7 @@ void Channel::PartUser(User *user, std::string &reason)
        }
 }
 
-void Channel::KickUser(User* src, const UserMembIter& victimiter, const std::string& reason)
+void Channel::KickUser(User* src, const MemberMap::iterator& victimiter, const std::string& reason)
 {
        Membership* memb = victimiter->second;
        CUList except_list;
@@ -468,7 +474,7 @@ void Channel::WriteChannel(User* user, const std::string &text)
 {
        const std::string message = ":" + user->GetFullHost() + " " + text;
 
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); i++)
        {
                if (IS_LOCAL(i->first))
                        i->first->Write(message);
@@ -486,7 +492,7 @@ void Channel::WriteChannelWithServ(const std::string& ServName, const std::strin
 {
        const std::string message = ":" + (ServName.empty() ? ServerInstance->Config->ServerName : ServName) + " " + text;
 
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); i++)
        {
                if (IS_LOCAL(i->first))
                        i->first->Write(message);
@@ -525,7 +531,7 @@ void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CULi
                if (mh)
                        minrank = mh->GetPrefixRank();
        }
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); i++)
        {
                if (IS_LOCAL(i->first) && (except_list.find(i->first) == except_list.end()))
                {
@@ -595,7 +601,7 @@ void Channel::UserList(User* user, bool has_user)
        const size_t maxlen = ServerInstance->Config->Limits.MaxLine - 10 - ServerInstance->Config->ServerName.size();
        std::string prefixlist;
        std::string nick;
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); ++i)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); ++i)
        {
                if ((!has_user) && (i->first->IsModeSet(invisiblemode)) && (!has_privs))
                {
@@ -692,7 +698,7 @@ const char* Membership::GetAllPrefixChars() const
 
 unsigned int Channel::GetPrefixValue(User* user)
 {
-       UserMembIter m = userlist.find(user);
+       MemberMap::iterator m = userlist.find(user);
        if (m == userlist.end())
                return 0;
        return m->second->getRank();