3rd time lucky? Fix again for setsockopt.

[user/henk/code/inspircd.git] / src / modules / m_banredirect.cpp

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 11ce93c9a4054f3c13a919bde779b49bc9f246be..540155b81fc3ff69cdec37ec0c59e2318589d610 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -39,7 +39,7 @@ class BanRedirect : public ModeWatcher
 {
  public:
        SimpleExtItem<BanRedirectList> extItem;
-       BanRedirect(Module* parent) : ModeWatcher('b', MODETYPE_CHANNEL),
+       BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL),
                extItem("banredirect", parent)
        {
        }
@@ -213,8 +213,8 @@ class ModuleBanRedirect : public Module
                OnRehash(NULL);
 
                Extensible::Register(&re.extItem);
-               Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup };
-               ServerInstance->Modules->Attach(list, this, 4);
+               Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
+               ServerInstance->Modules->Attach(list, this, 3);
        }
 
        virtual void OnChannelDelete(Channel* chan)
@@ -283,12 +283,12 @@ class ModuleBanRedirect : public Module
                                 * Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost?
                                 */
 
-                               if (ExceptionModule)
+                               ModResult result;
+                               FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, chan));
+                               if (result == MOD_RES_ALLOW)
                                {
-                                       ListModeRequest n(this, ExceptionModule, user, chan);
-                                       /* Users with ban exceptions are allowed to join without being redirected */
-                                       if (n.Send())
-                                               return MOD_RES_PASSTHRU;
+                                       // they have a ban exception
+                                       return MOD_RES_PASSTHRU;
                                }
 
                                std::string ipmask(user->nick);
@@ -328,7 +328,6 @@ class ModuleBanRedirect : public Module
 
        virtual ~ModuleBanRedirect()
        {
-               ServerInstance->Modes->DelModeWatcher(&re);
        }
 
        virtual Version GetVersion()