]> granicus.if.org Git - icinga2/commitdiff
Close TLS connections more aggressively
authorGunnar Beutner <gunnar@beutner.name>
Sat, 14 Feb 2015 18:14:45 +0000 (19:14 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Sat, 14 Feb 2015 18:14:45 +0000 (19:14 +0100)
refs #6109

lib/base/tlsstream.cpp

index 1f198fc411e14a8769cff3fb93d2225381177c24..0eb98783a19e3e535e537be810dce38ab96baea5 100644 (file)
@@ -160,12 +160,11 @@ void TlsStream::OnEvent(int revents)
 
                        break;
                case TlsActionClose:
-                       rc = SSL_shutdown(m_SSL.get());
+                       (void) SSL_shutdown(m_SSL.get());
+                       rc = 1;
 
-                       if (rc > 0) {
-                               m_CloseOK = true;
-                               m_CV.notify_all();
-                       }
+                       m_CloseOK = true;
+                       m_CV.notify_all();
 
                        break;
                default:
@@ -307,4 +306,4 @@ bool TlsStream::IsDataAvailable(void) const
        boost::mutex::scoped_lock lock(m_Mutex);
 
        return m_RecvQ->GetAvailableBytes() > 0;
-}
\ No newline at end of file
+}