aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_connectban.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-11-20 12:49:02 +0000
committerGravatar Sadie Powell2020-11-20 15:45:17 +0000
commit54e0cade5c9ec904bbdc755d8031ed8e22e994f6 (patch)
tree312e579f280e7db2269c3fe754a6c4f423713c0e /src/modules/m_connectban.cpp
parentConvert IRCv3::Replies::Reply#Send[IfCap] to variadic functions. (diff)
parentRelease v3.8.1. (diff)
Merge tag 'v3.8.1' into master.
Diffstat (limited to 'src/modules/m_connectban.cpp')
-rw-r--r--src/modules/m_connectban.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index f79eb0e06..70b66a786 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -3,7 +3,7 @@
*
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2014 Googolplexed <googol@googolplexed.net>
- * Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
@@ -68,6 +68,12 @@ class ModuleConnectBan
{
}
+ void Prioritize() override
+ {
+ Module* corexline = ServerInstance->Modules.Find("core_xline");
+ ServerInstance->Modules.SetPriority(this, I_OnSetUserIP, PRIORITY_AFTER, corexline);
+ }
+
void ReadConfig(ConfigStatus& status) override
{
auto tag = ServerInstance->Config->ConfValue("connectban");
@@ -95,7 +101,7 @@ class ModuleConnectBan
void OnSetUserIP(LocalUser* u) override
{
- if (u->exempt)
+ if (u->exempt || u->quitting)
return;
irc::sockets::cidr_mask mask(u->client_sa, GetRange(u));