Separate socket creation and connection to be able to cancel it

2017-10-03 14:30:19 +02:00 · 2017-10-03 14:30:19 +02:00 · d8453384ab
commit d8453384ab
parent f4cdc31788
2 changed files with 2 additions and 3 deletions
--- a/src/Tor/TorManager.py
+++ b/src/Tor/TorManager.py
@ -304,9 +304,7 @@ class TorManager(object):
        self.log.debug("Creating new Tor socket to %s:%s" % (onion, port))
        if config.tor == "always":  # Every socket is proxied by default, in this mode
            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            sock.connect((onion, int(port)))
        else:
            sock = socks.socksocket()
            sock.set_proxy(socks.SOCKS5, self.proxy_ip, self.proxy_port)
-            sock.connect((onion, int(port)))
        return sock