RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve address locally if proxy and not tor

Browse Source 
and report it correctly in peers output

Requires aiorpcX 0.5.5
Closes #301
This commit is contained in:
Neil Booth 2018-04-09 13:57:37 +09:00
parent 4eebf420e8
commit f54c4e6e25
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/peers.py
View File

@ -544,6 +544,7 @@ class PeerManager(object):
if not self.proxy: if not self.proxy:
return return
kwargs['proxy'] = self.proxy kwargs['proxy'] = self.proxy
kwargs['resolve'] = not peer.is_tor
elif host: elif host:
# Use our listening Host/IP for outgoing non-proxy # Use our listening Host/IP for outgoing non-proxy
# connections so our peers see the correct source. # connections so our peers see the correct source.

2
setup.py
View File

@ -11,7 +11,7 @@ setuptools.setup(
# "x11_hash" package (1.4) is required to sync DASH network. # "x11_hash" package (1.4) is required to sync DASH network.
# "tribus_hash" package is required to sync Denarius network. # "tribus_hash" package is required to sync Denarius network.
# "blake256" package is required to sync Decred network. # "blake256" package is required to sync Decred network.
install_requires=['aiorpcX >= 0.5.4', 'plyvel', 'pylru', 'aiohttp >= 1'], install_requires=['aiorpcX >= 0.5.5', 'plyvel', 'pylru', 'aiohttp >= 1'],
packages=setuptools.find_packages(exclude=['tests']), packages=setuptools.find_packages(exclude=['tests']),
description='ElectrumX Server', description='ElectrumX Server',
author='Neil Booth', author='Neil Booth',