tqt network dialog: detect Tor proxy dynamically - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fd5ad9ac70a7d081a7ad63956703c93b9dcde1cb
DIR parent 192ec8596d085f9d3dfb9b6a9231ada68ef0fbb8
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Fri, 4 Jan 2019 10:58:59 +0100
qt network dialog: detect Tor proxy dynamically
keep thread running to detect changes
Diffstat:
M electrum/gui/qt/network_dialog.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
---
DIR diff --git a/electrum/gui/qt/network_dialog.py b/electrum/gui/qt/network_dialog.py
t@@ -466,6 +466,9 @@ class NetworkChoiceLayout(object):
self.network.run_from_another_thread(self.network.set_parameters(net_params))
def suggest_proxy(self, found_proxy):
+ if found_proxy is None:
+ self.tor_cb.hide()
+ return
self.tor_proxy = found_proxy
self.tor_cb.setText("Use Tor proxy at port " + str(found_proxy[1]))
if self.proxy_mode.currentIndex() == self.proxy_mode.findText('SOCKS5') \
t@@ -505,10 +508,14 @@ class TorDetector(QThread):
def run(self):
# Probable ports for Tor to listen at
ports = [9050, 9150]
- for p in ports:
- if TorDetector.is_tor_port(p):
- self.found_proxy.emit(("127.0.0.1", p))
- return
+ while True:
+ for p in ports:
+ if TorDetector.is_tor_port(p):
+ self.found_proxy.emit(("127.0.0.1", p))
+ break
+ else:
+ self.found_proxy.emit(None)
+ time.sleep(10)
@staticmethod
def is_tor_port(port):