AMD64 warning 'fix' which tested fine when I added it seems to now...stop things...

[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 a4a41cbddd5cb48134c2f6820d41ad4d85d24a63..3048795dcc523180442e95f1f0accfa6725ff0d1 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -96,7 +96,7 @@ class ModuleSSLOpenSSL : public Module
                OnRehash("ssl");
        }
        
-       virtual void OnRehash(std::string param)
+       virtual void OnRehash(const std::string &param)
        {
                if(param != "ssl")
                        return;
@@ -233,7 +233,7 @@ class ModuleSSLOpenSSL : public Module
                }
        }
        
-       virtual void OnUnloadModule(Module* mod, std::string name)
+       virtual void OnUnloadModule(Module* mod, const std::string &name)
        {
                if(mod == this)
                {
@@ -257,7 +257,7 @@ class ModuleSSLOpenSSL : public Module
                List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnGlobalConnect] = 1;
        }
 
-       virtual void OnRawSocketAccept(int fd, std::string ip, int localport)
+       virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport)
        {
                issl_session* session = &sessions[fd];
        
@@ -528,13 +528,14 @@ class ModuleSSLOpenSSL : public Module
        // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
        virtual void OnWhois(userrec* source, userrec* dest)
        {
-               if(dest->GetExt("ssl"))
+               // Bugfix, only send this numeric for *our* SSL users
+               if(dest->GetExt("ssl") && isin(dest->port, listenports))
                {
                        WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick);
                }
        }
        
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, std::string extname)
+       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
        {
                // check if the linking module wants to know about OUR metadata
                if(extname == "ssl")
@@ -549,7 +550,7 @@ class ModuleSSLOpenSSL : public Module
                }
        }
        
-       virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata)
+       virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
        {
                // check if its our metadata key, and its associated with a user
                if ((target_type == TYPE_USER) && (extname == "ssl"))
@@ -598,7 +599,12 @@ class ModuleSSLOpenSSL : public Module
                        log(DEBUG, "m_ssl_openssl.so: Handshake completed");
                        
                        // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
-                       Srv->FindDescriptor(session->fd)->Extend("ssl", "ON");
+                       userrec* u = Srv->FindDescriptor(session->fd);
+                       if (u)
+                       {
+                               if (!u->GetExt("ssl"))
+                                       u->Extend("ssl", "ON");
+                       }
                        
                        session->status = ISSL_OPEN;