Add timeout for boost::asio::ssl::stream#async_shutdown()

refs Icinga#7203
Al2Klimov · Jun 17, 2020 · f1278d1 · f1278d1
1 parent 6532e9e
commit f1278d1
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
@@ -233,8 +233,20 @@ void JsonRpcConnection::Disconnect()
 
 			m_Stream->lowest_layer().cancel(ec);
 
+			Timeout::Ptr shutdownTimeout (new Timeout(
+				m_IoStrand.context(),
+				m_IoStrand,
+				boost::posix_time::seconds(10),
+				[this, keepAlive](asio::yield_context yc) {
+					boost::system::error_code ec;
+					m_Stream->lowest_layer().cancel(ec);
+				}
+			));
+
 			m_Stream->next_layer().async_shutdown(yc[ec]);
 
+			shutdownTimeout->Cancel();
+
 			m_Stream->lowest_layer().shutdown(m_Stream->lowest_layer().shutdown_both, ec);
 		}
 	});