From 792e6472e418e4be06f415f93e22c588543e7f75 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 23 Jan 2023 11:24:25 -0500 Subject: [PATCH] Fix IPv6 addresses_match fe80:: could be submitted during collective startup, handle that problem appropriately. --- confluent_server/confluent/netutil.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/confluent_server/confluent/netutil.py b/confluent_server/confluent/netutil.py index e38d2a00..b98228e5 100644 --- a/confluent_server/confluent/netutil.py +++ b/confluent_server/confluent/netutil.py @@ -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':