From ee7ac5aaede95eb82ecc948d0e52ad01ddeaa6c9 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 18 Oct 2017 12:41:37 +0100 Subject: Clean up OnCleanup. - Switch to using ExtensionItem::ExtensibleType for the type instead of TargetTypeFlags. - Pass the extensible to OnCleanup as an Extensible pointer instead of a void pointer. - Call OnCleanup for memberships as well as channels and users. - Rewrite event documentation to remove outdated references. --- src/modules/extra/m_ssl_gnutls.cpp | 4 ++-- src/modules/extra/m_ssl_mbedtls.cpp | 4 ++-- src/modules/extra/m_ssl_openssl.cpp | 4 ++-- src/modules/m_banredirect.cpp | 4 ++-- src/modules/m_websocket.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules') diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 8b414230a..953570945 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1333,9 +1333,9 @@ class ModuleSSLGnuTLS : public Module ServerInstance->GenRandom = &ServerInstance->HandleGenRandom; } - void OnCleanup(int target_type, void* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE { - if(target_type == TYPE_USER) + if (type == ExtensionItem::EXT_USER) { LocalUser* user = IS_LOCAL(static_cast(item)); diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index f3b5adfd5..28ebb708b 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -904,9 +904,9 @@ class ModuleSSLmbedTLS : public Module } } - void OnCleanup(int target_type, void* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE { - if (target_type != TYPE_USER) + if (type != ExtensionItem::EXT_USER) return; LocalUser* user = IS_LOCAL(static_cast(item)); diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 68f75c87f..4cd8ab29a 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -962,9 +962,9 @@ class ModuleSSLOpenSSL : public Module } } - void OnCleanup(int target_type, void* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE { - if (target_type == TYPE_USER) + if (type == ExtensionItem::EXT_USER) { LocalUser* user = IS_LOCAL((User*)item); diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index f98cbd420..5202051f3 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -239,9 +239,9 @@ class ModuleBanRedirect : public Module { } - void OnCleanup(int target_type, void* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE { - if(target_type == TYPE_CHANNEL) + if (type == ExtensionItem::EXT_CHANNEL) { Channel* chan = static_cast(item); BanRedirectList* redirects = re.extItem.get(chan); diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index 399b0b017..a7457f788 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -386,9 +386,9 @@ class ModuleWebSocket : public Module sha1 = &hash; } - void OnCleanup(int target_type, void* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE { - if (target_type != TYPE_USER) + if (type != ExtensionItem::EXT_USER) return; LocalUser* user = IS_LOCAL(static_cast(item)); -- cgit v1.2.3