LBRYCommunity/aioupnp
1
0
Fork 0
Code Issues 7 Pull requests 1 Projects Releases 1 Packages Wiki Activity

fix mapping re-use

Browse source
This commit is contained in:
Jack Robison 2018-10-30 13:43:10 -04:00
parent 1d7c95abfd
commit 3e26a6c2c7
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aioupnp/__init__.py
View file

@ -1,4 +1,4 @@
__version__ = "0.0.9" __version__ = "0.0.10"
__name__ = "aioupnp" __name__ = "aioupnp"
__author__ = "Jack Robison" __author__ = "Jack Robison"
__maintainer__ = "Jack Robison" __maintainer__ = "Jack Robison"

12
aioupnp/upnp.py
View file

@ -156,11 +156,10 @@ class UPnP:
async def get_next_mapping(self, port: int, protocol: str, description: str, internal_port: int=None) -> int: async def get_next_mapping(self, port: int, protocol: str, description: str, internal_port: int=None) -> int:
if protocol not in ["UDP", "TCP"]: if protocol not in ["UDP", "TCP"]:
raise UPnPError("unsupported protocol: {}".format(protocol)) raise UPnPError("unsupported protocol: {}".format(protocol))
internal_port = internal_port or port internal_port = int(internal_port or port)
redirect_tups = [] redirect_tups = []
cnt = 0 cnt = 0
port = int(port) port = int(port)
internal_port = int(internal_port)
redirect = await self._get_port_mapping_by_index(cnt) redirect = await self._get_port_mapping_by_index(cnt)
while redirect: while redirect:
redirect_tups.append(redirect) redirect_tups.append(redirect)
@ -168,13 +167,14 @@ class UPnP:
redirect = await self._get_port_mapping_by_index(cnt) redirect = await self._get_port_mapping_by_index(cnt)
redirects = { redirects = {
"%i:%s" % (ext_port, proto): (int_host, int_port, desc) (ext_port, proto): (int_host, int_port, desc)
for (ext_host, ext_port, proto, int_port, int_host, enabled, desc, _) in redirect_tups for (ext_host, ext_port, proto, int_port, int_host, enabled, desc, _) in redirect_tups
} }
while ("%i:%s" % (port, protocol)) in redirects:
int_host, int_port, _ = redirects["%i:%s" % (port, protocol)] while (port, protocol) in redirects:
int_host, int_port, _ = redirects[(port, protocol)]
if int_host == self.lan_address and int_port == internal_port: if int_host == self.lan_address and int_port == internal_port:
break return int_port
port += 1 port += 1
await self.add_port_mapping( # set one up await self.add_port_mapping( # set one up