ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Splat the unused hops field in the 1206 SERVER message.

Browse Source
This commit is contained in:
Sadie Powell 2024-05-01 13:06:46 +01:00
parent f8f430b845
commit eade37bd93
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/m_spanningtree/capab.cpp
View File

@ -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
));

12
src/modules/m_spanningtree/server.cpp
View File

@ -98,7 +98,8 @@ void CommandServer::HandleExtra(TreeServer* newserver, Params& params)
std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
{
if (params.size() < 5)
size_t offset = proto_version == PROTO_INSPIRCD_3;
if (params.size() < 4+offset)
{
SendError("Protocol error - Not enough parameters for SERVER command");
return nullptr;
@ -106,7 +107,7 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
const std::string& sname = params[0];
const std::string& password = params[1];
const std::string& sid = params[3];
const std::string& sid = params[2+offset];
const std::string& description = params.back();
this->SendCapabilities(2);
@ -170,7 +171,7 @@ bool TreeSocket::Outbound_Reply_Server(CommandBase::Params& params)
* While we're at it, create a treeserver object so we know about them.
* -- w
*/
FinishAuth(params[0], params[3], params.back(), x->Hidden);
FinishAuth(params[0], params[proto_version == PROTO_INSPIRCD_3 ? 3 : 2], params.back(), x->Hidden);
return true;
}
@ -216,15 +217,16 @@ bool TreeSocket::Inbound_Server(CommandBase::Params& params)
{
// Save these for later, so when they accept our credentials (indicated by BURST) we remember them
this->capab->hidden = x->Hidden;
this->capab->sid = params[3];
this->capab->sid = params[proto_version == PROTO_INSPIRCD_3 ? 3 : 2];
this->capab->description = params.back();
this->capab->name = params[0];
// Send our details: Our server name and description and hopcount of 0,
// along with the sendpass from this block.
this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}",
this->WriteLine(INSP_FORMAT("SERVER {} {} {}{} :{}",
ServerInstance->Config->ServerName,
TreeSocket::MakePass(x->SendPass, this->GetTheirChallenge()),
proto_version == PROTO_INSPIRCD_3 ? "0 " : "",
ServerInstance->Config->ServerId,
ServerInstance->Config->ServerDesc
));