From eade37bd93b13a8652b08a7cc97dc0a443aae99c Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Wed, 1 May 2024 13:06:46 +0100
Subject: Splat the unused hops field in the 1206 SERVER message.

---
 src/modules/m_spanningtree/capab.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_spanningtree/capab.cpp')

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 255b77ad8..676f2b572 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -579,9 +579,10 @@ bool TreeSocket::Capab(const CommandBase::Params& params)
 			if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING))
 			{
 				this->SendCapabilities(2);
-				this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}",
+				this->WriteLine(INSP_FORMAT("SERVER {} {} {}{} :{}",
 					ServerInstance->Config->ServerName,
 					TreeSocket::MakePass(capab->link->SendPass, capab->theirchallenge),
+					proto_version == PROTO_INSPIRCD_3 ? "0 " : "",
 					ServerInstance->Config->ServerId,
 					ServerInstance->Config->ServerDesc
 				));
@@ -593,9 +594,10 @@ bool TreeSocket::Capab(const CommandBase::Params& params)
 			if (this->LinkState == CONNECTING)
 			{
 				this->SendCapabilities(2);
-				this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}",
+				this->WriteLine(INSP_FORMAT("SERVER {} {} {}{} :{}",
 					ServerInstance->Config->ServerName,
 					capab->link->SendPass,
+					proto_version == PROTO_INSPIRCD_3 ? "0 " : "",
 					ServerInstance->Config->ServerId,
 					ServerInstance->Config->ServerDesc
 				));
-- 
cgit v1.3.1-10-gc9f91