Merge pull request #92 from Robby-/insp20-headers

[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 50fb179463492476ad94e658e193da420bb9c6a7..504f1840b1c7f109e8993ce7b7676c0ebd0df745 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,18 +1,28 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "transport.h"
+#include "ssl.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
@@ -21,7 +31,7 @@
 class SSLMode : public ModeHandler
 {
  public:
-       SSLMode(Module* Creator) : ModeHandler(Creator, 'z', PARAM_NONE, MODETYPE_CHANNEL) { }
+       SSLMode(Module* Creator) : ModeHandler(Creator, "sslonly", 'z', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -34,7 +44,7 @@ class SSLMode : public ModeHandler
                                        const UserMembList* userlist = channel->GetUsers();
                                        for(UserMembCIter i = userlist->begin(); i != userlist->end(); i++)
                                        {
-                                               BufferedSocketCertificateRequest req(i->first, creator, i->first->GetIOHook());
+                                               UserCertificateRequest req(i->first, creator);
                                                req.Send();
                                                if(!req.cert && !ServerInstance->ULine(i->first->server))
                                                {
@@ -83,7 +93,7 @@ class ModuleSSLModes : public Module
        {
                if(chan && chan->IsModeSet('z'))
                {
-                       BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
+                       UserCertificateRequest req(user, this);
                        req.Send();
                        if (req.cert)
                        {
@@ -105,7 +115,7 @@ class ModuleSSLModes : public Module
        {
                if (mask[0] == 'z' && mask[1] == ':')
                {
-                       BufferedSocketCertificateRequest req(user, this, user->GetIOHook());
+                       UserCertificateRequest req(user, this);
                        req.Send();
                        if (req.cert && InspIRCd::Match(req.cert->GetFingerprint(), mask.substr(2)))
                                return MOD_RES_DENY;
@@ -124,7 +134,7 @@ class ModuleSSLModes : public Module
 
        Version GetVersion()
        {
-               return Version("Provides support for unreal-style channel mode +z", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style channel mode +z", VF_VENDOR);
        }
 };