Fixed OSX compilation

cmake/FindDNSSD.cmake

@@ -6,9 +6,7 @@ option(DNSSD_WITH_AVAHI "Check for Avahi" ON)
 set(DNSSD_WITH_MDNSRESPONDER "" CACHE PATH "Check for mDNSResponder using build directory")
 
 if (APPLE)
-  # Included in libSystem
-  set(DNSSD_FOUND TRUE)
-  # FIXME: Create library alias instead
+  find_package(mDNSResponder)
 
 elseif(WIN32)
   # FIXME

cmake/FindmDNSResponder.cmake

@@ -21,6 +21,10 @@ find_library(mDNSResponder_LIBRARY
   NAMES dns_sd
   PATHS "${mDNSResponder_BUILD_DIR}"
   PATH_SUFFIXES mDNSPosix/build/prod)
+if (NOT mDNSResponder_LIBRARY)
+   find_library(mDNSResponder_LIBRARY
+	NAMES dns_services)
+endif()
 
 set(mDNSResponder_FOUND FALSE CACHE BOOL "" FORCE)
 if (mDNSResponder_INCLUDE_DIR AND mDNSResponder_LIBRARY)

src/dnssd/mdns/browser.cpp

@@ -53,16 +53,16 @@ struct browser::callback
                 const bool commit = !(flags & kDNSServiceFlagsMoreComing);
                 if (flags & kDNSServiceFlagsAdd)
                 {
-                    self->listener.on_browser_appear(contact, commit);
+                    self->member.listener.on_browser_appear(contact, commit);
                 }
                 else
                 {
-                    self->listener.on_browser_disappear(contact, commit);
+                    self->member.listener.on_browser_disappear(contact, commit);
                 }
             }
             else
             {
-                self->listener.on_browser_failure(mdns::make_error_code(error));
+                self->member.listener.on_browser_failure(mdns::make_error_code(error));
             }
         }
         catch (...)
@@ -79,8 +79,7 @@ struct browser::callback
 browser::browser(const std::string& type,
                  mdns::handle& connection,
                  typename browser::listener& listener)
-    : connection(connection),
-      listener(listener)
+    : member{ connection, listener, {} }
 {
     const ::DNSServiceFlags flags = kDNSServiceFlagsShareConnection;
     std::string regtype = mdns::type_encode(type);
@@ -98,7 +97,7 @@ browser::browser(const std::string& type,
         this);
     throw_on_error(error);
 
-    handle.reset(ref);
+    member.handle.reset(ref);
 }
 
 } // namespace mdns

src/dnssd/mdns/browser.hpp

@@ -46,10 +46,12 @@ class browser
 
 private:
     struct callback;
-
-    mdns::handle& connection;
-    browser::listener& listener;
-    mdns::handle handle;
+    struct
+    {
+        mdns::handle& connection;
+        browser::listener& listener;
+        mdns::handle handle;
+    } member;
 };
 
 } // namespace mdns

src/dnssd/mdns/error.cpp

@@ -18,11 +18,11 @@ namespace
 class mdns_category : public boost::system::error_category
 {
 public:
-    const char *name() const BOOST_SYSTEM_NOEXCEPT
+    const char *name() const noexcept override
     {
         return "mDNSResponder";
     }
-    std::string message(int value) const
+    std::string message(int value) const override
     {
         switch (DNSServiceErrorType(value))
         {

src/dnssd/mdns/resolver.cpp

@@ -87,20 +87,20 @@ struct resolver::callback
                     }
                 }
 
-                self->contact.index(to_index(interface_index));
-                self->contact.properties(properties);
+                self->member.contact.index(to_index(interface_index));
+                self->member.contact.properties(properties);
                 // FIXME: Set port directly on contact?
-                self->port = boost::asio::detail::socket_ops::network_to_host_short(port);
+                self->member.port = boost::asio::detail::socket_ops::network_to_host_short(port);
                 self->on_resolved(host);
             }
             else
             {
-                self->listener.on_resolver_failure(mdns::make_error_code(error));
+                self->member.listener.on_resolver_failure(mdns::make_error_code(error));
             }
         }
         catch (const boost::system::system_error& ex)
         {
-            self->listener.on_resolver_failure(ex.code());
+            self->member.listener.on_resolver_failure(ex.code());
         }
         catch (...)
         {
@@ -125,13 +125,13 @@ struct resolver::callback
             if (error == kDNSServiceErr_NoError)
             {
                 const bool more = flags & kDNSServiceFlagsMoreComing;
-                self->contact.address(mdns::to_address(*address));
-                self->contact.port(self->port);
+                self->member.contact.address(mdns::to_address(*address));
+                self->member.contact.port(self->member.port);
                 self->on_addrinfo(more);
             }
             else
             {
-                self->listener.on_resolver_failure(mdns::make_error_code(error));
+                self->member.listener.on_resolver_failure(mdns::make_error_code(error));
             }
         }
         catch (...)
@@ -148,10 +148,7 @@ struct resolver::callback
 resolver::resolver(mdns::handle& connection,
                    const aware::contact& contact,
                    typename resolver::listener& listener)
-    : connection(connection),
-      listener(listener),
-      contact(contact),
-      port(0)
+    : member{ connection, listener, {}, contact, 0 }
 {
     const ::DNSServiceFlags flags = kDNSServiceFlagsShareConnection;
     auto regtype = mdns::type_encode(contact.type());
@@ -167,34 +164,34 @@ resolver::resolver(mdns::handle& connection,
                                                       this);
     throw_on_error(error);
 
-    handle.reset(ref);
+    member.handle.reset(ref);
 }
 
 void resolver::on_resolved(const char *host)
 {
     const ::DNSServiceFlags flags = kDNSServiceFlagsShareConnection;
     const ::DNSServiceProtocol protocol = kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6;
 
-    auto ref = connection.get<DNSServiceRef>();
+    auto ref = member.connection.get<DNSServiceRef>();
     ::DNSServiceErrorType error = ::DNSServiceGetAddrInfo(&ref,
                                                           flags,
-                                                          from_index(contact.index()),
+                                                          from_index(member.contact.index()),
                                                           protocol,
                                                           host,
                                                           &resolver::callback::on_addrinfo,
                                                           this);
     throw_on_error(error);
 
-    handle.reset(ref);
+    member.handle.reset(ref);
 }
 
 void resolver::on_addrinfo(bool more)
 {
     if (!more)
     {
-        handle.reset();
+        member.handle.reset();
     }
-    listener.on_resolver_done(contact);
+    member.listener.on_resolver_done(member.contact);
 }
 
 } // namespace mdns

src/dnssd/mdns/resolver.hpp

@@ -45,11 +45,14 @@ class resolver
 private:
     struct callback;
 
-    mdns::handle& connection;
-    resolver::listener& listener;
-    mdns::handle handle;
-    aware::contact contact;
-    unsigned short port;
+    struct
+    {
+        mdns::handle& connection;
+        resolver::listener& listener;
+        mdns::handle handle;
+        aware::contact contact;
+        unsigned short port;
+    } member;
 };
 
 } // namespace mdns