aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-04-17 05:08:19 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2017-04-17 05:15:37 -0700
commita077a90da88f12d9f10c8b85840bdb847a98b0a0 (patch)
tree96797d0cba9f5a56b37c7604470428ab34b4ec64 /src
parentc5e9e428a9198c8c4076f239b5eaa8dc95e7985b (diff)
parentb2c9254205a59fa685d75470f73ad9397ecba708 (diff)
Merge #10215: Check interruptNet during dnsseed lookups
b2c9254 Check interruptNet during dnsseed lookups (Matt Corallo) Tree-SHA512: a76b5749b085d5571ac65a6925bb1c50fa1d02c02854d9126224dc2ec419eb9103f7c92bf9a0bbd39c7dee93a2266dc3973fb16b48e8daea057f45d452e2513c
Diffstat (limited to 'src')
-rw-r--r--src/net.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/net.cpp b/src/net.cpp
index cf94faf854..27389d6e0c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1585,6 +1585,9 @@ void CConnman::ThreadDNSAddressSeed()
LogPrintf("Loading addresses from DNS seeds (could take a while)\n");
BOOST_FOREACH(const CDNSSeedData &seed, vSeeds) {
+ if (interruptNet) {
+ return;
+ }
if (HaveNameProxy()) {
AddOneShot(seed.host);
} else {
@@ -1602,6 +1605,9 @@ void CConnman::ThreadDNSAddressSeed()
found++;
}
}
+ if (interruptNet) {
+ return;
+ }
// TODO: The seed name resolve may fail, yielding an IP of [::], which results in
// addrman assigning the same source to results from different seeds.
// This should switch to a hard-coded stable dummy IP for each seed name, so that the