Fixes found by removing User inheritance from StreamSocket

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

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index bf02ed87918686e8613c4b41aa6107d37b5456d5..0ab749703bfec88eb9de3aa9d569fad102278488 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -12,14 +12,14 @@
  */
 
 #include "inspircd.h"
-#include "transport.h"
+#include "ssl.h"
 
 /* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */
 
 class SSLCertExt : public ExtensionItem {
  public:
        SSLCertExt(Module* parent) : ExtensionItem("ssl_cert", parent) {}
-       ssl_cert* get(const Extensible* item)
+       ssl_cert* get(const Extensible* item) const
        {
                return static_cast<ssl_cert*>(get_raw(item));
        }
@@ -29,12 +29,12 @@ class SSLCertExt : public ExtensionItem {
                delete old;
        }
 
-       std::string serialize(Module* requestor, const Extensible* container, void* item)
+       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
        {
                return static_cast<ssl_cert*>(item)->GetMetaLine();
        }
 
-       void unserialize(Module* requestor, Extensible* container, const std::string& value)
+       void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
        {
                ssl_cert* cert = new ssl_cert;
                set(container, cert);
@@ -72,7 +72,7 @@ class CommandSSLInfo : public Command
  public:
        SSLCertExt CertExt;
 
-       CommandSSLInfo(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SSLINFO", 0, 1), CertExt(Creator)
+       CommandSSLInfo(Module* Creator) : Command(Creator, "SSLINFO", 1), CertExt(Creator)
        {
                this->syntax = "<nick>";
        }
@@ -116,27 +116,29 @@ class ModuleSSLInfo : public Module
        CommandSSLInfo cmd;
 
  public:
-       ModuleSSLInfo(InspIRCd* Me)
-               : Module(Me), cmd(Me, this)
+       ModuleSSLInfo()
+               : cmd(this)
        {
                ServerInstance->AddCommand(&cmd);
 
-               Extensible::Register(&cmd.CertExt);
+               ServerInstance->Extensions.Register(&cmd.CertExt);
 
-               Implementation eventlist[] = { I_OnSyncUser, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnWhois, I_OnPreCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->PublishInterface("SSLCertInfo", this);
        }
 
-       virtual ~ModuleSSLInfo()
+       ~ModuleSSLInfo()
        {
+               ServerInstance->Modules->UnpublishInterface("SSLCertInfo", this);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
                return Version("SSL Certificate Utilities", VF_VENDOR);
        }
 
-       virtual void OnWhois(User* source, User* dest)
+       void OnWhois(User* source, User* dest)
        {
                if (cmd.CertExt.get(dest))
                {
@@ -158,13 +160,13 @@ class ModuleSSLInfo : public Module
                return false;
        }
 
-       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                irc::string pcmd = command.c_str();
 
                if ((pcmd == "OPER") && (validated))
                {
-                       ConfigReader cf(ServerInstance);
+                       ConfigReader cf;
                        char TheHost[MAXBUF];
                        char TheIP[MAXBUF];
                        std::string LoginName;
@@ -224,19 +226,18 @@ class ModuleSSLInfo : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       const char* OnRequest(Request* request)
+       void OnRequest(Request& request)
        {
-               if (strcmp("GET_CERT", request->GetId()) == 0)
+               if (strcmp("GET_CERT", request.id) == 0)
                {
-                       BufferedSocketCertificateRequest* req = static_cast<BufferedSocketCertificateRequest*>(request);
-                       req->cert = cmd.CertExt.get(req->item);
+                       SSLCertificateRequest& req = static_cast<SSLCertificateRequest&>(request);
+                       req.cert = cmd.CertExt.get(req.item);
                }
-               else if (strcmp("SET_CERT", request->GetId()) == 0)
+               else if (strcmp("SET_CERT", request.id) == 0)
                {
-                       BufferedSocketFingerprintSubmission* req = static_cast<BufferedSocketFingerprintSubmission*>(request);
-                       cmd.CertExt.set(req->item, req->cert);
+                       SSLCertSubmission& req = static_cast<SSLCertSubmission&>(request);
+                       cmd.CertExt.set(req.item, req.cert);
                }
-               return NULL;
        }
 };