Misc removal of pointless Extend strings

[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 b7b22538421e5d74145b6687a2c8b470b639bfa4..1c90428b23434c861ea6cef8b4a1414701a0e3c1 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -301,7 +301,7 @@ class ModuleSSLGnuTLS : public Module
        {
                if(target_type == TYPE_USER)
                {
-                       User* user = (User*)item;
+                       User* user = static_cast<User*>(item);
 
                        if (user->GetIOHook() == this)
                        {
@@ -357,7 +357,7 @@ class ModuleSSLGnuTLS : public Module
 
        virtual const char* OnRequest(Request* request)
        {
-               ISHRequest* ISR = (ISHRequest*)request;
+               ISHRequest* ISR = static_cast<ISHRequest*>(request);
                if (strcmp("IS_NAME", request->GetId()) == 0)
                {
                        return "gnutls";
@@ -367,7 +367,7 @@ class ModuleSSLGnuTLS : public Module
                        const char* ret = "OK";
                        try
                        {
-                               ret = ISR->Sock->AddIOHook((Module*)this) ? "OK" : NULL;
+                               ret = ISR->Sock->AddIOHook(this) ? "OK" : NULL;
                        }
                        catch (ModuleException &e)
                        {
@@ -394,9 +394,9 @@ class ModuleSSLGnuTLS : public Module
                                issl_session* session = &sessions[ISR->Sock->GetFd()];
                                if (session->sess)
                                {
-                                       if ((Extensible*)ServerInstance->SE->GetRef(ISR->Sock->GetFd()) == (Extensible*)(ISR->Sock))
+                                       if (static_cast<Extensible*>(ServerInstance->SE->GetRef(ISR->Sock->GetFd())) == static_cast<Extensible*>(ISR->Sock))
                                        {
-                                               VerifyCertificate(session, (BufferedSocket*)ISR->Sock);
+                                               VerifyCertificate(session, ISR->Sock);
                                                return "OK";
                                        }
                                }
@@ -438,7 +438,7 @@ class ModuleSSLGnuTLS : public Module
                gnutls_credentials_set(session->sess, GNUTLS_CRD_CERTIFICATE, x509_cred);
                gnutls_dh_set_prime_bits(session->sess, dh_bits);
 
-               gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket.
+               gnutls_transport_set_ptr(session->sess, reinterpret_cast<gnutls_transport_ptr_t>(fd)); // Give gnutls the fd for the socket.
 
                gnutls_certificate_server_set_request(session->sess, GNUTLS_CERT_REQUEST); // Request client certificate if any.
 
@@ -458,7 +458,7 @@ class ModuleSSLGnuTLS : public Module
                gnutls_set_default_priority(session->sess); // Avoid calling all the priority functions, defaults are adequate.
                gnutls_credentials_set(session->sess, GNUTLS_CRD_CERTIFICATE, x509_cred);
                gnutls_dh_set_prime_bits(session->sess, dh_bits);
-               gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket.
+               gnutls_transport_set_ptr(session->sess, reinterpret_cast<gnutls_transport_ptr_t>(fd)); // Give gnutls the fd for the socket.
 
                Handshake(session, fd);
        }
@@ -668,8 +668,7 @@ class ModuleSSLGnuTLS : public Module
                        EventHandler *extendme = ServerInstance->SE->GetRef(fd);
                        if (extendme)
                        {
-                               if (!extendme->GetExt("ssl"))
-                                       extendme->Extend("ssl", "ON");
+                               extendme->Extend("ssl");
                        }
 
                        // Change the seesion state
@@ -697,9 +696,9 @@ class ModuleSSLGnuTLS : public Module
                                user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick.c_str(), cipher.c_str());
                        }
 
-                       ServerInstance->PI->SendMetaData(user, TYPE_USER, "ssl", "ON");
+                       ServerInstance->PI->SendMetaData(user, "ssl", "ON");
                        if (certdata)
-                               ServerInstance->PI->SendMetaData(user, TYPE_USER, "ssl_cert", certdata->GetMetaLine().c_str());
+                               ServerInstance->PI->SendMetaData(user, "ssl_cert", certdata->GetMetaLine().c_str());
                }
        }