AaronFiore/electrum
1
0
Fork 0
Code Activity

replace SSL checkbox in GUI with command line option

Browse Source
This commit is contained in:
ThomasV
2017-12-18 14:15:10 +01:00
parent 5c6544a296
commit dc388d4c7c
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/network.py
View File

@@ -170,16 +170,17 @@ class Network(util.DaemonThread):
self.blockchain_index = config.get('blockchain_index', 0)
if self.blockchain_index not in self.blockchains.keys():
self.blockchain_index = 0
self.protocol = 't' if self.config.get('nossl') else 's'
# Server for addresses and transactions
self.default_server = self.config.get('server')
# Sanitize default server
try:
deserialize_server(self.default_server)
host, port, protocol = deserialize_server(self.default_server)
assert protocol == self.protocol
except:
self.default_server = None
if not self.default_server:
self.default_server = pick_random_server()
self.lock = threading.Lock()
self.pending_sends = []
self.message_id = 0
@@ -217,8 +218,7 @@ class Network(util.DaemonThread):
self.auto_connect = self.config.get('auto_connect', True)
self.connecting = set()
self.socket_queue = queue.Queue()
self.start_network(deserialize_server(self.default_server)[2],
deserialize_proxy(self.config.get('proxy')))
self.start_network(self.protocol, deserialize_proxy(self.config.get('proxy')))
def register_callback(self, callback, events):
with self.lock: