aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-02-10 12:38:45 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2017-02-10 12:42:53 +0100
commit2447c1024e6069bfe62ddff65c4e1aaf28f32b38 (patch)
treea929c469faa7df9271676e1024504092a72f92fb /src/net.h
parent33f3b21407a38faaaee2d72d16e8eb340fe74657 (diff)
parent9a0b784deaab6b9fffcab227d928987b981d0572 (diff)
downloadbitcoin-2447c1024e6069bfe62ddff65c4e1aaf28f32b38.tar.xz
Merge #9698: net: fix socket close race
9a0b784 net: add a lock around hSocket (Cory Fields) 45e2e08 net: rearrange so that socket accesses can be grouped together (Cory Fields)
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net.h b/src/net.h
index 38f8d82ceb..e5a19e0f43 100644
--- a/src/net.h
+++ b/src/net.h
@@ -572,6 +572,7 @@ public:
uint64_t nSendBytes;
std::deque<std::vector<unsigned char>> vSendMsg;
CCriticalSection cs_vSend;
+ CCriticalSection cs_hSocket;
CCriticalSection cs_vProcessMsg;
std::list<CNetMessage> vProcessMsg;