LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Packages Projects Releases 282 Wiki Activity

Merge pull request #2521 from lbryio/resolve-ipv4-only

Browse source 
fix resolving fixed peers from an ipv6 connection
This commit is contained in:
Jack Robison 2019-10-08 14:37:49 -04:00 committed by GitHub
parent 077281a77a 5cd0828dd3
commit 292f1953e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbry/lbry/dht/peer.py
View file

@ -161,7 +161,7 @@ class KademliaPeer:
if self.tcp_port is not None and not 1 <= self.tcp_port <= 65535: if self.tcp_port is not None and not 1 <= self.tcp_port <= 65535:
raise ValueError("invalid tcp port") raise ValueError("invalid tcp port")
if not is_valid_ipv4(self.address): if not is_valid_ipv4(self.address):
raise ValueError("invalid ip address") raise ValueError(f"invalid ip address: '{self.address}'")
def update_tcp_port(self, tcp_port: int): def update_tcp_port(self, tcp_port: int):
self.tcp_port = tcp_port self.tcp_port = tcp_port

3
lbry/lbry/utils.py
View file

@ -192,7 +192,8 @@ async def resolve_host(url: str, port: int, proto: str) -> str:
return (await loop.getaddrinfo( return (await loop.getaddrinfo(
url, port, url, port,
proto=socket.IPPROTO_TCP if proto == 'tcp' else socket.IPPROTO_UDP, proto=socket.IPPROTO_TCP if proto == 'tcp' else socket.IPPROTO_UDP,
type=socket.SOCK_STREAM if proto == 'tcp' else socket.SOCK_DGRAM type=socket.SOCK_STREAM if proto == 'tcp' else socket.SOCK_DGRAM,
family=socket.AF_INET
))[0][4][0] ))[0][4][0]