Add m_ircv3_chghost which implements the IRCv3.2 chghost extension

3 files changed, 80 insertions, 2 deletions

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index a25b3e390..52a8f5eeb 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -878,6 +878,9 @@
 # hostcycle: If loaded, when a user gets a host or ident set, it will
 # cycle them in all their channels. If not loaded it will simply change
 # their host/ident without cycling them.
+# This module is compatible with the ircv3_chghost module. Clients
+# supporting the chghost extension will get the chghost message instead
+# of seeing a host cycle.
 #<module name="hostcycle">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -971,6 +974,14 @@
 #<module name="ircv3_capnotify">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+# IRCv3 chghost module: Provides the chghost IRCv3.2 extension which
+# allows capable clients to learn when the host/ident of another user
+# changes without cycling the user. This module is compatible with the
+# hostcycle module. If both are loaded, clients supporting the chghost
+# extension will get the chghost message and won't see host cycling.
+#<module name="ircv3_chghost">
+
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Join flood module: Adds support for join flood protection +j X:Y.
 # Closes the channel for 60 seconds if X users join in Y seconds.
 #<module name="joinflood">
diff --git a/src/modules/m_hostcycle.cpp b/src/modules/m_hostcycle.cpp
index d4def6473..b33c101ef 100644
--- a/src/modules/m_hostcycle.cpp
+++ b/src/modules/m_hostcycle.cpp
@@ -19,12 +19,15 @@
 
 
 #include "inspircd.h"
+#include "modules/cap.h"
 
 class ModuleHostCycle : public Module
 {
+	Cap::Reference chghostcap;
+
 	/** Send fake quit/join/mode messages for host or ident cycle.
 	 */
-	static void DoHostCycle(User* user, const std::string& newident, const std::string& newhost, const char* quitmsg)
+	void DoHostCycle(User* user, const std::string& newident, const std::string& newhost, const char* quitmsg)
 	{
 		// GetFullHost() returns the original data at the time this function is called
 		const std::string quitline = ":" + user->GetFullHost() + " QUIT :" + quitmsg;
@@ -40,7 +43,7 @@ class ModuleHostCycle : public Module
 		for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 		{
 			LocalUser* u = IS_LOCAL(i->first);
-			if (u && !u->quitting)
+			if ((u) && (!u->quitting) && (!chghostcap.get(u)))
 			{
 				if (i->second)
 				{
@@ -80,6 +83,8 @@ class ModuleHostCycle : public Module
 					continue;
 				if (u->already_sent == silent_id)
 					continue;
+				if (chghostcap.get(u))
+					continue;
 
 				if (u->already_sent != seen_id)
 				{
@@ -95,6 +100,11 @@ class ModuleHostCycle : public Module
 	}
 
  public:
+	ModuleHostCycle()
+		: chghostcap(this, "chghost")
+	{
+	}
+
 	void OnChangeIdent(User* user, const std::string& newident) CXX11_OVERRIDE
 	{
 		DoHostCycle(user, newident, user->dhost, "Changing ident");
diff --git a/src/modules/m_ircv3_chghost.cpp b/src/modules/m_ircv3_chghost.cpp
new file mode 100644
index 000000000..af3503108
--- /dev/null
+++ b/src/modules/m_ircv3_chghost.cpp
@@ -0,0 +1,57 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/ircv3.h"
+
+class ModuleIRCv3ChgHost : public Module
+{
+	Cap::Capability cap;
+
+	void DoChgHost(User* user, const std::string& ident, const std::string& host)
+	{
+		std::string line(1, ':');
+		line.append(user->GetFullHost()).append(" CHGHOST ").append(ident).append(1, ' ').append(host);
+		IRCv3::WriteNeighborsWithCap(user, line, cap);
+	}
+
+ public:
+	ModuleIRCv3ChgHost()
+		: cap(this, "chghost")
+	{
+	}
+
+	void OnChangeIdent(User* user, const std::string& newident) CXX11_OVERRIDE
+	{
+		DoChgHost(user, newident, user->dhost);
+	}
+
+	void OnChangeHost(User* user, const std::string& newhost) CXX11_OVERRIDE
+	{
+		DoChgHost(user, user->ident, newhost);
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides the chghost IRCv3.2 extension", VF_VENDOR);
+	}
+};
+
+MODULE_INIT(ModuleIRCv3ChgHost)