AaronFiore/electrum
1
0
Fork 0
Code Activity

network: fix proxy case

Browse Source 
follow-up "healty spread of servers" d8f3ab0917
This commit is contained in:
SomberNight
2019-04-15 10:49:09 +02:00
parent 2dca91d048
commit c49d5f672c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/interface.py
View File

@@ -628,7 +628,10 @@ class Interface(PrintError):
def do_bucket(): def do_bucket():
if self.is_tor(): if self.is_tor():
return BUCKET_NAME_OF_ONION_SERVERS return BUCKET_NAME_OF_ONION_SERVERS
ip_addr = ip_address(self.ip_addr()) try:
ip_addr = ip_address(self.ip_addr())
except ValueError:
return ''
if not ip_addr: if not ip_addr:
return '' return ''
if ip_addr.version == 4: if ip_addr.version == 4:

2
electrum/network.py
View File

@@ -760,6 +760,8 @@ class Network(PrintError):
# main interface is exempt. this makes switching servers easier # main interface is exempt. this makes switching servers easier
if iface_to_check.is_main_server(): if iface_to_check.is_main_server():
return True return True
if not iface_to_check.bucket_based_on_ipaddress():
return True
# bucket connected interfaces # bucket connected interfaces
with self.interfaces_lock: with self.interfaces_lock:
interfaces = list(self.interfaces.values()) interfaces = list(self.interfaces.values())