diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-05-02 10:27:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-05-02 10:27:27 +0200 |
| commit | bf35cae1ae2f506d824fe04a5100d03fad4b004c (patch) | |
| tree | 87d84e1168195d4910de95ea26b58c71f9c0eda6 /src/init.cpp | |
| parent | Merge pull request #4032 (diff) | |
| parent | Remove build-time no-IPv6 setting (diff) | |
| download | discoin-bf35cae1ae2f506d824fe04a5100d03fad4b004c.tar.xz discoin-bf35cae1ae2f506d824fe04a5100d03fad4b004c.zip | |
Merge pull request #4115
e27c411 Remove build-time no-IPv6 setting (Wladimir J. van der Laan)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/init.cpp b/src/init.cpp index 6e6e4beed..c33a3f8f5 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -689,12 +689,6 @@ bool AppInit2(boost::thread_group& threadGroup) SetLimited(net); } } -#if defined(USE_IPV6) -#if ! USE_IPV6 - else - SetLimited(NET_IPV6); -#endif -#endif CService addrProxy; bool fProxy = false; @@ -706,10 +700,8 @@ bool AppInit2(boost::thread_group& threadGroup) if (!IsLimited(NET_IPV4)) SetProxy(NET_IPV4, addrProxy, nSocksVersion); if (nSocksVersion > 4) { -#ifdef USE_IPV6 if (!IsLimited(NET_IPV6)) SetProxy(NET_IPV6, addrProxy, nSocksVersion); -#endif SetNameProxy(addrProxy, nSocksVersion); } fProxy = true; @@ -751,9 +743,7 @@ bool AppInit2(boost::thread_group& threadGroup) else { struct in_addr inaddr_any; inaddr_any.s_addr = INADDR_ANY; -#ifdef USE_IPV6 fBound |= Bind(CService(in6addr_any, GetListenPort()), BF_NONE); -#endif fBound |= Bind(CService(inaddr_any, GetListenPort()), !fBound ? BF_REPORT_ERROR : BF_NONE); } if (!fBound) |