fix: preserve pre-normalized tuple entries in multicast_addresses

bluetoothbot · bluetoothbot · commit 6e25708e93dc · 2026-05-22T00:10:11.000Z
diff --git a/src/zeroconf/_utils/net.py b/src/zeroconf/_utils/net.py
@@ -152,6 +152,8 @@ def ip6_addresses_to_indexes(
             result.append((interface_index_to_ip6_address(adapters, iface), iface))  # type: ignore[arg-type]
         elif isinstance(iface, str) and ipaddress.ip_address(iface).version == 6:
             result.append(ip6_to_address_and_index(adapters, iface))  # type: ignore[arg-type]
+        elif isinstance(iface, tuple):
+            result.append(iface)
 
     return result
 
diff --git a/tests/utils/test_net.py b/tests/utils/test_net.py
@@ -618,3 +618,29 @@ def _new_socket(bind_addr, **kwargs):
 
     joined = [c.args[1] for c in mock_add.call_args_list if c.args[0] is listen_mock]
     assert "192.168.1.5" in joined
+
+
+def test_create_sockets_multicast_addresses_preserves_pre_normalized_tuple() -> None:
+    """Pre-normalized IPv6 adapter tuples pass through to add_multicast_member."""
+    listen_mock = Mock(spec=socket.socket)
+
+    pre_normalized = (("2001:db8::", 1, 1), 1)
+
+    with (
+        patch("zeroconf._utils.net.new_socket", return_value=listen_mock),
+        patch("zeroconf._utils.net.add_multicast_member", return_value=True) as mock_add,
+        patch("zeroconf._utils.net.set_respond_socket_multicast_options"),
+        patch(
+            "zeroconf._utils.net.ifaddr.get_adapters",
+            return_value=_generate_mock_adapters(),
+        ),
+        patch("zeroconf._utils.net.socket.socket.setsockopt"),
+    ):
+        r.create_sockets(
+            interfaces=[],
+            multicast_addresses=[pre_normalized],
+            ip_version=r.IPVersion.V6Only,
+        )
+
+    joined = [c.args[1] for c in mock_add.call_args_list if c.args[0] is listen_mock]
+    assert pre_normalized in joined
