xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-10-30 19:02:29 +00:00
Code Issues Projects Releases Wiki Activity

Handle older python with addrinfo

Browse Source 
While newer python omits '%',
older python includes.  Change to handle
either form.
This commit is contained in:
Jarrod Johnson
2023-07-19 16:04:25 -04:00
parent 03fce4f762
commit f16daa44dd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
confluent_server/confluent/discovery/protocols/ssdp.py
View File

@@ -258,7 +258,8 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
seconds = int(currtime)
msecs = int(currtime * 1000 % 1000)
reply = 'HTTP/1.1 200 OK\r\nNODENAME: {0}\r\nCURRTIME: {1}\r\nCURRMSECS: {2}\r\n'.format(node, seconds, msecs)
if netutil.ip_on_same_subnet(peer[0], 'fe80::', 64):
theip = peer[0].split('%', 1)[0]
if netutil.ip_on_same_subnet(theip, 'fe80::', 64):
if '%' in peer[0]:
ifidx = peer[0].split('%', 1)[1]
iface = socket.getaddrinfo(peer[0], 0, socket.AF_INET6, socket.SOCK_DGRAM)[0][-1][-1]