Remove CMD_LOCALONLY, enforce use of GetRouting for routed commands

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11671 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/ctables.h b/include/ctables.h
index 95db50b1a14317f41cacf10fe1a647a8d8a7d5ff..b57a29b4dd6ad5529d33652b0ee7236e26762067 100644 (file)
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -21,7 +21,6 @@ enum CmdResult
        CMD_FAILURE = 0,        /* Command exists, but failed */
        CMD_SUCCESS = 1,        /* Command exists, and succeeded */
        CMD_INVALID = 2         /* Command doesnt exist at all! */
-#define CMD_LOCALONLY CMD_FAILURE
 };
 
 /** Translation types for translation of parameters to UIDs.
@@ -172,22 +171,18 @@ class CoreExport Command : public Extensible
         * @param parameters The parameters for the command.
         * @param user The user who issued the command.
         * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-        * If the command succeeds but should remain local to this server,
-        * return CMD_LOCALONLY.
         */
        virtual CmdResult Handle(const std::vector<std::string>& parameters, User* user) = 0;
 
        virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               return ROUTE_BROADCAST;
+               return ROUTE_LOCALONLY;
        }
 
        /** Handle an internal request from another command, the core, or a module
         * @param Command ID
         * @param Zero or more parameters, whos form is specified by the command ID.
         * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-        * If the command succeeds but should remain local to this server,
-        * return CMD_LOCALONLY.
         */
        virtual CmdResult HandleInternal(const unsigned int /* id */, const std::deque<classbase*>& /* params */)
        {
@@ -199,8 +194,6 @@ class CoreExport Command : public Extensible
         * @param parameters The parameters given
         * @param servername The server name which issued the command
         * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-        * If the command succeeds but should remain local to this server,
-        * return CMD_LOCALONLY.
         */
        virtual CmdResult HandleServer(const std::vector<std::string>& /* parameters */, const std::string& /* servername */)
        {

diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 5f7c83f3cf1a2273b12c39ddda5bdef7505f4be9..063e18798ee69c8fac94a18633fef22419b3272d 100644 (file)
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -37,6 +37,11 @@ class CommandAlltime : public Command
                /* we want this routed out! */
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 28c7f80f305d5e3916af50f33f5183318b5f2c39..543f5d8a1e536cf754d777f2e03b3d59c91c65e9 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -196,7 +196,7 @@ public:
                {
                        if (IS_LOCAL(user))
                                ListAccept(user);
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else if (tok[0] == '-')
                {

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index a38c9cc40f4184f96f3240ba28d5da30e93c7641..025540d9f67952916ca5df00b710bc076253f435 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -153,6 +153,11 @@ class CommandCBan : public Command
 
                return CMD_FAILURE;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleCBan : public Module

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 4c1c35257de04c10805a4cd5e6ae2e715d0ed6e7..41c2154cca250bbb8ccf8ea78a873bc308bea16d 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -78,7 +78,7 @@ class CommandWebirc : public Command
                                                        ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str());
                                                user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
                                                user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
-                                               return CMD_LOCALONLY;
+                                               return CMD_SUCCESS;
                                        }
                                }
                        }

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 8c3429d9babbdec42e4446cc84826a8f7b00bb89..407ef7ef352c8722c6345075251832a41ec992e9 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -51,7 +51,7 @@ class CommandClones : public Command
 
                user->WriteServ(clonesstr + " END");
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 9514cd80990bc51d57b4014993397c66a4d324cc..1da88c3d5f3dca75ad81a4f43b131c07161e5d00 100644 (file)
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -58,7 +58,7 @@ class CommandClose : public Command
                else
                        user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str());
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 54dd9b0d065f760f09462ccfb0634205270b1df6..b2933aa54dca8c9fd23e06a1fc78dd84b79af571 100644 (file)
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -77,12 +77,12 @@ class CommandTitle : public Command
 
                                user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str());
 
