Strip scope_id from IPv6 address if given. (#1020)

StevenLooman · web-flow · commit 686febdd181c · 2021-10-30T10:06:14.000-05:00
diff --git a/tests/utils/test_net.py b/tests/utils/test_net.py
@@ -39,6 +39,7 @@ def test_ip6_to_address_and_index():
     """Test we can extract from mocked adapters."""
     adapters = _generate_mock_adapters()
     assert netutils.ip6_to_address_and_index(adapters, "2001:db8::") == (('2001:db8::', 1, 1), 1)
+    assert netutils.ip6_to_address_and_index(adapters, "2001:db8::%1") == (('2001:db8::', 1, 1), 1)
     with pytest.raises(RuntimeError):
         assert netutils.ip6_to_address_and_index(adapters, "2005:db8::")
 
diff --git a/zeroconf/_utils/net.py b/zeroconf/_utils/net.py
@@ -83,6 +83,8 @@ def get_all_addresses_v6() -> List[Tuple[Tuple[str, int, int], int]]:
 
 
 def ip6_to_address_and_index(adapters: List[Any], ip: str) -> Tuple[Tuple[str, int, int], int]:
+    if '%' in ip:
+        ip = ip[: ip.index('%')]  # Strip scope_id.
     ipaddr = ipaddress.ip_address(ip)
     for adapter in adapters:
         for adapter_ip in adapter.ips:
