Browse Source

fix proxy setting issue #1330

283
ThomasV 10 years ago
parent
commit
0ac3aebb88
  1. 3
      lib/network.py

3
lib/network.py

@ -301,11 +301,12 @@ class Network(util.DaemonThread):
def set_proxy(self, proxy): def set_proxy(self, proxy):
self.proxy = proxy self.proxy = proxy
if proxy: if proxy:
self.print_error("setting proxy", proxy)
proxy_mode = proxy_modes.index(proxy["mode"]) + 1 proxy_mode = proxy_modes.index(proxy["mode"]) + 1
socks.setdefaultproxy(proxy_mode, proxy["host"], int(proxy["port"])) socks.setdefaultproxy(proxy_mode, proxy["host"], int(proxy["port"]))
socket.socket = socks.socksocket socket.socket = socks.socksocket
# prevent dns leaks, see http://stackoverflow.com/questions/13184205/dns-over-proxy # prevent dns leaks, see http://stackoverflow.com/questions/13184205/dns-over-proxy
socket.getaddrinfo = lambda *args: [(socket.AF_INET, socket.SOCK_STREAM, 6, '', (args[0], args[1]))] socket.getaddrinfo = lambda *args: [(socket.AF_INET, socket.SOCK_STREAM, 6, '', (str(args[0]), args[1]))]
else: else:
socket.socket = socket._socketobject socket.socket = socket._socketobject
socket.getaddrinfo = socket._socket.getaddrinfo socket.getaddrinfo = socket._socket.getaddrinfo

Loading…
Cancel
Save