Don't wait for TLS close response

Our current architecture doesn't support waiting for a response here, so
don't even try or we'll just get an error.

diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
index d33a76e2351ee5ab6dfa014378176d6beb6d9165..5337d8d6ba82e695fc14cd89f0516eb117161b24 100644 (file)
--- a/common/rfb/CSecurityTLS.cxx
+++ b/common/rfb/CSecurityTLS.cxx
@@ -104,7 +104,9 @@ void CSecurityTLS::shutdown()
 {
   if (session) {
     int ret;
-    ret = gnutls_bye(session, GNUTLS_SHUT_RDWR);
+    // FIXME: We can't currently wait for the response, so we only send
+    //        our close and hope for the best
+    ret = gnutls_bye(session, GNUTLS_SHUT_WR);
     if ((ret != GNUTLS_E_SUCCESS) && (ret != GNUTLS_E_INVALID_SESSION))
       vlog.error("TLS shutdown failed: %s", gnutls_strerror(ret));
   }

diff --git a/common/rfb/SSecurityTLS.cxx b/common/rfb/SSecurityTLS.cxx
index 72262b9afb8a6957986f1495835f3c6f0aebcb5b..db0221f8930697d36ac3febcbc0f9feb4946b729 100644 (file)
--- a/common/rfb/SSecurityTLS.cxx
+++ b/common/rfb/SSecurityTLS.cxx
@@ -66,7 +66,9 @@ void SSecurityTLS::shutdown()
 {
   if (session) {
     int ret;
-    ret = gnutls_bye(session, GNUTLS_SHUT_RDWR);
+    // FIXME: We can't currently wait for the response, so we only send
+    //        our close and hope for the best
+    ret = gnutls_bye(session, GNUTLS_SHUT_WR);
     if ((ret != GNUTLS_E_SUCCESS) && (ret != GNUTLS_E_INVALID_SESSION))
       vlog.error("TLS shutdown failed: %s", gnutls_strerror(ret));
   }