oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate socket creation and connection to be able to cancel it

Browse source
This commit is contained in:
shortcutme 2017-10-03 14:30:19 +02:00
parent f4cdc31788
commit d8453384ab
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Connection/Connection.py
View file

@ -104,7 +104,8 @@ class Connection(object):
raise Exception("Can't connect to onion addresses, no Tor controller present") raise Exception("Can't connect to onion addresses, no Tor controller present")
self.sock = self.server.tor_manager.createSocket(self.ip, self.port) self.sock = self.server.tor_manager.createSocket(self.ip, self.port)
else: else:
self.sock = socket.create_connection((self.ip, int(self.port))) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect((self.ip, int(self.port)))
# Implicit SSL # Implicit SSL
if self.cert_pin: if self.cert_pin:

2
src/Tor/TorManager.py
View file

@ -304,9 +304,7 @@ class TorManager(object):
self.log.debug("Creating new Tor socket to %s:%s" % (onion, port)) 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 if config.tor == "always": # Every socket is proxied by default, in this mode
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.connect((onion, int(port)))
else: else:
sock = socks.socksocket() sock = socks.socksocket()
sock.set_proxy(socks.SOCKS5, self.proxy_ip, self.proxy_port) sock.set_proxy(socks.SOCKS5, self.proxy_ip, self.proxy_port)
sock.connect((onion, int(port)))
return sock return sock