aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorGregory Maxwell <greg@xiph.org>2012-08-23 14:17:35 -0700
committerGregory Maxwell <greg@xiph.org>2012-08-23 14:17:35 -0700
commit1bcd3f26c022f7a2fcc1a01df6d9cae0cb13f8d7 (patch)
tree4b58c78a56e1e2481e218cd9f9042620a3839bfc /src/init.cpp
parent579d011738002b77e3a5f8713461eaa3de492e00 (diff)
parent9655d73f49cd4da189ddb2ed708c26dc4cb3babe (diff)
downloadbitcoin-1bcd3f26c022f7a2fcc1a01df6d9cae0cb13f8d7.tar.xz
Merge pull request #1431 from luke-jr/opt_ipv6
Make IPv6 support optional again (defaults to enabled)
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 1a1e31c2f3..25756c4e6f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -500,6 +500,12 @@ bool AppInit2()
SetLimited(net);
}
}
+#if defined(USE_IPV6)
+#if ! USE_IPV6
+ else
+ SetLimited(NET_IPV6);
+#endif
+#endif
CService addrProxy;
bool fProxy = false;