m_spanningtree Rewrite /map

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

diff --git a/src/users.cpp b/src/users.cpp
index 88ae0faf41461152fdeef536921069ad5ed8542e..4968c7a37f093a4226dafb1d0f2d3a14dbcbe91f 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -86,7 +86,6 @@ User::User(const std::string& uid, Server* srv, int type)
 
 LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
        : User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL), eh(this),
-       localuseriter(ServerInstance->Users->local_users.end()),
        bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0),
        already_sent(0)
 {
@@ -157,7 +156,6 @@ bool LocalUser::RemoveInvite(Channel* chan)
        Invitation* inv = Invitation::Find(chan, this);
        if (inv)
        {
-               inv->cull();
                delete inv;
                return true;
        }
@@ -327,7 +325,6 @@ CullResult User::cull()
 {
        if (!quitting)
                ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
-       PurgeEmptyChannels();
 
        if (client_sa.sa.sa_family != AF_UNSPEC)
                ServerInstance->Users->RemoveCloneCounts(this);
@@ -337,17 +334,7 @@ CullResult User::cull()
 
 CullResult LocalUser::cull()
 {
-       // The iterator is initialized to local_users.end() in the constructor. It is
-       // overwritten in UserManager::AddUser() with the real iterator so this check
-       // is only a precaution currently.
-       if (localuseriter != ServerInstance->Users->local_users.end())
-       {
-               ServerInstance->Users->local_count--;
-               ServerInstance->Users->local_users.erase(localuseriter);
-       }
-       else
-               ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: LocalUserIter does not point to a valid entry for " + this->nick);
-
+       ServerInstance->Users->local_users.erase(this);
        ClearInvites();
        eh.cull();
        return User::cull();
@@ -578,7 +565,6 @@ void LocalUser::FullConnect()
        this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), BRANCH, modelist.c_str());
 
        ServerInstance->ISupport.SendTo(this);
-       this->WriteNumeric(RPL_YOURUUID, "%s :your unique ID", this->uuid.c_str());
 
        /* Now registered */
        if (ServerInstance->Users->unregistered_count)
@@ -683,7 +669,7 @@ bool User::ChangeNick(const std::string& newnick, bool force)
                        {
                                for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
                                {
-                                       Channel *chan = *i;
+                                       Channel* chan = (*i)->chan;
                                        if (chan->GetPrefixValue(this) < VOICE_VALUE && chan->IsBanned(this))
                                        {
                                                this->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Cannot send to channel (you're banned)", chan->name.c_str());
@@ -762,7 +748,7 @@ const std::string& User::GetIPString()
                irc::sockets::satoap(client_sa, cachedip, port);
                /* IP addresses starting with a : on irc are a Bad Thing (tm) */
                if (cachedip[0] == ':')
-                       cachedip.insert(0,1,'0');
+                       cachedip.insert(cachedip.begin(),1,'0');
        }
 
        return cachedip;
@@ -897,7 +883,7 @@ void User::WriteNumeric(unsigned int numeric, const std::string &text)
 
        if (MOD_RESULT == MOD_RES_DENY)
                return;
-       
+
        const std::string message = InspIRCd::Format(":%s %03u %s %s", ServerInstance->Config->ServerName.c_str(),
                numeric, !this->nick.empty() ? this->nick.c_str() : "*", text.c_str());
        this->Write(message);
@@ -963,7 +949,7 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
 
        LocalUser::already_sent_id++;
 
-       UserChanList include_c(chans);
+       IncludeChanList include_c(chans.begin(), chans.end());
        std::map<User*,bool> exceptions;
 
        exceptions[this] = include_self;
@@ -980,14 +966,14 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
                                u->Write(line);
                }
        }
-       for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
+       for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v)
        {
-               Channel* c = *v;
+               Channel* c = (*v)->chan;
                const UserMembList* ulist = c->GetUsers();
                for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
                {
                        LocalUser* u = IS_LOCAL(i->first);
-                       if (u && !u->quitting && u->already_sent != LocalUser::already_sent_id)
+                       if (u && u->already_sent != LocalUser::already_sent_id)
                        {
                                u->already_sent = LocalUser::already_sent_id;
                                u->Write(line);
@@ -1006,7 +992,7 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
        const std::string normalMessage = ":" + this->GetFullHost() + " QUIT :" + normal_text;
        const std::string operMessage = ":" + this->GetFullHost() + " QUIT :" + oper_text;
 
-       UserChanList include_c(chans);
+       IncludeChanList include_c(chans.begin(), chans.end());
        std::map<User*,bool> exceptions;
 
        FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions));
@@ -1021,13 +1007,13 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
                                u->Write(u->IsOper() ? operMessage : normalMessage);
                }
        }
-       for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
+       for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v)
        {
-               const UserMembList* ulist = (*v)->GetUsers();
+               const UserMembList* ulist = (*v)->chan->GetUsers();
                for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
                {
                        LocalUser* u = IS_LOCAL(i->first);
-                       if (u && !u->quitting && (u->already_sent != uniq_id))
+                       if (u && (u->already_sent != uniq_id))
                        {
                                u->already_sent = uniq_id;
                                u->Write(u->IsOper() ? operMessage : normalMessage);
@@ -1088,7 +1074,7 @@ void User::SendText(const std::string& linePrefix, std::stringstream& textStream
  */
 bool User::SharesChannelWith(User *other)
 {
-       if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL))
+       if ((this->registered != REG_ALL) || (other->registered != REG_ALL))
                return false;
 
        /* Outer loop */
@@ -1097,7 +1083,7 @@ bool User::SharesChannelWith(User *other)
                /* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
                 * by replacing it with a map::find which *should* be more efficient
                 */
-               if ((*i)->HasUser(other))
+               if ((*i)->chan->HasUser(other))
                        return true;
        }
        return false;
@@ -1253,7 +1239,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
 
                        if (regdone && !c->config->getString("password").empty())
                        {
-                               if (ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash")))
+                               if (!ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash")))
                                {
                                        ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Bad password, skipping");
                                        continue;
@@ -1278,9 +1264,10 @@ void LocalUser::SetClass(const std::string &explicit_name)
 void User::PurgeEmptyChannels()
 {
        // firstly decrement the count on each channel
-       for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
+       for (UCListIter i = this->chans.begin(); i != this->chans.end(); )
        {
-               Channel* c = *f;
+               Channel* c = (*i)->chan;
+               ++i;
                c->DelUser(this);
        }