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

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

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 477113543b575e8a0523d38cc47d6b3b2bb45bac..4b059ca9fbd1388d714434a68b18ca0a95a3fa6e 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -90,7 +90,7 @@ class ModuleSSLGnuTLS : public Module
        ModuleSSLGnuTLS(InspIRCd* Me)
                : Module(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;
@@ -111,7 +111,7 @@ class ModuleSSLGnuTLS : public Module
                gnutls_certificate_set_dh_params(x509_cred, dh_params);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                if(param != "ssl")
                        return;
@@ -247,13 +247,13 @@ class ModuleSSLGnuTLS : public Module
        {
                if(target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
 
                        if(user->GetExt("ssl", dummy) && 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))
                        {
@@ -307,7 +307,7 @@ class ModuleSSLGnuTLS : 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)
                        {
@@ -317,7 +317,7 @@ class ModuleSSLGnuTLS : 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)
                {
@@ -336,7 +336,7 @@ class ModuleSSLGnuTLS : public Module
                                {
                                        if ((Extensible*)ServerInstance->FindDescriptor(ISR->Sock->GetFd()) == (Extensible*)(ISR->Sock))
                                        {
-                                               VerifyCertificate(session, (InspSocket*)ISR->Sock);
+                                               VerifyCertificate(session, (BufferedSocket*)ISR->Sock);
                                                return "OK";
                                        }
                                }
@@ -348,6 +348,10 @@ class ModuleSSLGnuTLS : public Module
 
        virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport)
        {
+               /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
+               if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+                       return;
+
                issl_session* session = &sessions[fd];
 
                session->fd = fd;
@@ -377,6 +381,10 @@ class ModuleSSLGnuTLS : public Module
 
        virtual void OnRawSocketConnect(int fd)
        {
+               /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
+               if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+                       return;
+
                issl_session* session = &sessions[fd];
 
                session->fd = fd;
@@ -395,6 +403,10 @@ class ModuleSSLGnuTLS : public Module
 
        virtual void OnRawSocketClose(int fd)
        {
+               /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
+               if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+                       return;
+
                CloseSession(&sessions[fd]);
 
                EventHandler* user = ServerInstance->SE->GetRef(fd);
@@ -410,6 +422,10 @@ class ModuleSSLGnuTLS : public Module
 
        virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
        {
+               /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
+               if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+                       return 0;
+
                issl_session* session = &sessions[fd];
 
                if (!session->sess)
@@ -501,6 +517,10 @@ class ModuleSSLGnuTLS : public Module
 
        virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
        {
+               /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
+               if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+                       return 0;
+
                issl_session* session = &sessions[fd];
                const char* sendbuffer = buffer;
 
@@ -552,13 +572,13 @@ class ModuleSSLGnuTLS : public Module
                MakePollWrite(session);
 
                /* Who's smart idea was it to return 1 when we havent written anything?
-                * This fucks the buffer up in InspSocket :p
+                * This fucks the buffer up in BufferedSocket :p
                 */
                return ret < 1 ? 0 : ret;
        }
 
        // :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;
@@ -570,7 +590,7 @@ class ModuleSSLGnuTLS : 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")
@@ -590,7 +610,7 @@ class ModuleSSLGnuTLS : 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))
                        {
@@ -634,7 +654,7 @@ class ModuleSSLGnuTLS : 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* extendme = ServerInstance->FindDescriptor(session->fd);
+                       User* extendme = ServerInstance->FindDescriptor(session->fd);
                        if (extendme)
                        {
                                if (!extendme->GetExt("ssl", dummy))
@@ -651,7 +671,7 @@ class ModuleSSLGnuTLS : public Module
                }
        }
 
-       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.
@@ -686,7 +706,7 @@ class ModuleSSLGnuTLS : public Module
                        ServerInstance->SE->WantWrite(eh);
        }
 
-       virtual void OnBufferFlushed(userrec* user)
+       virtual void OnBufferFlushed(User* user)
        {
                if (user->GetExt("ssl"))
                {
@@ -844,4 +864,4 @@ class ModuleSSLGnuTLS : public Module
 
 };
 
-MODULE_INIT(ModuleSSLGnuTLS);
+MODULE_INIT(ModuleSSLGnuTLS)