2
0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00

Fix IPv6 addresses_match

fe80:: could be submitted during
collective startup, handle that problem appropriately.
This commit is contained in:
Jarrod Johnson 2023-01-23 11:24:25 -05:00
parent a522e17a63
commit 792e6472e4

View File

@ -661,6 +661,8 @@ def addresses_match(addr1, addr2):
:param addr2:
:return: True if the given addresses refer to the same thing
"""
if '%' in addr1 or '%' in addr2:
return False
for addrinfo in socket.getaddrinfo(addr1, 0, 0, socket.SOCK_STREAM):
rootaddr1 = socket.inet_pton(addrinfo[0], addrinfo[4][0])
if addrinfo[0] == socket.AF_INET6 and rootaddr1[:12] == b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff':