m_spanningtree Remove unused parameters from the server introduction message

This does not affect the initial SERVER message containing the password

4 files changed, 3 insertions, 8 deletions

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index c3ef2676c..cbe864275 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -306,7 +306,7 @@ class CommandSave : public ServerCommand
 class CommandServer : public ServerOnlyServerCommand<CommandServer>
 {
  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
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index e42ab5e67..a8d76becc 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -139,7 +139,6 @@ void TreeSocket::SendServerInfo(TreeServer* from)
  * (and any of ITS servers too) of what servers we know about.
  * If at any point any of these servers already exist on the other
  * end, our connection may be terminated.
- * The hopcount parameter (3rd) is deprecated, and is always 0.
  */
 void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
 {
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 8350547f0..db23466c0 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -34,9 +34,7 @@
 CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, std::vector<std::string>& params)
 {
 	const std::string& servername = params[0];
-	// password is not used for a remote server
-	// hopcount is not used (ever)
-	const std::string& sid = params[3];
+	const std::string& sid = params[1];
 	const std::string& description = params.back();
 	TreeSocket* socket = ParentOfThis->GetSocket();
 
@@ -198,7 +196,6 @@ CommandServer::Builder::Builder(TreeServer* server)
 	: CmdBuilder(server->GetParent()->GetID(), "SERVER")
 {
 	push(server->GetName());
-	push_raw(" * 0 ");
-	push_raw(server->GetID());
+	push(server->GetID());
 	push_last(server->GetDesc());
 }
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 65dd9cc5b..e5989bd28 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -382,6 +382,5 @@ void TreeSocket::FinishAuth(const std::string& remotename, const std::string& re
 
 	this->DoBurst(MyRoot);
 
-	// This will send a * in place of the password/hmac
 	CommandServer::Builder(MyRoot).Forward(MyRoot);
 }