Mercurial > hg > bitcoin

changeset 3251:5fa1f4b15b9b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #1615 from Diapolo/net_noExtIp_IPv6only do not use external IPv4 discovery, when -onlynet="IPv6"
author Gregory Maxwell <greg@xiph.org>
date Wed, 25 Jul 2012 11:11:25 -0700
parents 051b0e1485e9 (current diff) cc8248fd92d6 (diff)
children 56e8cbe9b465
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1878,7 +1878,9 @@
     }
 #endif
 
-    CreateThread(ThreadGetMyExternalIP, NULL);
+    // Don't use external IPv4 discovery, when -onlynet="IPv6"
+    if (!IsLimited(NET_IPV4))
+        CreateThread(ThreadGetMyExternalIP, NULL);
 }
 
 void StartNode(void* parg)