All of insp now builds with -pedantic (theres some warnings to squash in modules...

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

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 76270c650befeff99b4becfdf6cf15af7b416380..5355e18557135f4b6b9f0a2899e02776f5dd6819 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -130,7 +130,7 @@ class ModuleSSLOpenSSL : public Module
        ModuleSSLOpenSSL(InspIRCd* Me)
        : Module(Me), PublicInstance(Me)
        {
-               ServerInstance->Modules->PublishInterface("InspSocketHook", this);
+               ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
 
                // Not rehashable...because I cba to reduce all the sizes of existing buffers.
                inbufsize = ServerInstance->Config->NetBufferSize;
@@ -152,7 +152,7 @@ class ModuleSSLOpenSSL : public Module
                OnRehash(NULL,"ssl");
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                if (param != "ssl")
                        return;
@@ -301,13 +301,13 @@ class ModuleSSLOpenSSL : public Module
        {
                if (target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
 
                        if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports))
                        {
                                // User is using SSL, they're a local user, and they're using one of *our* SSL ports.
                                // Potentially there could be multiple SSL modules loaded at once on different ports.
-                               userrec::QuitUser(ServerInstance, user, "SSL module unloading");
+                               User::QuitUser(ServerInstance, user, "SSL module unloading");
                        }
                        if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
                        {
@@ -356,7 +356,7 @@ class ModuleSSLOpenSSL : public Module
                        char* ret = "OK";
                        try
                        {
-                               ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                               ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
                        }
                        catch (ModuleException &e)
                        {
@@ -367,7 +367,7 @@ class ModuleSSLOpenSSL : public Module
                }
                else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
                {
-                       return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                       return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
                }
                else if (strcmp("IS_HSDONE", request->GetId()) == 0)
                {
@@ -382,7 +382,7 @@ class ModuleSSLOpenSSL : public Module
                        issl_session* session = &sessions[ISR->Sock->GetFd()];
                        if (session->sess)
                        {
-                               VerifyCertificate(session, (InspSocket*)ISR->Sock);
+                               VerifyCertificate(session, (BufferedSocket*)ISR->Sock);
                                return "OK";
                        }
                }
@@ -510,10 +510,6 @@ class ModuleSSLOpenSSL : public Module
                        {
                                int ret = DoRead(session);
 
-                               ServerInstance->Log(DEBUG, "<***> DoRead count: " + ConvToStr(count));
-                               ServerInstance->Log(DEBUG, "<***> DoRead ret: " + ConvToStr(ret));
-                               ServerInstance->Log(DEBUG, "<***> DoRead session->inbufoffset: " + ConvToStr(session->inbufoffset));
-
                                if (ret > 0)
                                {
                                        if (count <= session->inbufoffset)
@@ -535,13 +531,9 @@ class ModuleSSLOpenSSL : public Module
                                                // Zero the offset, as there's nothing there..
                                                session->inbufoffset = 0;
                                        }
-
                                        return 1;
                                }
-                               else
-                               {
-                                       return ret;
-                               }
+                               return ret;
                        }
                }
 
@@ -676,7 +668,7 @@ class ModuleSSLOpenSSL : public Module
        }
 
        // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
-       virtual void OnWhois(userrec* source, userrec* dest)
+       virtual void OnWhois(User* source, User* dest)
        {
                if (!clientactive)
                        return;
@@ -688,7 +680,7 @@ class ModuleSSLOpenSSL : public Module
                }
        }
 
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+       virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
        {
                // check if the linking module wants to know about OUR metadata
                if (extname == "ssl")
@@ -708,7 +700,7 @@ class ModuleSSLOpenSSL : public Module
                // check if its our metadata key, and its associated with a user
                if ((target_type == TYPE_USER) && (extname == "ssl"))
                {
-                       userrec* dest = (userrec*)target;
+                       User* dest = (User*)target;
                        // if they dont already have an ssl flag, accept the remote server's
                        if (!dest->GetExt(extname, dummy))
                        {
@@ -722,9 +714,7 @@ class ModuleSSLOpenSSL : public Module
                int ret;
 
                if (session->outbound)
-               {
                        ret = SSL_connect(session->sess);
-               }
                else
                        ret = SSL_accept(session->sess);
 
@@ -756,7 +746,7 @@ class ModuleSSLOpenSSL : public Module
                {
                        // Handshake complete.
                        // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
-                       userrec* u = ServerInstance->FindDescriptor(session->fd);
+                       User* u = ServerInstance->FindDescriptor(session->fd);
                        if (u)
                        {
                                if (!u->GetExt("ssl", dummy))
@@ -771,10 +761,6 @@ class ModuleSSLOpenSSL : public Module
                }
                else if (ret == 0)
                {
-                       int ssl_err = SSL_get_error(session->sess, ret);
-                       char buf[1024];
-                       ERR_print_errors_fp(stderr);
-                       ServerInstance->Log(DEBUG,"Handshake fail 2: %d: %s", ssl_err, ERR_error_string(ssl_err,buf));
                        CloseSession(session);
                        return true;
                }
@@ -782,7 +768,7 @@ class ModuleSSLOpenSSL : public Module
                return true;
        }
 
-       virtual void OnPostConnect(userrec* user)
+       virtual void OnPostConnect(User* user)
        {
                // This occurs AFTER OnUserConnect so we can be sure the
                // protocol module has propagated the NICK message.
@@ -809,10 +795,12 @@ class ModuleSSLOpenSSL : public Module
                //OnRawSocketWrite(session->fd, NULL, 0);
                EventHandler* eh = ServerInstance->FindDescriptor(session->fd);
                if (eh)
+               {
                        ServerInstance->SE->WantWrite(eh);
+               }
        }
 
-       virtual void OnBufferFlushed(userrec* user)
+       virtual void OnBufferFlushed(User* user)
        {
                if (user->GetExt("ssl"))
                {
@@ -903,4 +891,4 @@ static int error_callback(const char *str, size_t len, void *u)
        return 0;
 }
 
-MODULE_INIT(ModuleSSLOpenSSL);
+MODULE_INIT(ModuleSSLOpenSSL)