diff options
| author |  Sadie Powell | 2023-02-28 16:32:27 +0000 |
|---|---|---|
| committer | Sadie Powell | 2023-02-28 16:32:27 +0000 |
| commit | 166a47ac68ab571ca1aacaaf8c0edfff26f8d59e (patch) | |
| tree | 8547b7d9652b66cd51425b6c9474f4148db489b1 /src/modules/m_spanningtree/capab.cpp | |
| parent | Remove an unnecessary function call in the pbkdf2 module. (diff) | |
Remove GetSID, rename sid to ServerId.
Diffstat (limited to 'src/modules/m_spanningtree/capab.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index a59a73a3b..d0b974131 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -568,7 +568,12 @@ bool TreeSocket::Capab(const CommandBase::Params& params) if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING)) { this->SendCapabilities(2); - this->WriteLine("SERVER " + ServerInstance->Config->ServerName + " " + TreeSocket::MakePass(capab->link->SendPass, capab->theirchallenge) + " 0 " + ServerInstance->Config->GetSID() + " :" + ServerInstance->Config->ServerDesc); + this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}", + ServerInstance->Config->ServerName, + TreeSocket::MakePass(capab->link->SendPass, capab->theirchallenge), + ServerInstance->Config->ServerId, + ServerInstance->Config->ServerDesc + )); } } else @@ -577,7 +582,12 @@ bool TreeSocket::Capab(const CommandBase::Params& params) if (this->LinkState == CONNECTING) { this->SendCapabilities(2); - this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); + this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}", + ServerInstance->Config->ServerName, + capab->link->SendPass, + ServerInstance->Config->ServerId, + ServerInstance->Config->ServerDesc + )); } } } |