Convert the ISO 8859-2 nationalchars files to codepage configs.

[user/henk/code/inspircd.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 6782187fe2989aaddbfbaf6ac48fbd8fb8e7158d..dbc51e37c3ee971d5c502c58c4f98ced4e33618b 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1,8 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 nia <nia@netbsd.org>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2016-2017, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
@@ -20,9 +27,9 @@
  */
 
 
-#include <signal.h>
-#include "exitcodes.h"
 #include "inspircd.h"
+#include "exitcodes.h"
+#include <signal.h>
 
 void InspIRCd::SignalHandler(int signal)
 {
@@ -64,8 +71,8 @@ void InspIRCd::Rehash(const std::string& uuid)
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
        if (getFullVersion)
-               return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
-       return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+               return INSPIRCD_VERSION ". " + Config->ServerName + " :[" + Config->sid + "] " + Config->CustomVersion;
+       return INSPIRCD_BRANCH ". " + Config->GetServerName() + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
@@ -155,6 +162,27 @@ std::string UIDGenerator::GetUID()
        return current_uid;
 }
 
+void ISupportManager::AppendValue(std::string& buffer, const std::string& value)
+{
+       // If this token has no value then we have nothing to do.
+       if (value.empty())
+               return;
+
+       // This function implements value escaping according to the rules of the ISUPPORT draft:
+       // https://tools.ietf.org/html/draft-brocklesby-irc-isupport-03
+       buffer.push_back('=');
+       for (std::string::const_iterator iter = value.begin(); iter != value.end(); ++iter)
+       {
+               // The value must be escaped if:
+               //   (1) It is a banned character in an IRC <middle> parameter (NUL, LF, CR, SPACE).
+               //   (2) It has special meaning within an ISUPPORT token (EQUALS, BACKSLASH).
+               if (*iter == '\0' || *iter == '\n' || *iter == '\r' || *iter == ' ' || *iter == '=' || *iter == '\\')
+                       buffer.append(InspIRCd::Format("\\x%X", *iter));
+               else
+                       buffer.push_back(*iter);
+       }
+}
+
 void ISupportManager::Build()
 {
        /**
@@ -164,21 +192,22 @@ void ISupportManager::Build()
        std::map<std::string, std::string> tokens;
 
        tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
-       tokens["CASEMAPPING"] = "rfc1459";
+       tokens["CASEMAPPING"] = ServerInstance->Config->CaseMapping;
        tokens["CHANLIMIT"] = InspIRCd::Format("#:%u", ServerInstance->Config->MaxChans);
-       tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
        tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
        tokens["CHANTYPES"] = "#";
-       tokens["ELIST"] = "MU";
+       tokens["HOSTLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxHost);
        tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
+       tokens["LINELEN"] = ConvToStr(ServerInstance->Config->Limits.MaxLine);
        tokens["MAXTARGETS"] = ConvToStr(ServerInstance->Config->MaxTargets);
        tokens["MODES"] = ConvToStr(ServerInstance->Config->Limits.MaxModes);
+       tokens["NAMELEN"] = ConvToStr(ServerInstance->Config->Limits.MaxReal);
        tokens["NETWORK"] = ServerInstance->Config->Network;
        tokens["NICKLEN"] = ConvToStr(ServerInstance->Config->Limits.NickMax);
        tokens["PREFIX"] = ServerInstance->Modes->BuildPrefixes();
        tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
        tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
-       tokens["VBANLIST"];
+       tokens["USERLEN"] = ConvToStr(ServerInstance->Config->Limits.IdentMax);
 
        // Modules can add new tokens and also edit or remove existing tokens
        FOREACH_MOD(On005Numeric, (tokens));
@@ -200,10 +229,7 @@ void ISupportManager::Build()
        {
                numeric.push(it->first);
                std::string& token = numeric.GetParams().back();
-
-               // If this token has a value then append a '=' char after the name and then the value itself
-               if (!it->second.empty())
-                       token.append(1, '=').append(it->second);
+               AppendValue(token, it->second);
 
                token_count++;