m_ssl_gnutls, m_ssl_openssl Deduplicate Handshake() calling code

[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 0b22788fd6f5df0ade7d873c9b4d072c1faecbbe..f8dc85659b1a82c927faef5d3f691c74ab968047 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -70,7 +70,7 @@ typedef gnutls_certificate_credentials_t gnutls_certificate_credentials;
 typedef gnutls_dh_params_t gnutls_dh_params;
 #endif
 
-enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
+enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_HANDSHAKEN };
 
 #if INSPIRCD_GNUTLS_HAS_VERSION(2, 12, 0)
 #define GNUTLS_NEW_CERT_CALLBACK_API
@@ -657,7 +657,6 @@ class GnuTLSIOHook : public SSLIOHook
                        {
                                user->SetError("Handshake Failed - " + std::string(gnutls_strerror(ret)));
                                CloseSession();
-                               this->status = ISSL_CLOSING;
                                return -1;
                        }
                }
@@ -779,6 +778,22 @@ info_done_dealloc:
                gnutls_x509_crt_deinit(cert);
        }
 
+       // Returns 1 if application I/O should proceed, 0 if it must wait for the underlying protocol to progress, -1 on fatal error
+       int PrepareIO(StreamSocket* sock)
+       {
+               if (status == ISSL_HANDSHAKEN)
+                       return 1;
+               else if (status == ISSL_HANDSHAKING)
+               {
+                       // The handshake isn't finished, try to finish it
+                       return Handshake(sock);
+               }
+
+               CloseSession();
+               sock->SetError("No SSL session");
+               return -1;
+       }
+
        static const char* UnknownIfNULL(const char* str)
        {
                return str ? str : "UNKNOWN";
@@ -875,24 +890,12 @@ info_done_dealloc:
 
        int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE
        {
-               if (!this->sess)
-               {
-                       CloseSession();
-                       user->SetError("No SSL session");
-                       return -1;
-               }
-
-               if (this->status == ISSL_HANDSHAKING)
-               {
-                       // The handshake isn't finished, try to finish it.
-                       int ret = Handshake(user);
-                       if (ret <= 0)
-                               return ret;
-               }
+               // Finish handshake if needed
+               int prepret = PrepareIO(user);
+               if (prepret <= 0)
+                       return prepret;
 
                // If we resumed the handshake then this->status will be ISSL_HANDSHAKEN.
-
-               if (this->status == ISSL_HANDSHAKEN)
                {
                        GnuTLS::DataReader reader(sess);
                        int ret = reader.ret();
@@ -918,32 +921,18 @@ info_done_dealloc:
                                return -1;
                        }
                }
-               else if (this->status == ISSL_CLOSING)
-                       return -1;
-
-               return 0;
        }
 
        int OnStreamSocketWrite(StreamSocket* user, std::string& sendq) CXX11_OVERRIDE
        {
-               if (!this->sess)
-               {
-                       CloseSession();
-                       user->SetError("No SSL session");
-                       return -1;
-               }
-
-               if (this->status == ISSL_HANDSHAKING)
-               {
-                       // The handshake isn't finished, try to finish it.
-                       int ret = Handshake(user);
-                       if (ret <= 0)
-                               return ret;
-               }
+               // Finish handshake if needed
+               int prepret = PrepareIO(user);
+               if (prepret <= 0)
+                       return prepret;
 
+               // Session is ready for transferring application data
                int ret = 0;
 
-               if (this->status == ISSL_HANDSHAKEN)
                {
                        ret = gnutls_record_send(this->sess, sendq.data(), sendq.length());
 
@@ -970,8 +959,6 @@ info_done_dealloc:
                                return -1;
                        }
                }
-
-               return 0;
        }
 
        void TellCiphersAndFingerprint(LocalUser* user)