Skip to content

fix: create listener socket with specific IP version #1557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 2 commits into from
Apr 1, 2025
Merged

fix: create listener socket with specific IP version #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d288a47
fix: create listener socket with specific IP version
agners Apr 1, 2025
f16a922
chore(tests): add unit test for socket creation with unicast addressing
agners Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/zeroconf/_utils/net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,11 +421,12 @@ def create_sockets(
else:
respond_socket = None
else:
is_v6 = isinstance(i, tuple)
respond_socket = new_socket(
port=0,
ip_version=ip_version,
ip_version=IPVersion.V6Only if is_v6 else IPVersion.V4Only,
apple_p2p=apple_p2p,
bind_addr=i[0] if isinstance(i, tuple) else (i,),
bind_addr=cast(tuple[tuple[str, int, int], int], i)[0] if is_v6 else (cast(str, i),),
)

if respond_socket is not None:
Expand Down
32 changes: 32 additions & 0 deletions tests/utils/test_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,3 +298,35 @@ def test_new_respond_socket_new_socket_returns_none():
"""Test new_respond_socket returns None if new_socket returns None."""
with patch.object(netutils, "new_socket", return_value=None):
assert netutils.new_respond_socket(("0.0.0.0", 0)) is None # type: ignore[arg-type]


def test_create_sockets():
"""Test create_sockets with unicast and IPv4."""

with (
patch("zeroconf._utils.net.new_socket") as mock_new_socket,
patch(
"zeroconf._utils.net.ifaddr.get_adapters",
return_value=_generate_mock_adapters(),
),
):
mock_socket = Mock(spec=socket.socket)
mock_new_socket.return_value = mock_socket

listen_socket, respond_sockets = r.create_sockets(
interfaces=r.InterfaceChoice.All, unicast=True, ip_version=r.IPVersion.All
)

assert listen_socket is None
mock_new_socket.assert_any_call(
port=0,
ip_version=r.IPVersion.V6Only,
apple_p2p=False,
bind_addr=("2001:db8::", 1, 1),
)
mock_new_socket.assert_any_call(
port=0,
ip_version=r.IPVersion.V4Only,
apple_p2p=False,
bind_addr=("192.168.1.5",),
)
Loading