-                               return CMD_LOCALONLY;
+                               return CMD_SUCCESS;
                        }
                }
 
                user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str());
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 
 };

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 2ba28d933905ea3b67ca22634aace6ae1f3b554d..1348feeb33170b120103d4082c70389813e877b9 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -64,7 +64,7 @@ class CommandCycle : public Command
                                Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
                        }
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index cd43a4539f112b22f8cfc801898afb5852a1caf7..90c63e30d80c25c36822667964f96716b21600f8 100644 (file)
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -199,6 +199,11 @@ class CommandDccallow : public Command
                return CMD_FAILURE;
        }
 
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
+
        void DisplayHelp(User* user)
        {
                user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick.c_str());

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 0d511886c02e3d3e51092439986a41fafd916ef3..ff85dbd67e7b1df97ef0d3bdd8c3736ead14eb5f 100644 (file)
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -43,7 +43,7 @@ class CommandDevoice : public Command
 
                        ServerInstance->SendMode(modes, ServerInstance->FakeClient);
                        ServerInstance->PI->SendMode(c->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
 
                return CMD_FAILURE;

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 36a8c4f950d6bcd1d67cb12e6eab79aeac8c80b4..b2986e4362cbb356e0adbd6b7949766c9a5d84bd 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -112,6 +112,11 @@ class CommandFilter : public Command
        {
                user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick.c_str(), extra_text.c_str());
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class FilterBase : public Module

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 72c8a14d3b092e57be60dbdc6d3af781f6b35ef4..817e9cdfcbf4846f413937aed38831ab6041a68e 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -47,6 +47,11 @@ class CommandGloadmodule : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Handle /GUNLOADMODULE
@@ -80,6 +85,11 @@ class CommandGunloadmodule : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Handle /GRELOADMODULE
@@ -118,6 +128,11 @@ class CommandGreloadmodule : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleGlobalLoad : public Module

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 4c8b0e713e54945cf6ccf66fc4bde4c88bb76a51..fafe19e6e1a51a878ffc37dc1017f57ece013575 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -40,6 +40,11 @@ class CommandGlobops : public Command
                /* route it (ofc :p) */
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleGlobops : public Module

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 6e8f00b44725b9bcf93ea9c8ad04ddf09c44b931..d8492fd5e2aeda292c7b1308dbac241ec0315f8f 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -55,7 +55,7 @@ class CommandJumpserver : public Command
 
                        port = 0;
                        redirect_to.clear();
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
 
                port = 0;
@@ -126,7 +126,7 @@ class CommandJumpserver : public Command
                                        reason.c_str());
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index a13bd6a5cd0b660852e12b6efd74d4180d99b432..718974908247776c49ef8327fe485901b3ad70bf 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -65,6 +65,11 @@ class CommandKnock : public Command
                user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Handles channel mode +K

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 3dff80fdf666b870362befd84263539dcacf248c..ce3ab4c2ba628989109367cb326868fc29ebac41 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -37,7 +37,7 @@ public:
                user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
                /* Dont send to the network */
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
@@ -59,7 +59,7 @@ public:
                user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
                /* Dont send to the network */
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 6267726ef8114bd43ae7e8c32cbc8081d7eb4f88..906d0d1f8ab948dd89753cd3ae61bd14090b8b6b 100644 (file)
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -93,6 +93,11 @@ class CommandOjoin : public Command
                        return CMD_FAILURE;
                }
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Abstraction of NetworkPrefixBase for channel mode +Y

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index e3dafeff39f4a5b843593454aad6f27d19a1977f..6eb3a054021a00df798aa6d782206e0a1d82e9a2 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -35,7 +35,7 @@ CmdResult ShowOperMOTD(User* user)
        user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
        /* don't route me */
-       return CMD_LOCALONLY;
+       return CMD_SUCCESS;
 }
 
 /** Handle /OPERMOTD

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index fcc910073835b70001fb955d8e970cf4052cd3e9..94134e45ea8b962dc504c8de6ed76bf410e5f937 100644 (file)
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -62,7 +62,7 @@ class CommandMkpasswd : public Command
                // Slow down the user if they are trying to flood mkpasswd requests
                user->IncreasePenalty(5);
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index a3c0e8d1359ade1a0bd7cbfe3b163d1cd7640ee9..fcdfa0226036a08970d03cfd919adc22b44a2e88 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -47,7 +47,7 @@ class CommandRandquote : public Command
                        return CMD_FAILURE;
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index b2ddd798df9c0f076dc435f187f0baf3cedb8e1e..007ac024607d6634fd8720788956904526a96210 100644 (file)
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -182,6 +182,11 @@ class CommandRLine : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleRLine : public Module

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 58419934507721c88b1dfe532cc9a32f63b30225..e0e751e7b83dc7a7876ce4510311e30837a01a60 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -34,7 +34,7 @@ class CommandSamode : public Command
                if (ServerInstance->Modes->GetLastParse().length())
                        ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
                this->active = false;
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index a58d4dcdcfd529e7117cc03854f1e0186d909cd5..1436afa3d0e35ae927c62010675630e5dbb321af 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -209,6 +209,11 @@ class CommandSASL : public Command
                }
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleSASL : public Module

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index dfe1450512cbe56eb0d181162e02d855512f05e7..542e8f30d73478aabe9601ad137be5ab0dc3efc7 100644 (file)
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -42,7 +42,7 @@ class CommandSATopic : public Command
                        ServerInstance->SNO->WriteToSnoMask('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
                        ServerInstance->PI->SendSNONotice("A", user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 8442167cfb9c4ba6c785c56fca1d3f3f25a9a5ce..8e397c0e13589946eedd17bb72b70f571d7a2da3 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -53,7 +53,7 @@ class CommandSethost : public Command
                if (user->ChangeDisplayedHost(parameters[0].c_str()))
                {
                        ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
 
                return CMD_FAILURE;

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 03d5f69f9a5719363a50525fc4ac44c95ddb2574..64fd0a6899917ecc105673e77442c1bb9472b12f 100644 (file)
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -49,7 +49,7 @@ class CommandSetident : public Command
                user->ChangeIdent(parameters[0].c_str());
                ServerInstance->SNO->WriteGlobalSno('a', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str());
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 4954e14ddc8c7899e75f9de394a544248dfc2029..17570d989d1a71cf8f99484f369137b380dd5aa1 100644 (file)
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -41,7 +41,7 @@ class CommandSetidle : public Command
                ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds");
                user->WriteNumeric(944, "%s :Idle time set.",user->nick.c_str());
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 6cd94c98268b37e928cdc0f84586e5cd45e3eccf..97bb1cfcfb90fcddef219516fee3b19a7776c6ee 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -46,7 +46,7 @@ class CommandSetname : public Command
                        return CMD_SUCCESS;
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 43359c28a04c4bfce40bd3e969d65cbd57c6e75c..3a5901028a50e9b7f88b4bcbceb66c8969c01e75 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -171,6 +171,11 @@ class CommandShun : public Command
 
                return CMD_FAILURE;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleShun : public Module

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index dd720608fdf573ed2733e1f71c2034f1032eb827..9cf9f6d4ef6e501951ddcb7ce4609a3952cd26cf 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -82,6 +82,11 @@ class CommandSVSSilence : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class CommandSilence : public Command
@@ -112,7 +117,7 @@ class CommandSilence : public Command
                        }
                        user->WriteNumeric(272, "%s :End of Silence List",user->nick.c_str());
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else if (parameters.size() > 0)
                {
@@ -199,7 +204,7 @@ class CommandSilence : public Command
                                return CMD_SUCCESS;
                        }
                }
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 
        /* turn the nice human readable pattern into a mask */

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 2cf4fa3ad58860fb4de074f39a845c433a592f92..1b1f618b8a2907d7bd5640322840b64c4d8f3009 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -68,10 +68,6 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
                Module* srcmodule = thiscmd->creator;
                Version ver = srcmodule->GetVersion();
 
