1
0

Merge pull request #8714 from accumulator/tor_probe

network: async tor probe
This commit is contained in:
accumulator
2023-12-04 16:45:03 +01:00
committed by GitHub
5 changed files with 46 additions and 14 deletions

View File

@@ -1506,9 +1506,7 @@ def detect_tor_socks_proxy() -> Optional[Tuple[str, int]]:
def is_tor_socks_port(host: str, port: int) -> bool:
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.settimeout(1.0)
s.connect((host, port))
with socket.create_connection((host, port), timeout=10) as s:
# mimic "tor-resolve 0.0.0.0".
# see https://github.com/spesmilo/electrum/issues/7317#issuecomment-1369281075
# > this is a socks5 handshake, followed by a socks RESOLVE request as defined in