Browse Source

Resolve address locally if proxy and not tor

and report it correctly in peers output

Requires aiorpcX 0.5.5
Closes #301
patch-2
Neil Booth 7 years ago
parent
commit
f54c4e6e25
  1. 1
      server/peers.py
  2. 2
      setup.py

1
server/peers.py

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

2
setup.py

@ -11,7 +11,7 @@ setuptools.setup(
# "x11_hash" package (1.4) is required to sync DASH network.
# "tribus_hash" package is required to sync Denarius 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']),
description='ElectrumX Server',
author='Neil Booth',

Loading…
Cancel
Save