aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/configreader.h6
-rw-r--r--src/configreader.cpp12
-rw-r--r--src/coremods/core_info/cmd_version.cpp2
-rw-r--r--src/inspircd.cpp12
-rw-r--r--src/modules/m_httpd_stats.cpp2
-rw-r--r--src/modules/m_ircv3_msgid.cpp2
-rw-r--r--src/modules/m_spanningtree/capab.cpp14
-rw-r--r--src/modules/m_spanningtree/commandbuilder.h2
-rw-r--r--src/modules/m_spanningtree/encap.cpp2
-rw-r--r--src/modules/m_spanningtree/main.cpp2
-rw-r--r--src/modules/m_spanningtree/ping.cpp2
-rw-r--r--src/modules/m_spanningtree/pong.cpp2
-rw-r--r--src/modules/m_spanningtree/server.cpp7
-rw-r--r--src/modules/m_spanningtree/treeserver.cpp2
14 files changed, 40 insertions, 29 deletions
diff --git a/include/configreader.h b/include/configreader.h
index 04b339915..f564e79bd 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -504,16 +504,12 @@ public:
* makes code simpler. 0AA, 1BB etc with letters are reserved
* for services use.
*/
- std::string sid;
+ std::string ServerId;
/** Construct a new ServerConfig
*/
ServerConfig();
- /** Get server ID as string with required leading zeroes
- */
- const std::string& GetSID() const { return sid; }
-
/** Retrieves the server name which should be shown to users. */
const std::string& GetServerName() const { return HideServer.empty() ? ServerName : HideServer; }
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 79be8145e..d500a0fbd 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -294,20 +294,20 @@ void ServerConfig::Fill()
{
// Read the <server> config.
const auto& server = ConfValue("server");
- if (sid.empty())
+ if (ServerId.empty())
{
ServerName = server->getString("name", GetServerHost(), InspIRCd::IsFQDN);
- sid = server->getString("id");
- if (!sid.empty() && !InspIRCd::IsSID(sid))
- throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+ ServerId = server->getString("id");
+ if (!ServerId.empty() && !InspIRCd::IsSID(ServerId))
+ throw CoreException(ServerId + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
}
else
{
if (server->getString("name", ServerName, 1) != ServerName)
throw CoreException("You must restart to change the server name!");
- if (server->getString("id", sid, 1) != sid)
+ if (server->getString("id", ServerId, 1) != ServerId)
throw CoreException("You must restart to change the server id!");
}
ServerDesc = server->getString("description", ServerName, 1);
@@ -381,8 +381,8 @@ void ServerConfig::Apply(ServerConfig* old, const std::string& useruid)
* These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
*/
this->CaseMapping = old->CaseMapping;
+ this->ServerId = old->ServerId;
this->ServerName = old->ServerName;
- this->sid = old->sid;
this->cmdline = old->cmdline;
}
diff --git a/src/coremods/core_info/cmd_version.cpp b/src/coremods/core_info/cmd_version.cpp
index a17a6e250..dee4e9ffc 100644
--- a/src/coremods/core_info/cmd_version.cpp
+++ b/src/coremods/core_info/cmd_version.cpp
@@ -45,7 +45,7 @@ void CommandVersion::BuildNumerics()
operversion.GetParams().clear();
operversion.push(INSPIRCD_VERSION ".");
operversion.push(ServerInstance->Config->ServerName);
- operversion.push("[" + ServerInstance->Config->GetSID() + "] " + ServerInstance->Config->CustomVersion);
+ operversion.push("[" + ServerInstance->Config->ServerId + "] " + ServerInstance->Config->CustomVersion);
}
CmdResult CommandVersion::Handle(User* user, const Params& parameters)
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 84f615528..28070f4e3 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -530,14 +530,14 @@ InspIRCd::InspIRCd(int argc, char** argv)
}
// If we don't have a SID, generate one based on the server name and the server description
- if (Config->sid.empty())
- Config->sid = UIDGenerator::GenerateSID(Config->ServerName, Config->ServerDesc);
+ if (Config->ServerId.empty())
+ Config->ServerId = UIDGenerator::GenerateSID(Config->ServerName, Config->ServerDesc);
// Initialize the UID generator with our sid
- this->UIDGen.init(Config->sid);
+ this->UIDGen.init(Config->ServerId);
// Create the server user for this server
- this->FakeClient = new FakeUser(Config->sid, Config->ServerName, Config->ServerDesc);
+ this->FakeClient = new FakeUser(Config->ServerId, Config->ServerName, Config->ServerDesc);
// This is needed as all new XLines are marked pending until ApplyLines() is called
this->XLines->ApplyLines();
@@ -559,7 +559,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
Exit(EXIT_STATUS_LOG);
}
- std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->GetSID() << "] with " << SocketEngine::GetMaxFds() << " max open sockets" << std::endl;
+ std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->ServerId << "] with " << SocketEngine::GetMaxFds() << " max open sockets" << std::endl;
#ifndef _WIN32
if (!Config->cmdline.nofork)
@@ -618,7 +618,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
DropRoot();
Logs.Normal("STARTUP", "Startup complete as '{}'[{}], {} max open sockets", Config->ServerName,
- Config->GetSID(), SocketEngine::GetMaxFds());
+ Config->ServerId, SocketEngine::GetMaxFds());
}
void InspIRCd::UpdateTime()
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index fcc0e65d7..d160386ab 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -140,7 +140,7 @@ namespace Stats
void ServerInfo(XMLSerializer& serializer)
{
serializer.BeginBlock("server")
- .Attribute("id", ServerInstance->Config->GetSID())
+ .Attribute("id", ServerInstance->Config->ServerId)
.Attribute("name", ServerInstance->Config->ServerName)
.Attribute("description", ServerInstance->Config->ServerDesc)
.Attribute("customversion", ServerInstance->Config->CustomVersion)
diff --git a/src/modules/m_ircv3_msgid.cpp b/src/modules/m_ircv3_msgid.cpp
index 3e08d5e4a..96c6b2f47 100644
--- a/src/modules/m_ircv3_msgid.cpp
+++ b/src/modules/m_ircv3_msgid.cpp
@@ -47,7 +47,7 @@ class MsgIdGenerator final
public:
MsgIdGenerator()
- : strid(INSP_FORMAT("{}~{}~", ServerInstance->Config->GetSID(), ServerInstance->startup_time))
+ : strid(INSP_FORMAT("{}~{}~", ServerInstance->Config->ServerId, ServerInstance->startup_time))
, baselen(strid.length())
{
}
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
+ ));
}
}
}
diff --git a/src/modules/m_spanningtree/commandbuilder.h b/src/modules/m_spanningtree/commandbuilder.h
index e724d8d95..f9369e2ed 100644
--- a/src/modules/m_spanningtree/commandbuilder.h
+++ b/src/modules/m_spanningtree/commandbuilder.h
@@ -49,7 +49,7 @@ protected:
public:
CmdBuilder(const char* cmd)
{
- content.append(ServerInstance->Config->GetSID());
+ content.append(ServerInstance->Config->ServerId);
push(cmd);
FireEvent(ServerInstance->FakeClient->server, cmd, tags);
}
diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 4e4524789..be4244ce6 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -30,7 +30,7 @@
/** ENCAP */
CmdResult CommandEncap::Handle(User* user, Params& params)
{
- if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
+ if (ServerInstance->Config->ServerId == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
{
CommandBase::Params plist(params.begin() + 2, params.end());
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 3f5885297..23f4f11a6 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -876,7 +876,7 @@ ModuleSpanningTree::~ModuleSpanningTree()
{
ServerInstance->PI = &ServerInstance->DefaultProtocolInterface;
- auto* newsrv = new Server(ServerInstance->Config->GetSID(), ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
+ auto* newsrv = new Server(ServerInstance->Config->ServerId, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
SetLocalUsersServer(newsrv);
delete Utils;
diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp
index d1e0f645c..5fc8423bf 100644
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -29,7 +29,7 @@
CmdResult CommandPing::Handle(User* user, Params& params)
{
- if (params[0] == ServerInstance->Config->GetSID())
+ if (params[0] == ServerInstance->Config->ServerId)
{
// PING for us, reply with a PONG
CmdBuilder reply("PONG");
diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index 7d137eef9..62ff44c5b 100644
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -35,7 +35,7 @@ CmdResult CommandPong::HandleServer(TreeServer* server, CommandBase::Params& par
server->FinishBurst();
}
- if (params[0] == ServerInstance->Config->GetSID())
+ if (params[0] == ServerInstance->Config->ServerId)
{
// PONG for us
server->OnPong();
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 7ca57f114..d68b39b17 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -222,7 +222,12 @@ bool TreeSocket::Inbound_Server(CommandBase::Params& params)
// Send our details: Our server name and description and hopcount of 0,
// along with the sendpass from this block.
- this->WriteLine("SERVER " + ServerInstance->Config->ServerName + " " + TreeSocket::MakePass(x->SendPass, this->GetTheirChallenge()) + " 0 " + ServerInstance->Config->GetSID() + " :" + ServerInstance->Config->ServerDesc);
+ this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}",
+ ServerInstance->Config->ServerName,
+ TreeSocket::MakePass(x->SendPass, this->GetTheirChallenge()),
+ ServerInstance->Config->ServerId,
+ ServerInstance->Config->ServerDesc
+ ));
// move to the next state, we are now waiting for THEM.
this->LinkState = WAIT_AUTH_2;
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 2925ad1d9..f7e28ae6e 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -36,7 +36,7 @@
* no socket associated with it. Its version string is our own local version.
*/
TreeServer::TreeServer()
- : Server(ServerInstance->Config->GetSID(), ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc)
+ : Server(ServerInstance->Config->ServerId, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc)
, pingtimer(this)
, ServerUser(ServerInstance->FakeClient)
, age(ServerInstance->Time())
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-07-07 06:07:51 +0000