AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: call socket.connect before sll.wrap_socket, for proxy. (fixes bug #207)

Browse Source
This commit is contained in:
ThomasV
2013-10-01 09:01:46 +02:00
parent 80cd013219
commit 7658b2ade1
3 changed files with 65 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/network.py
View File

@@ -53,6 +53,7 @@ class Network(threading.Thread):
self.servers = []
self.banner = ''
self.interface = None
self.proxy = self.config.get('proxy')
self.heights = {}
@@ -95,7 +96,7 @@ class Network(threading.Thread):
def start_interface(self, server):
if server in self.interfaces.keys():
return
i = interface.Interface({'server':server, 'path':self.config.path})
i = interface.Interface({'server':server, 'path':self.config.path, 'proxy':self.proxy})
self.interfaces[server] = i
i.start(self.queue)
@@ -130,6 +131,7 @@ class Network(threading.Thread):
i = self.interface
self.default_server = server
self.proxy = proxy
self.start_interface(server)
self.interface = self.interfaces[server]
i.stop_subscriptions() # fixme: it should not stop all subscriptions, and send 'unsubscribe'