xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 11:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Correct misrouting in slp

Browse Source 
IPv4 scan responses were lost as
the reader was passed IPv6 socket
no matter what.

Also, remove some needless verbosity.
This commit is contained in:
Jarrod Johnson 2024-05-08 11:48:46 -04:00
parent 25d4d13a96
commit a3506cf0bf
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
confluent_server/confluent/discovery/protocols/slp.py
View File

@ -628,7 +628,7 @@ async def scan(srvtypes=_slp_services, addresses=None, localonly=False):
cloop = asyncio.get_running_loop()
pktq = asyncio.Queue()
cloop.add_reader(net, relay_packet, net, pktq)
cloop.add_reader(net4, relay_packet, net, pktq)
cloop.add_reader(net4, relay_packet, net4, pktq)
initxid = random.randint(0, 32768)
xididx = 0
xidmap = {}
@ -636,14 +636,12 @@ async def scan(srvtypes=_slp_services, addresses=None, localonly=False):
# processed, mitigating volume of response traffic
rsps = {}
deferrals = []
print('commence')
rcvq = asyncio.Queue()
for srvtype in srvtypes:
xididx += 1
await _find_srvtype(net, net4, srvtype, addresses, initxid + xididx)
xidmap[initxid + xididx] = srvtype
await asyncio.sleep(0) # give async a chance to move things off buffer to queue
print('waity')
while True:
try:
srp = await asyncio.wait_for(pktq.get(), 1.0)
@ -653,7 +651,6 @@ async def scan(srvtypes=_slp_services, addresses=None, localonly=False):
break
cloop.remove_reader(net)
cloop.remove_reader(net4)
print(len(rsps))
if deferrals:
await asyncio.sleep(1.2) # already have a one second pause from select above
for defer in deferrals: