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

comments

Browse source
This commit is contained in:
Jack Robison 2018-10-16 09:01:59 -04:00
parent df4337f5be
commit 73ae129218
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aioupnp/protocols/ssdp.py
View file

@ -139,7 +139,6 @@ async def _fuzzy_m_search(lan_address: str, gateway_address: str, timeout: int =
) )
packet_args = list(packet_generator()) packet_args = list(packet_generator())
batch_size = 2 batch_size = 2
b = 0
batch_timeout = float(timeout) / float(len(packet_args)) batch_timeout = float(timeout) / float(len(packet_args))
while packet_args: while packet_args:
args = packet_args[:batch_size] args = packet_args[:batch_size]
@ -149,14 +148,15 @@ async def _fuzzy_m_search(lan_address: str, gateway_address: str, timeout: int =
await protocol.m_search(gateway_address, batch_timeout, args) await protocol.m_search(gateway_address, batch_timeout, args)
return args return args
except (asyncio.TimeoutError, asyncio.CancelledError): except (asyncio.TimeoutError, asyncio.CancelledError):
b += 1
continue continue
raise UPnPError("M-SEARCH for {}:{} timed out".format(gateway_address, SSDP_PORT)) raise UPnPError("M-SEARCH for {}:{} timed out".format(gateway_address, SSDP_PORT))
async def fuzzy_m_search(lan_address: str, gateway_address: str, timeout: int = 30, async def fuzzy_m_search(lan_address: str, gateway_address: str, timeout: int = 30,
ssdp_socket: socket.socket = None) -> typing.Tuple[OrderedDict, SSDPDatagram]: ssdp_socket: socket.socket = None) -> typing.Tuple[OrderedDict, SSDPDatagram]:
# we don't know which packet the gateway replies to, so send small batches at a time
args_to_try = await _fuzzy_m_search(lan_address, gateway_address, timeout, ssdp_socket) args_to_try = await _fuzzy_m_search(lan_address, gateway_address, timeout, ssdp_socket)
# check the args in the batch that got a reply one at a time to see which one worked
for args in args_to_try: for args in args_to_try:
try: try:
packet = await m_search(lan_address, gateway_address, args, 3) packet = await m_search(lan_address, gateway_address, args, 3)