X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fserver.h;h=1aacdc2d97a9514f4235e71183e81b904de5700c;hb=635cb9d65f6d7f6758ae8ed874da00c8d94b6e39;hp=3d88547344d55ac863e35d9f7fc1ae4bbab7a89c;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/server.h b/include/server.h
index 3d8854734..1aacdc2d9 100644
--- a/include/server.h
+++ b/include/server.h
@@ -1,6 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -22,25 +24,50 @@
 class CoreExport Server : public classbase
 {
  protected:
+	/** The unique identifier for this server. */
+	const std::string id;
+
 	/** The name of this server
 	 */
 	const std::string name;
 
-	/** The description of this server
+	/** The description of this server.
+	 * This can be updated by the protocol module (for remote servers) or by a rehash (for the local server).
 	 */
-	const std::string description;
+	std::string description;
 
 	/** True if this server is ulined
 	 */
 	bool uline;
 
-	/** True if this server is a silent uline, i.e. silent="true" in the uline block
+	/** True if this server is a silent uline, i.e. silent="yes" in the uline block
 	 */
 	bool silentuline;
 
+	/** Allow ConfigReaderThread to update the description on a rehash
+	 */
+	friend class ConfigReaderThread;
+
  public:
-	Server(const std::string& srvname, const std::string& srvdesc)
-		: name(srvname), description(srvdesc), uline(false), silentuline(false) { }
+	Server(const std::string& srvid, const std::string& srvname, const std::string& srvdesc)
+		: id(srvid)
+		, name(srvname)
+		, description(srvdesc)
+		, uline(false)
+		, silentuline(false)
+	{
+	}
+
+	DEPRECATED_METHOD(Server(const std::string& srvname, const std::string& srvdesc))
+		: name(srvname)
+		, description(srvdesc)
+		, uline(false)
+		, silentuline(false)
+	{
+	}
+
+	/** Retrieves the unique identifier for this server (e.g. 36C). */
+	const std::string& GetId() const { return id; }
 
 	/**
 	 * Returns the name of this server
@@ -48,7 +75,7 @@ class CoreExport Server : public classbase
 	 */
 	const std::string& GetName() const { return name; }
 
-	/** Returns the description (GECOS) of this server
+	/** Returns the description of this server
 	 * @return The description of this server
 	 */
 	const std::string& GetDesc() const { return description; }