Merge insp20

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

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 7ecdaeadc476ee27ac7fb0ff82195518d07d3c01..3047e7e60960ca99089af45a2d6949af416c5e63 100644 (file)
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -130,7 +130,7 @@ class CommandFJoin : public ServerCommand
         * @param newname The new name of the channel; must be the same or a case change of the current name
         */
        static void LowerTS(Channel* chan, time_t TS, const std::string& newname);
-       void ProcessModeUUIDPair(const std::string& item, TreeSocket* src_socket, Channel* chan, irc::modestacker* modestack);
+       void ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, irc::modestacker* modestack);
  public:
        CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
        CmdResult Handle(User* user, std::vector<std::string>& params);
@@ -326,25 +326,31 @@ class CommandSNONotice : public ServerCommand
        CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
-class CommandVersion : public ServerOnlyServerCommand<CommandVersion>
+class CommandBurst : public ServerOnlyServerCommand<CommandBurst>
 {
  public:
-       CommandVersion(Module* Creator) : ServerOnlyServerCommand<CommandVersion>(Creator, "VERSION", 1) { }
+       CommandBurst(Module* Creator) : ServerOnlyServerCommand<CommandBurst>(Creator, "BURST") { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandBurst : public ServerOnlyServerCommand<CommandBurst>
+class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
 {
  public:
-       CommandBurst(Module* Creator) : ServerOnlyServerCommand<CommandBurst>(Creator, "BURST") { }
+       CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
+class CommandSInfo : public ServerOnlyServerCommand<CommandSInfo>
 {
  public:
-       CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
+       CommandSInfo(Module* Creator) : ServerOnlyServerCommand<CommandSInfo>(Creator, "SINFO", 2) { }
        CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+
+       class Builder : public CmdBuilder
+       {
+        public:
+               Builder(TreeServer* server, const char* type, const std::string& value);
+       };
 };
 
 class SpanningTreeCommands
@@ -377,8 +383,8 @@ class SpanningTreeCommands
        CommandServer server;
        CommandSQuit squit;
        CommandSNONotice snonotice;
-       CommandVersion version;
        CommandBurst burst;
        CommandEndBurst endburst;
+       CommandSInfo sinfo;
        SpanningTreeCommands(ModuleSpanningTree* module);
 };