More const ref fixes

[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 977c27dda6ce230083b3a08d6eb979718557d9b3..5155b4f6cc623b7d0de67714bbcc77353d2ea6fe 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -13,7 +13,7 @@
 
 /* $ModDesc: Provides SSL support for clients */
 /* $CompileFlags: `libgnutls-config --cflags` */
-/* $LinkerFlags: `libgnutls-config --libs` */
+/* $LinkerFlags: `libgnutls-config --libs` `perl ../gnutls_rpath.pl` */
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
 
@@ -86,7 +86,7 @@ class ModuleSSLGnuTLS : public Module
                gnutls_certificate_set_dh_params(x509_cred, dh_params);
        }
        
-       virtual void OnRehash(std::string param)
+       virtual void OnRehash(const std::string &param)
        {
                if(param != "ssl")
                        return;
@@ -172,6 +172,8 @@ class ModuleSSLGnuTLS : public Module
                        
                // This may be on a large (once a day or week) timer eventually.
                GenerateDHParams();
+               
+               delete Conf;
        }
        
        void GenerateDHParams()
@@ -187,7 +189,6 @@ class ModuleSSLGnuTLS : public Module
        
        virtual ~ModuleSSLGnuTLS()
        {
-               delete Conf;
                gnutls_dh_params_deinit(dh_params);
                gnutls_certificate_free_credentials(x509_cred);
                gnutls_global_deinit();
@@ -209,7 +210,7 @@ class ModuleSSLGnuTLS : public Module
                }
        }
        
-       virtual void OnUnloadModule(Module* mod, std::string name)
+       virtual void OnUnloadModule(Module* mod, const std::string &name)
        {
                if(mod == this)
                {
@@ -230,10 +231,10 @@ class ModuleSSLGnuTLS : public Module
        void Implements(char* List)
        {
                List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
-               List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = 1;
+               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];
        
@@ -447,13 +448,14 @@ class ModuleSSLGnuTLS : 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 a Secure Connection", source->nick, dest->nick);
+                       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")
@@ -468,7 +470,7 @@ class ModuleSSLGnuTLS : 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"))
@@ -522,15 +524,40 @@ class ModuleSSLGnuTLS : public Module
                        log(DEBUG, "m_ssl_gnutls.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* extendme = Srv->FindDescriptor(session->fd);
+                       if (extendme)
+                       {
+                               if (!extendme->GetExt("ssl"))
+                                       extendme->Extend("ssl", "ON");
+                       }
+
+                       // Change the seesion state
                        session->status = ISSL_HANDSHAKEN;
                        
+                       // Finish writing, if any left
                        MakePollWrite(session);
                        
                        return true;
                }
        }
+
+       virtual void OnGlobalConnect(userrec* user)
+       {
+               // This occurs AFTER OnUserConnect so we can be sure the
+               // protocol module has propogated the NICK message.
+               if ((user->GetExt("ssl")) && (IS_LOCAL(user)))
+               {
+                       // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW.
+                       std::deque<std::string>* metadata = new std::deque<std::string>;
+                       metadata->push_back(user->nick);
+                       metadata->push_back("ssl");             // The metadata id
+                       metadata->push_back("ON");              // The value to send
+                       Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
+                       event->Send();                          // Trigger the event. We don't care what module picks it up.
+                       delete event;
+                       delete metadata;
+               }
+       }
        
        void MakePollWrite(issl_session* session)
        {