Added support for NOTICE

[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 65b99c6503f020d1aff6d25da69775c3933d8f0f..cd35e824d882e20a3005d2a772e5874d2df2e5a9 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -47,16 +47,13 @@ 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;
 
 bool DoOneToOne(std::string prefix, std::string command, std::deque<std::string> params, std::string target);
 bool DoOneToAllButSender(std::string prefix, std::string command, std::deque<std::string> params, std::string omit);
 bool DoOneToMany(std::string prefix, std::string command, std::deque<std::string> params);
+bool DoOneToAllButSenderRaw(std::string data,std::string omit);
 
 class TreeServer
 {
@@ -296,6 +293,8 @@ class TreeSocket : public InspSocket
        ServerState LinkState;
        std::string InboundServerName;
        std::string InboundDescription;
+       int num_lost_users;
+       int num_lost_servers;
        
  public:
 
@@ -381,6 +380,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 +391,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 +405,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
                {
@@ -621,6 +625,7 @@ class TreeSocket : public InspSocket
                }
                TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL);
                ParentOfThis->AddChild(Node);
+               params[3] = ":" + params[3];
                DoOneToAllButSender(prefix,"SERVER",params,prefix);
                Srv->SendOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
                return true;
@@ -694,7 +699,7 @@ class TreeSocket : public InspSocket
                return false;
        }
 
-       std::deque<std::string> Split(std::string line)
+       std::deque<std::string> Split(std::string line, bool stripcolon)
        {
                std::deque<std::string> n;
                std::stringstream s(line);
@@ -728,9 +733,8 @@ class TreeSocket : public InspSocket
 
        bool ProcessLine(std::string line)
        {
-               Srv->SendToModeMask("o",WM_AND,"inbound-line: '"+line+"'");
-
-               std::deque<std::string> params = this->Split(line);
+               Srv->Log(DEBUG,"inbound-line: '"+line+"'");
+               std::deque<std::string> params = this->Split(line,true);
                std::string command = "";
                std::string prefix = "";
                if (((params[0].c_str())[0] == ':') && (params.size() > 1))
@@ -786,7 +790,7 @@ class TreeSocket : public InspSocket
                                        params.push_back(InboundServerName);
                                        params.push_back("*");
                                        params.push_back("1");
-                                       params.push_back(InboundDescription);
+                                       params.push_back(":"+InboundDescription);
                                        DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,InboundServerName);
                                        this->DoBurst(Node);
                                }
@@ -872,7 +876,7 @@ class TreeSocket : public InspSocket
                                                        return true;
                                                }
                                        }
-                                       return DoOneToAllButSender(prefix,command,params,sourceserv);
+                                       return DoOneToAllButSenderRaw(line,sourceserv);
 
                                }
                                return true;
@@ -918,6 +922,21 @@ class TreeSocket : public InspSocket
        }
 };
 
+bool DoOneToAllButSenderRaw(std::string data,std::string omit)
+{
+       for (unsigned int x = 0; x < TreeRoot->ChildCount(); x++)
+       {
+               TreeServer* Route = TreeRoot->GetChild(x);
+               if ((Route->GetSocket()) && (Route->GetName() != omit) && (BestRouteTo(omit) != Route))
+               {
+                       TreeSocket* Sock = Route->GetSocket();
+                       log(DEBUG,"Sending RAW to %s",Route->GetName().c_str());
+                       Sock->WriteLine(data);
+               }
+       }
+       return true;
+}
+
 bool DoOneToAllButSender(std::string prefix, std::string command, std::deque<std::string> params, std::string omit)
 {
        log(DEBUG,"ALLBUTONE: Comes from %s SHOULD NOT go back to %s",prefix.c_str(),omit.c_str());
@@ -1206,6 +1225,33 @@ class ModuleSpanningTree : public Module
                return 0;
        }
 
+       virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text)
+       {
+               if (target_type == TYPE_USER)
+               {
+                       userrec* d = (userrec*)dest;
+                       if ((std::string(d->server) != Srv->GetServerName()) && (std::string(user->server) == Srv->GetServerName()))
+                       {
+                               std::deque<std::string> params;
+                               params.clear();
+                               params.push_back(d->nick);
+                               params.push_back(":"+text);
+                               DoOneToOne(user->nick,"NOTICE",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,"NOTICE",params);
+                       }
+               }
+       }
+
        virtual void OnUserMessage(userrec* user, void* dest, int target_type, std::string text)
        {
                if (target_type == TYPE_USER)
@@ -1222,6 +1268,17 @@ class ModuleSpanningTree : public Module
                                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)