Flexible SendQ

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

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index a0725206930d44e77106932d17f03e4f63b3c57d..0538f9f626cc450914dfeec81a1d30d3294e0b77 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -21,7 +21,7 @@
 class SSLMode : public ModeHandler
 {
  public:
-       SSLMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'z', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       SSLMode(Module* Creator) : ModeHandler(Creator, 'z', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -31,8 +31,8 @@ class SSLMode : public ModeHandler
                        {
                                if (IS_LOCAL(source))
                                {
-                                       CUList* userlist = channel->GetUsers();
-                                       for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
+                                       const UserMembList* userlist = channel->GetUsers();
+                                       for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++)
                                        {
                                                BufferedSocketCertificateRequest req(i->first, creator, i->first->GetIOHook());
                                                req.Send();
@@ -70,8 +70,8 @@ class ModuleSSLModes : public Module
        SSLMode sslm;
 
  public:
-       ModuleSSLModes(InspIRCd* Me)
-               : Module(Me), sslm(Me, this)
+       ModuleSSLModes()
+               : sslm(this)
        {
                if (!ServerInstance->Modes->AddMode(&sslm))
                        throw ModuleException("Could not add new modes!");
@@ -101,12 +101,15 @@ class ModuleSSLModes : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnCheckBan(User *user, Channel *c)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
-               req.Send();
-               if (req.cert)
-                       return c->GetExtBanStatus(req.cert->GetFingerprint(), 'z');
+               if (mask[0] == 'z' && mask[1] == ':')
+               {
+                       BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
+                       req.Send();
+                       if (req.cert && InspIRCd::Match(req.cert->GetFingerprint(), mask.substr(2)))
+                               return MOD_RES_DENY;
+               }
                return MOD_RES_PASSTHRU;
        }
 
@@ -122,7 +125,7 @@ class ModuleSSLModes : public Module
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style channel mode +z", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };