DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exit out of TLSManager::waitFor() loop if shutdown requested

Browse Source
This commit is contained in:
Duke
2024-09-17 11:29:24 -04:00
parent 49f303d804
commit bd967b7ac6
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/hush/tlsmanager.cpp
View File

@@ -10,6 +10,8 @@
#include "tlsmanager.h" #include "tlsmanager.h"
#include "utiltls.h" #include "utiltls.h"
extern bool ShutdownRequested();
using namespace std; using namespace std;
// store our preferred cipherlist so we can use it for debug/etc later on // store our preferred cipherlist so we can use it for debug/etc later on
std::string TLS_CIPHERLIST; std::string TLS_CIPHERLIST;
@@ -85,6 +87,10 @@ int TLSManager::waitFor(SSLConnectionRoutine eRoutine, SOCKET hSocket, WOLFSSL*
while (true) while (true)
{ {
if(ShutdownRequested()) {
LogPrintf("%s: shutdown requested, exiting\n", __func__);
return retOp;
}
// clear the current thread's error queue // clear the current thread's error queue
wolfSSL_ERR_clear_error(); wolfSSL_ERR_clear_error();

1
src/net.cpp
View File

@@ -2927,6 +2927,7 @@ void SetNetworkActive(bool active)
if (!fNetworkActive) { if (!fNetworkActive) {
LOCK(cs_vNodes); LOCK(cs_vNodes);
// Close sockets to all nodes // Close sockets to all nodes
LogPrint("net", "%s: closing sockets to all nodes\n", __func__);
for (CNode* pnode : vNodes) { for (CNode* pnode : vNodes) {
pnode->CloseSocketDisconnect(); pnode->CloseSocketDisconnect();
} }