X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcommands.h;h=feecc7dd2b5621aa7f48765f836f361b88249403;hb=afefc6bfe9e184086247fc305a41ef1c21cb136b;hp=741954392eaed739a3840d27a4ca57d0e2d5a642;hpb=da20866cee3bf46b3752122736b684f08e5dba36;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 741954392..feecc7dd2 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -21,6 +21,7 @@
 
 #include "servercommand.h"
 #include "commandbuilder.h"
+#include "remoteuser.h"
 
 /** Handle /RCONNECT
  */
@@ -114,13 +115,13 @@ class CommandOpertype : public UserOnlyServerCommand<CommandOpertype>
 };
 
 class TreeSocket;
+class FwdFJoinBuilder;
 class CommandFJoin : public ServerCommand
 {
 	/** Remove all modes from a channel, including statusmodes (+qaovh etc), simplemodes, parameter modes.
 	 * This does not update the timestamp of the target channel, this must be done seperately.
 	 */
 	static void RemoveStatus(Channel* c);
-	static void ApplyModeStack(User* srcuser, Channel* c, irc::modestacker& stack);
 
 	/**
 	 * Lowers the TS on the given channel: removes all modes, unsets all extensions,
@@ -130,10 +131,11 @@ 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, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin);
  public:
 	CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
 	CmdResult Handle(User* user, std::vector<std::string>& params);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_LOCALONLY; }
 
 	class Builder : public CmdBuilder
 	{
@@ -141,13 +143,25 @@ class CommandFJoin : public ServerCommand
 		 * a message or not
 		 */
 		static const size_t membid_max_digits = 20;
-		static const size_t maxline = 480;
+		static const size_t maxline = 510;
 		std::string::size_type pos;
 
+	protected:
+		void add(Membership* memb, std::string::const_iterator mbegin, std::string::const_iterator mend);
+		bool has_room(std::string::size_type nummodes) const;
+
 	 public:
-		Builder(Channel* chan);
-		void add(Membership* memb);
-		bool has_room(Membership* memb) const;
+		Builder(Channel* chan, TreeServer* source = Utils->TreeRoot);
+		void add(Membership* memb)
+		{
+			add(memb, memb->modes.begin(), memb->modes.end());
+		}
+
+		bool has_room(Membership* memb) const
+		{
+			return has_room(memb->modes.size());
+		}
+
 		void clear();
 		const std::string& finalize();
 	};
@@ -207,6 +221,7 @@ class CommandResync : public ServerOnlyServerCommand<CommandResync>
  public:
 	CommandResync(Module* Creator) : ServerOnlyServerCommand<CommandResync>(Creator, "RESYNC", 1) { }
 	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_LOCALONLY; }
 };
 
 class CommandAway : public UserOnlyServerCommand<CommandAway>
@@ -283,29 +298,31 @@ class CommandPong : public ServerOnlyServerCommand<CommandPong>
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_UNICAST(parameters[0]); }
 };
 
-class CommandPush : public ServerCommand
-{
- public:
-	CommandPush(Module* Creator) : ServerCommand(Creator, "PUSH", 2) { }
-	CmdResult Handle(User* user, std::vector<std::string>& parameters);
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) { return ROUTE_UNICAST(parameters[0]); }
-};
-
 class CommandSave : public ServerCommand
 {
  public:
+	/** Timestamp of the uuid nick of all users who collided and got their nick changed to uuid
+	 */
+	static const time_t SavedTimestamp = 100;
+
 	CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { }
 	CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
 class CommandServer : public ServerOnlyServerCommand<CommandServer>
 {
+	static void HandleExtra(TreeServer* newserver, const std::vector<std::string>& params);
+
  public:
-	CommandServer(Module* Creator) : ServerOnlyServerCommand<CommandServer>(Creator, "SERVER", 5) { }
+	CommandServer(Module* Creator) : ServerOnlyServerCommand<CommandServer>(Creator, "SERVER", 3) { }
 	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 
 	class Builder : public CmdBuilder
 	{
+		void push_property(const char* key, const std::string& val)
+		{
+			push(key).push_raw('=').push_raw(val);
+		}
 	 public:
 		Builder(TreeServer* server);
 	};
@@ -325,25 +342,38 @@ class CommandSNONotice : public ServerCommand
 	CmdResult Handle(User* user, std::vector<std::string>& parameters);
 };
 
-class CommandVersion : public ServerOnlyServerCommand<CommandVersion>
+class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
 {
  public:
-	CommandVersion(Module* Creator) : ServerOnlyServerCommand<CommandVersion>(Creator, "VERSION", 1) { }
+	CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
 	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
 };
 
-class CommandBurst : public ServerOnlyServerCommand<CommandBurst>
+class CommandSInfo : public ServerOnlyServerCommand<CommandSInfo>
 {
  public:
-	CommandBurst(Module* Creator) : ServerOnlyServerCommand<CommandBurst>(Creator, "BURST") { }
+	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 CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
+class CommandNum : public ServerOnlyServerCommand<CommandNum>
 {
  public:
-	CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { }
+	CommandNum(Module* Creator) : ServerOnlyServerCommand<CommandNum>(Creator, "NUM", 3) { }
 	CmdResult HandleServer(TreeServer* server, std::vector<std::string>& parameters);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
+
+	class Builder : public CmdBuilder
+	{
+	 public:
+		Builder(SpanningTree::RemoteUser* target, const Numeric::Numeric& numeric);
+	};
 };
 
 class SpanningTreeCommands
@@ -371,13 +401,12 @@ class SpanningTreeCommands
 	CommandNick nick;
 	CommandPing ping;
 	CommandPong pong;
-	CommandPush push;
 	CommandSave save;
 	CommandServer server;
 	CommandSQuit squit;
 	CommandSNONotice snonotice;
-	CommandVersion version;
-	CommandBurst burst;
 	CommandEndBurst endburst;
+	CommandSInfo sinfo;
+	CommandNum num;
 	SpanningTreeCommands(ModuleSpanningTree* module);
 };