-               // XXX Temporary check to avoid routing cmd_* entries while they default to global routing
-               if (srcmodule->ModuleSourceFile[0] == 'c')
-                       return;
-
                if (!(ver.Flags & VF_COMMON))
                {
                        ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s",

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 2afe8d4f897c8b88422025a5002f16b983809def..7de539905f41b19fd11ecafbca93531e227f7a9d 100644 (file)
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -61,7 +61,6 @@ CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, Use
                        sock->Squit(server_target, std::string("Server quit by ") + user->GetFullRealHost() + " (" + reason + ")");
                        ServerInstance->SE->DelFd(sock);
                        sock->Close();
-                       return CMD_LOCALONLY;
                }
        }
 

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 0f1f04e99cfe99f8676e30ef5ad6c807fe1ee891..715d9110a87a006cce7acd953dc5a82ea606e521 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -45,7 +45,7 @@ class CommandSSLInfo : public Command
                                        user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick.c_str(), cert->GetIssuer().c_str());
                                        user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick.c_str(), cert->GetFingerprint().c_str());
                                }
-                               return CMD_LOCALONLY;
+                               return CMD_SUCCESS;
                        }
                        else
                        {

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 8607745747c0a0028443f9b1fe96d1d5a631d0c4..e8cd82806e59e435e3df6f79e22bd525bc37bebb 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -139,6 +139,11 @@ class CommandSvshold : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleSVSHold : public Module

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index cf14be3e1dde68e4dc12cf4e8fad90765b9f636e..ebff25cb838ace4ad742134d54e06c07d7b269da 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -72,7 +72,7 @@ class CommandSwhois : public Command
                        delete text;
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 
 };

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index cab7f8f6ec5a898828c94f3ccb71dd09d0977f0d..17e9cd50e3befcd2a48b8be5c306af8a784e5e36 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -107,6 +107,11 @@ class CommandTban : public Command
                user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleTimedBans : public Module

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 0efd496c6207ce5a4d69556e14e086d5f061149c..b08d5b6c0dea0f9a49eec99971697990c9006130 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -55,7 +55,7 @@ class CommandTline : public Command
                else
                        user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick.c_str(), n_counted, parameters[0].c_str());
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 73329502934c4e6017d12c9d8432c6811ffddd80..0e9b991a05996e72ed9fab5f3360e86347e1adad 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -74,6 +74,11 @@ class CommandUninvite : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleUninvite : public Module

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 75981b5cc93d19a2dffe50dbebe387bf400c2c13..c58f4a73bae2a3f5525b0b6a8d8972bc24b25fd0 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -49,7 +49,7 @@ class CommandUserip : public Command
                        user->WriteServ(retbuf);
 
                /* Dont send to the network */
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 419b51c9b7a6f2c7565d0f8728196df136696cd4..6c630622cd895a9ce25a8588dae01474f8d3eba6 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -43,7 +43,7 @@ class CommandVhost : public Command
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
                                        user->ChangeDisplayedHost(mask.c_str());
                                        delete Conf;
-                                       return CMD_LOCALONLY;
+                                       return CMD_SUCCESS;
                                }
                        }
                }

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 1cda4484fd6820149783c20e6dc558cceeead89b..31edcc0e21d773944f75ae4576641d1157dc89e4 100644 (file)
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -125,6 +125,11 @@ class CommandSVSWatch : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Handle /WATCH
@@ -182,7 +187,7 @@ class CommandWatch : public Command
                        }
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 
        CmdResult add_watch(User* user, const char* nick)
@@ -240,7 +245,7 @@ class CommandWatch : public Command
                        }
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 
        CommandWatch (InspIRCd* Instance, Module* parent, unsigned int &maxwatch) : Command(Instance,parent,"WATCH",0,0), MAX_WATCH(maxwatch)
@@ -352,7 +357,7 @@ class CommandWatch : public Command
                                }
                        }
                }
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };