Skip to content

Fixes for OS X #188

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

Closed
estyrke wants to merge 1 commit into from
Closed

Fixes for OS X #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions zeroconf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,7 @@ def normalize_interface_choice(
return result


def new_socket(port: int = _MDNS_PORT, ip_version: IPVersion = IPVersion.V4Only) -> socket.socket:
def new_socket(port: int = _MDNS_PORT, ip_version: IPVersion = IPVersion.V4Only, bind_addr: str = None) -> socket.socket:
if ip_version == IPVersion.V4Only:
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
else:
Expand Down Expand Up @@ -1889,7 +1889,9 @@ def new_socket(port: int = _MDNS_PORT, ip_version: IPVersion = IPVersion.V4Only)
s.setsockopt(_IPPROTO_IPV6, socket.IPV6_MULTICAST_HOPS, 255)
s.setsockopt(_IPPROTO_IPV6, socket.IPV6_MULTICAST_LOOP, True)

s.bind(('', port))
if bind_addr is not None:
s.bind((bind_addr, port))

return s


Expand Down Expand Up @@ -1944,7 +1946,7 @@ def create_sockets(
if unicast:
listen_socket = None
else:
listen_socket = new_socket(ip_version=ip_version)
listen_socket = new_socket(ip_version=ip_version, bind_addr='')

interfaces = normalize_interface_choice(interfaces, ip_version)

Expand All @@ -1954,7 +1956,7 @@ def create_sockets(
if not unicast:
respond_socket = add_multicast_member(listen_socket, i)
else:
respond_socket = new_socket(port=0, ip_version=ip_version)
respond_socket = new_socket(port=0, ip_version=ip_version, bind_addr='')

if respond_socket is not None:
respond_sockets.append(respond_socket)
Expand Down Expand Up @@ -2033,9 +2035,8 @@ def __init__(
self.listener = Listener(self)
if not unicast:
self.engine.add_reader(self.listener, self._listen_socket)
else:
for s in self._respond_sockets:
self.engine.add_reader(self.listener, s)
for s in self._respond_sockets:
self.engine.add_reader(self.listener, s)
self.reaper = Reaper(self)

self.debug = None # type: Optional[DNSOutgoing]
Expand Down