AaronFiore/electrum
1
0
Fork 0
Code Activity

immediately check for Tor upon proxy set

Browse Source
This commit is contained in:
Sander van Grieken
2023-01-13 09:47:18 +01:00
parent d26440b964
commit f33989b445
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum/network.py
View File

@@ -340,6 +340,7 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
self.auto_connect = self.config.get('auto_connect', True)
self.proxy = None
self.tor_proxy = False
self._maybe_set_oneserver()
# Dump network messages (all interfaces). Set at runtime from the console.
@@ -603,7 +604,15 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
self.proxy = proxy
dns_hacks.configure_dns_depending_on_proxy(bool(proxy))
self.logger.info(f'setting proxy {proxy}')
util.trigger_callback('proxy_set', self.proxy)
self.tor_proxy = False
if bool(proxy) and proxy['mode'] == 'socks5':
# test for Tor
self.tor_proxy = util.is_tor_socks_port(proxy['host'], int(proxy['port']))
if self.tor_proxy:
self.logger.info(f'Proxy is TOR')
util.trigger_callback('proxy_set', self.proxy, self.tor_proxy)
@log_exceptions
async def set_parameters(self, net_params: NetworkParameters):