Skip to content

Commit

Permalink
Skip socket creation if add_multicast_member fails (windows)
Browse files Browse the repository at this point in the history
Fixes a regression caused by refactoring error in python-zeroconf#331
  • Loading branch information
TTimo authored and bdraco committed Apr 26, 2021
1 parent 203ec2e commit fd1c063
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions zeroconf/__init__.py
Expand Up @@ -2255,7 +2255,7 @@ def new_socket(
def add_multicast_member(
listen_socket: socket.socket,
interface: Union[str, Tuple[Tuple[str, int, int], int]],
) -> None:
) -> bool:
# This is based on assumptions in normalize_interface_choice
is_v6 = isinstance(interface, tuple)
err_einval = {errno.EINVAL}
Expand All @@ -2279,19 +2279,20 @@ def add_multicast_member(
'it is expected to happen on some systems',
interface,
)
return None
return False
elif _errno == errno.EADDRNOTAVAIL:
log.info(
'Address not available when adding %s to multicast '
'group, it is expected to happen on some systems',
interface,
)
return None
return False
elif _errno in err_einval:
log.info('Interface of %s does not support multicast, ' 'it is expected in WSL', interface)
return None
return False
else:
raise
return True


def new_respond_socket(
Expand Down Expand Up @@ -2339,8 +2340,10 @@ def create_sockets(

for i in normalized_interfaces:
if not unicast:
add_multicast_member(cast(socket.socket, listen_socket), i)
respond_socket = new_respond_socket(i, apple_p2p=apple_p2p)
if add_multicast_member(cast(socket.socket, listen_socket), i):
respond_socket = new_respond_socket(i, apple_p2p=apple_p2p)
else:
respond_socket = None
else:
respond_socket = new_socket(
port=0,
Expand Down

0 comments on commit fd1c063

Please sign in to comment.