aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-11-29 12:38:12 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-11-29 12:39:33 +0100
commit5488514b901d807a98544618cb441a28e0b28bda (patch)
treee1db2df3b6573d61e02b516c6fa2157cb6ccdb0f /src/net.h
parent0a0441358c81a28495914b880526bdae9262fc5a (diff)
parentdfed983f19e7b61da243362f00fa3a14c92dae45 (diff)
Merge #9225: Fix some benign races
dfed983 Fix unlocked access to vNodes.size() (Matt Corallo) 3033522 Remove double brackets in addrman (Matt Corallo) dbfaade Fix AddrMan locking (Matt Corallo) 047ea10 Make fImporting an std::atomic (Matt Corallo) 42071ca Make fDisconnect an std::atomic (Matt Corallo)
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net.h b/src/net.h
index a4a9fb676a..df3930d82e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -615,7 +615,7 @@ public:
const bool fInbound;
bool fNetworkNode;
bool fSuccessfullyConnected;
- bool fDisconnect;
+ std::atomic_bool fDisconnect;
// We use fRelayTxes for two purposes -
// a) it allows us to not relay tx invs before receiving the peer's version message
// b) the peer may tell us in its version message that we should not relay tx invs