AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: partially fix ipv6 proxy

Browse Source 
note that network.deserialize_proxy is still broken for ipv6
This commit is contained in:
SomberNight
2019-05-02 12:04:06 +02:00
parent 19ced234aa
commit 556fa30ddf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/interface.py
View File

@@ -33,7 +33,7 @@ from collections import defaultdict
from ipaddress import IPv4Network, IPv6Network, ip_address from ipaddress import IPv4Network, IPv6Network, ip_address
import aiorpcx import aiorpcx
from aiorpcx import RPCSession, Notification from aiorpcx import RPCSession, Notification, NetAddress
from aiorpcx.curio import timeout_after, TaskTimeout from aiorpcx.curio import timeout_after, TaskTimeout
import certifi import certifi
@@ -218,7 +218,7 @@ class Interface(PrintError):
auth = None auth = None
else: else:
auth = aiorpcx.socks.SOCKSUserAuth(username, pw) auth = aiorpcx.socks.SOCKSUserAuth(username, pw)
addr = "{}:{}".format(proxy['host'], proxy['port']) addr = NetAddress(proxy['host'], proxy['port'])
if proxy['mode'] == "socks4": if proxy['mode'] == "socks4":
self.proxy = aiorpcx.socks.SOCKSProxy(addr, aiorpcx.socks.SOCKS4a, auth) self.proxy = aiorpcx.socks.SOCKSProxy(addr, aiorpcx.socks.SOCKS4a, auth)
elif proxy['mode'] == "socks5": elif proxy['mode'] == "socks5":