Changed to strchr

[user/henk/code/inspircd.git] / src / modules / m_spanningtree.cpp

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index d5802909bccc3567a9418e0b19941eb155103a3a..bf50b463b7584832ec584858c9d75617f32354ce 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -47,10 +47,6 @@ enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED };
 typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
 extern user_hash clientlist;
 
-const char* OneToEither[] = { "PRIVMSG", "NOTICE", NULL };
-const char* OneToMany[] = { "NICK", "QUIT", "JOIN", "PART", "MODE", "INVITE", "KICK", "KILL", NULL };
-const char* OneToOne[] = { "REHASH", "DIE", "TRACE", "WHOIS", NULL };
-
 class TreeServer;
 class TreeSocket;
 
@@ -296,6 +292,8 @@ class TreeSocket : public InspSocket
        ServerState LinkState;
        std::string InboundServerName;
        std::string InboundDescription;
+       int num_lost_users;
+       int num_lost_servers;
        
  public:
 
@@ -381,6 +379,7 @@ class TreeSocket : public InspSocket
                }
                // Now we've whacked the kids, whack self
                log(DEBUG,"Deleted %s",Current->GetName().c_str());
+               num_lost_servers++;
                bool quittingpeople = true;
                while (quittingpeople)
                {
@@ -391,6 +390,7 @@ class TreeSocket : public InspSocket
                                {
                                        log(DEBUG,"Quitting user %s of server %s",u->second->nick,u->second->server);
                                        Srv->QuitUser(u->second,Current->GetName()+" "+std::string(Srv->GetServerName()));
+                                       num_lost_users++;
                                        quittingpeople = true;
                                        break;
                                }
@@ -404,20 +404,23 @@ class TreeSocket : public InspSocket
                {
                        std::deque<std::string> params;
                        params.push_back(Current->GetName());
-                       params.push_back(":"+reason);
+                       params.push_back(reason);
                        DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());
                        if (Current->GetParent() == TreeRoot)
                        {
-                               Srv->SendOpers("Server \002"+Current->GetName()+"\002 SQUIT: "+reason);
+                               Srv->SendOpers("Server \002"+Current->GetName()+"\002 split: "+reason);
                        }
                        else
                        {
                                Srv->SendOpers("Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
                        }
+                       num_lost_servers = 0;
+                       num_lost_users = 0;
                        SquitServer(Current);
                        Current->Tidy();
                        Current->GetParent()->DelChild(Current);
                        delete Current;
+                       WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
                }
                else
                {
@@ -728,7 +731,7 @@ class TreeSocket : public InspSocket
 
        bool ProcessLine(std::string line)
        {
-               Srv->SendToModeMask("o",WM_AND,"inbound-line: '"+line+"'");
+               Srv->Log(DEBUG,"inbound-line: '"+line+"'");
 
                std::deque<std::string> params = this->Split(line);
                std::string command = "";
@@ -904,7 +907,7 @@ class TreeSocket : public InspSocket
                {
                        std::deque<std::string> params;
                        params.push_back(quitserver);
-                       params.push_back(":Remote host closed the connection");
+                       params.push_back("Remote host closed the connection");
                        DoOneToAllButSender(Srv->GetServerName(),"SQUIT",params,quitserver);
                        Squit(s,"Remote host closed the connection");
                }
@@ -925,7 +928,14 @@ bool DoOneToAllButSender(std::string prefix, std::string command, std::deque<std
        std::string FullLine = ":" + prefix + " " + command;
        for (unsigned int x = 0; x < params.size(); x++)
        {
-               FullLine = FullLine + " " + params[x];
+               if (!strchr(params[x].c_str(),' '))
+               {
+                       FullLine = FullLine + " " + params[x];
+               }
+               else
+               {
+                       FullLine = FullLine + " :" + params[x];
+               }
        }
        for (unsigned int x = 0; x < TreeRoot->ChildCount(); x++)
        {
@@ -949,7 +959,14 @@ bool DoOneToMany(std::string prefix, std::string command, std::deque<std::string
        std::string FullLine = ":" + prefix + " " + command;
        for (unsigned int x = 0; x < params.size(); x++)
        {
-               FullLine = FullLine + " " + params[x];
+               if (!strchr(params[x].c_str(),' '))
+               {
+                       FullLine = FullLine + " " + params[x];
+               }
+               else
+               {
+                       FullLine = FullLine + " :" + params[x];
+               }
        }
        for (unsigned int x = 0; x < TreeRoot->ChildCount(); x++)
        {
@@ -971,7 +988,14 @@ bool DoOneToOne(std::string prefix, std::string command, std::deque<std::string>
                std::string FullLine = ":" + prefix + " " + command;
                for (unsigned int x = 0; x < params.size(); x++)
                {
-                       FullLine = FullLine + " " + params[x];
+                       if (!strchr(params[x].c_str(),' '))
+                       {
+                               FullLine = FullLine + " " + params[x];
+                       }
+                       else
+                       {
+                               FullLine = FullLine + " :" + params[x];
+                       }
                }
                if (Route->GetSocket())
                {
@@ -1218,10 +1242,21 @@ class ModuleSpanningTree : public Module
                                std::deque<std::string> params;
                                params.clear();
                                params.push_back(d->nick);
-                               params.push_back(":"+text);
+                               params.push_back(text);
                                DoOneToOne(user->nick,"PRIVMSG",params,d->server);
                        }
                }
+               else
+               {
+                       if (std::string(user->server) == Srv->GetServerName())
+                       {
+                               chanrec *c = (chanrec*)dest;
+                               std::deque<std::string> params;
+                               params.push_back(c->name);
+                               params.push_back(text);
+                               DoOneToMany(user->nick,"PRIVMSG",params);
+                       }
+               }
        }
 
        virtual void OnUserJoin(userrec* user, chanrec* channel)