LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-09-05 05:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

work around upnp bug

Browse source 
this fixes an incorrectly raised mapping conflict error which the router raises when there is a redirect for the same internal port and a different lan address.
This commit is contained in:
Jack Robison 2018-06-07 11:51:22 -04:00
parent b0e4fc4faa
commit f3e848b2e2
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lbrynet/core/Session.py
View file

@ -166,24 +166,24 @@ class Session(object):
if not mapping: if not mapping:
return port return port
if upnp.lanaddr == mapping[0]: if upnp.lanaddr == mapping[0]:
return mapping return mapping[1]
return get_free_port(upnp, port + 1, protocol) return get_free_port(upnp, port + 1, protocol)
def get_port_mapping(upnp, internal_port, protocol, description): def get_port_mapping(upnp, port, protocol, description):
# try to map to the requested port, if there is already a mapping use the next external # try to map to the requested port, if there is already a mapping use the next external
# port available # port available
if protocol not in ['UDP', 'TCP']: if protocol not in ['UDP', 'TCP']:
raise Exception("invalid protocol") raise Exception("invalid protocol")
external_port = get_free_port(upnp, internal_port, protocol) port = get_free_port(upnp, port, protocol)
if isinstance(external_port, tuple): if isinstance(port, tuple):
log.info("Found existing UPnP redirect %s:%i (%s) to %s:%i, using it", log.info("Found existing UPnP redirect %s:%i (%s) to %s:%i, using it",
self.external_ip, external_port[1], protocol, upnp.lanaddr, internal_port) self.external_ip, port, protocol, upnp.lanaddr, port)
return external_port[1], protocol return port
upnp.addportmapping(external_port, protocol, upnp.lanaddr, internal_port, upnp.addportmapping(port, protocol, upnp.lanaddr, port,
description, '') description, '')
log.info("Set UPnP redirect %s:%i (%s) to %s:%i", self.external_ip, external_port, log.info("Set UPnP redirect %s:%i (%s) to %s:%i", self.external_ip, port,
protocol, upnp.lanaddr, internal_port) protocol, upnp.lanaddr, port)
return external_port, protocol return port
def threaded_try_upnp(): def threaded_try_upnp():
if self.use_upnp is False: if self.use_upnp is False:
@ -198,13 +198,11 @@ class Session(object):
# best not to rely on this external ip, the router can be behind layers of NATs # best not to rely on this external ip, the router can be behind layers of NATs
self.external_ip = external_ip self.external_ip = external_ip
if self.peer_port: if self.peer_port:
self.upnp_redirects.append( self.peer_port = get_port_mapping(u, self.peer_port, 'TCP', 'LBRY peer port')
get_port_mapping(u, self.peer_port, 'TCP', 'LBRY peer port') self.upnp_redirects.append((self.peer_port, 'TCP'))
)
if self.dht_node_port: if self.dht_node_port:
self.upnp_redirects.append( self.dht_node_port = get_port_mapping(u, self.dht_node_port, 'UDP', 'LBRY DHT port')
get_port_mapping(u, self.dht_node_port, 'UDP', 'LBRY DHT port') self.upnp_redirects.append((self.dht_node_port, 'UDP'))
)
return True return True
return False return False