diff options
| author | Jeff Garzik <[email protected]> | 2011-06-05 07:30:05 -0700 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2011-06-05 07:30:05 -0700 |
| commit | 39105dac1b2880970cab3d8f1af969a4b803df01 (patch) | |
| tree | 51ea99402d8a958551c3ac7cbcb8726a40466e61 /src/net.cpp | |
| parent | Bugfix for dnsseed introduced by dnslookup (diff) | |
| parent | Fix rfc1918 and rfc3927 compliance for ignoring non-internet-routable hosts. (diff) | |
| download | discoin-39105dac1b2880970cab3d8f1af969a4b803df01.tar.xz discoin-39105dac1b2880970cab3d8f1af969a4b803df01.zip | |
Merge pull request #290 from jrmithdobbs/ip-filter-rfc1918-rfc3927
Fix rfc1918 and rfc3927 compliance for ignoring non-internet-routable hosts
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp index 654fe0cad..39360a334 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -88,8 +88,7 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet) setsockopt(hSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&set, sizeof(int)); #endif - bool fRoutable = !(addrConnect.GetByte(3) == 10 || (addrConnect.GetByte(3) == 192 && addrConnect.GetByte(2) == 168)); - bool fProxy = (fUseProxy && fRoutable); + bool fProxy = (fUseProxy && addrConnect.IsRoutable()); struct sockaddr_in sockaddr = (fProxy ? addrProxy.GetSockAddr() : addrConnect.GetSockAddr()); if (connect(hSocket, (struct sockaddr*)&sockaddr, sizeof(sockaddr)) == SOCKET_ERROR) |