zeroconf 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39d1c369a77bb16908b77e600e166c264662ec1fc624de8aee2f62fc752e3aae
-  data.tar.gz: 6f58a84ef9926d9e900182390249b6b029312332a7376cc1f1229b182812bb59
+  metadata.gz: 7f58175fb721fb08fa2a5abb36b0b2165d9b38592bb7ff66bd3a3f4c303ed2f9
+  data.tar.gz: afd32fb72b31c90e84aaea02db2f81e603b872f8f81c1f6f147d15c13ce3713e
 SHA512:
-  metadata.gz: 5a515ce4490d93f37439bec362b84a6bb99c4d42098892f8250d9059537984c9ac6f0c90e9cbf005374f0fdb9abd0a78cb4fd2f7b54e87e05f8acce6eee892cb
-  data.tar.gz: be3a38c8bfab29934aca1d2d1100fa4fdda4aa7bfc8c31fe095a461337cffc67b44ac1d982c2faf8f6131891c9eee1a9d444932fa5899b353b0f12e9b8968210
+  metadata.gz: 2e4faed4b18775a5fec2faf0b4064556356699b049c6ca1d6d2d4c03b685cd8702e3ba8591d098799d3ec6ee54efdb9aee1f0e5ea68578b92c1df7ea8fbbba7b
+  data.tar.gz: 210e338f7d21bbe98df962e4785e0716e2364e538fb44c1029217465fca0fe6ea2f414986d4bb7ce0f3588efd5bfbbd8caeb140ef5f1028b5e75b58648de57e6

data/README.md

@@ -108,12 +108,14 @@ to run an HTTP server and simultaneously advertise the server:
 
 ```ruby
 require "zeroconf"
-require 'webrick'
+require "webrick"
 
 port = 8080
 host = "test-hostname"
 
-Thread.new { ZeroConf.service "_http._tcp.local.", port, host }
+Ractor.new(port, host) { |port, host|
+  ZeroConf.service "_http._tcp.local.", port, host
+}
 
 server = WEBrick::HTTPServer.new(:Port => port,
                                  :SSLEnable => false,

data/lib/zeroconf/client.rb

@@ -14,7 +14,7 @@ module ZeroConf
     end
 
     def run timeout: 3
-      sockets = open_interfaces interfaces.map(&:addr), Resolv::MDNS::Port
+      sockets = open_interfaces interfaces.map(&:addr), 0
 
       query = get_query
       sockets.each { |socket| multicast_send(socket, query.encode) }

data/lib/zeroconf/service.rb

@@ -7,15 +7,24 @@ module ZeroConf
     include Utils
 
     attr_reader :service, :service_port, :hostname, :service_interfaces,
-      :service_name, :qualified_host, :text
+      :service_name, :qualified_host, :text, :abort_on_malformed_requests
 
-    def initialize service, service_port, hostname = Socket.gethostname, service_interfaces: ZeroConf.service_interfaces, text: [""]
+    def initialize service, service_port, hostname = Socket.gethostname, service_interfaces: ZeroConf.service_interfaces, instance_name: nil, text: [""], abort_on_malformed_requests: false, started_callback: nil
       @service = service
       @service_port = service_port
-      @hostname = hostname
+
+      @hostname = strip_dot_local(hostname) # We re-add .local anyway, later on
       @service_interfaces = service_interfaces
-      @service_name = "#{hostname}.#{service}"
-      @qualified_host = "#{hostname}.local."
+      @abort_on_malformed_requests = abort_on_malformed_requests
+
+      instance_name ||= @hostname
+      if instance_name.include?(".")
+        raise ArgumentError, "instance_name must not contain dots (is #{instance_name.inspect})" 
+      end
+
+      @service_name = "#{instance_name}.#{@service}"
+      @qualified_host = "#{@hostname}.local."
+      @started_callback = started_callback
       @text = text
       @started = false
       @rd, @wr = IO.pipe
@@ -88,6 +97,7 @@ module ZeroConf
     end
 
     def stop
+      return unless @started
       @wr.write "x"
       @wr.close
       @started = false
@@ -104,16 +114,27 @@ module ZeroConf
       multicast_send(sock, msg.encode)
 
       @started = true
+      @started_callback&.call
 
       loop do
         readers, = IO.select(sockets, [], [])
         next unless readers
 
         readers.each do |reader|
-          return if reader == @rd
+          if reader == @rd
+            @rd.close
+            return
+          end
 
           buf, from = reader.recvfrom 2048
-          msg = Resolv::DNS::Message.decode(buf)
+          msg = begin
+            Resolv::DNS::Message.decode(buf)
+          rescue Resolv::DNS::DecodeError
+            next unless abort_on_malformed_requests
+            @rd.close
+            stop
+            raise
+          end
 
           has_flags = (buf.getbyte(3) << 8 | buf.getbyte(2)) != 0
 
@@ -122,9 +143,7 @@ module ZeroConf
 
             break unless class_type == 1 || class_type == 255
 
-            legacy = from[1] != Resolv::MDNS::Port
-            unicast = legacy || type::ClassValue & PTR::MDNS_UNICAST_RESPONSE > 0
-            reply_id = legacy ? msg.id : 0
+            unicast = type::ClassValue & PTR::MDNS_UNICAST_RESPONSE > 0
 
             qn = name.to_s + "."
 
@@ -133,25 +152,25 @@ module ZeroConf
               break if has_flags
 
               if unicast
-                dnssd_unicast_answer(id: reply_id, legacy: legacy)
+                dnssd_unicast_answer
               else
                 dnssd_multicast_answer
               end
             when service
               if unicast
-                service_unicast_answer(id: reply_id, legacy: legacy)
+                service_unicast_answer
               else
                 service_multicast_answer
               end
             when service_name
               if unicast
-                service_instance_unicast_answer(id: reply_id, legacy: legacy)
+                service_instance_unicast_answer
               else
                 service_instance_multicast_answer
               end
             when qualified_host
               if unicast
-                name_answer_unicast(id: reply_id, legacy: legacy)
+                name_answer_unicast
               else
                 name_answer_multicast
               end
@@ -178,11 +197,10 @@ module ZeroConf
 
     private
 
-    def service_instance_unicast_answer(id:, legacy:)
+    def service_instance_unicast_answer
       msg = Resolv::DNS::Message.new(0)
       msg.qr = 1
       msg.aa = 1
-      msg.id = id
 
       service_interfaces.each do |iface|
         if iface.addr.ipv4?
@@ -202,16 +220,15 @@ module ZeroConf
           Resolv::DNS::Resource::IN::TXT.new(*@text)
       end
       msg.add_answer service_name, 10, Resolv::DNS::Resource::IN::SRV.new(0, 0, service_port, qualified_host)
-      msg.add_question service_name, legacy ? Resolv::DNS::Resource::IN::SRV : MDNS::Announce::IN::SRV
+      msg.add_question service_name, MDNS::Announce::IN::SRV
 
       msg
     end
 
-    def service_unicast_answer(id:, legacy:)
+    def service_unicast_answer
       msg = Resolv::DNS::Message.new(0)
       msg.qr = 1
       msg.aa = 1
-      msg.id = id
 
       msg.add_additional service_name, 10, Resolv::DNS::Resource::IN::SRV.new(0, 0, service_port, qualified_host)
 
@@ -237,21 +254,20 @@ module ZeroConf
         10,
         Resolv::DNS::Resource::IN::PTR.new(Resolv::DNS::Name.create(service_name))
 
-      msg.add_question service, legacy ? Resolv::DNS::Resource::IN::PTR : PTR
+      msg.add_question service, PTR
 
       msg
     end
 
-    def dnssd_unicast_answer(id:, legacy:)
+    def dnssd_unicast_answer
       msg = Resolv::DNS::Message.new(0)
       msg.qr = 1
       msg.aa = 1
-      msg.id = id
 
       msg.add_answer DISCOVERY_NAME, 10,
         Resolv::DNS::Resource::IN::PTR.new(Resolv::DNS::Name.create(service))
 
-      msg.add_question DISCOVERY_NAME, legacy ? Resolv::DNS::Resource::IN::PTR : PTR
+      msg.add_question DISCOVERY_NAME, PTR
       msg
     end
 
@@ -325,11 +341,10 @@ module ZeroConf
       msg
     end
 
-    def name_answer_unicast(id:, legacy:)
+    def name_answer_unicast
       msg = Resolv::DNS::Message.new(0)
       msg.qr = 1
       msg.aa = 1
-      msg.id = id
 
       first = true
 
@@ -358,7 +373,7 @@ module ZeroConf
         end
       end
 
-      msg.add_question qualified_host, legacy ? Resolv::DNS::Resource::IN::A : MDNS::Announce::IN::A
+      msg.add_question qualified_host, MDNS::Announce::IN::A
 
       if @text
         msg.add_additional service_name,

data/lib/zeroconf/utils.rb

@@ -4,7 +4,6 @@ require "socket"
 require "ipaddr"
 require "fcntl"
 require "resolv"
-require "rbconfig"
 
 module ZeroConf
   MDNS_CACHE_FLUSH = 0x8000
@@ -58,7 +57,7 @@ module ZeroConf
     def open_ipv4 saddr, port
       sock = UDPSocket.new Socket::AF_INET
       sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
-      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, true) unless RbConfig::CONFIG["host_os"].include?("linux")
+      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, true)
       sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_MULTICAST_TTL, true)
       sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_MULTICAST_LOOP, true)
       sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP,
@@ -70,8 +69,8 @@ module ZeroConf
       sock
     end
 
-    BROADCAST_V4 = Addrinfo.new Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV4)
-    BROADCAST_V6 = Addrinfo.new Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV6)
+    BROADCAST_V4 = Addrinfo.new(Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV4)).freeze
+    BROADCAST_V6 = Addrinfo.new(Socket.sockaddr_in(Resolv::MDNS::Port, Resolv::MDNS::AddressV6)).freeze
 
     def multicast_send sock, query
       dest = if sock.local_address.ipv4?
@@ -95,10 +94,14 @@ module ZeroConf
       sock.send(data, 0, Addrinfo.new(to))
     end
 
+    def strip_dot_local(from_string)
+      from_string.to_s.gsub(/\.local\.?$/, "")
+    end
+
     def open_ipv6 saddr, port
       sock = UDPSocket.new Socket::AF_INET6
       sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
-      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, true) unless RbConfig::CONFIG["host_os"].include?("linux")
+      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, true)
       sock.setsockopt(Socket::IPPROTO_IPV6, Socket::IPV6_MULTICAST_HOPS, true)
       sock.setsockopt(Socket::IPPROTO_IPV6, Socket::IPV6_MULTICAST_LOOP, true)
 

data/lib/zeroconf/version.rb

@@ -1,3 +1,3 @@
 module ZeroConf
-  VERSION = "1.0.1"
+  VERSION = "1.2.0"
 end

data/lib/zeroconf.rb

@@ -67,8 +67,8 @@ module ZeroConf
     resolver.run(timeout:, &blk)
   end
 
-  def self.service service, service_port, hostname = Socket.gethostname, service_interfaces: self.service_interfaces, text: [""]
-    s = Service.new(service, service_port, hostname, service_interfaces:, text:)
+  def self.service ...
+    s = Service.new(...)
     s.start
   end
 

data/test/client_test.rb

@@ -10,9 +10,10 @@ module ZeroConf
     end
 
     def test_resolve
-      s = make_server iface, "coolhostname"
+      latch = Queue.new
+      s = make_server iface, "coolhostname", started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
       found = nil
 
       name = "coolhostname.local"
@@ -33,9 +34,10 @@ module ZeroConf
     end
 
     def test_resolve_returns_early
-      s = make_server iface, "coolhostname"
+      latch = Queue.new
+      s = make_server iface, "coolhostname", started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
       found = nil
 
       name = "coolhostname.local"
@@ -57,9 +59,10 @@ module ZeroConf
     end
 
     def test_discover_works
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
       found = nil
 
       took = time_it do
@@ -78,9 +81,10 @@ module ZeroConf
     end
 
     def test_discover_return_early
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
       found = nil
 
       took = time_it do
@@ -99,9 +103,10 @@ module ZeroConf
     end
 
     def test_browse
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
       found = nil
 
       took = time_it do
@@ -121,9 +126,10 @@ module ZeroConf
     end
 
     def test_browse_returns_early
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
       found = nil
 
       took = time_it do

data/test/helper.rb

@@ -39,16 +39,18 @@ module ZeroConf
       Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
     end
 
-    def make_server iface, host = HOST_NAME
+    def make_server iface, host = HOST_NAME, **opts
       Service.new SERVICE + ".",
         42424,
         host,
-        service_interfaces: [iface], text: ["test=1", "other=value"]
+        service_interfaces: [iface], text: ["test=1", "other=value"],
+        **opts
     end
 
-    def make_listener rd, q
+    def make_listener rd, q, started_callback: nil
       Thread.new do
         sock = open_ipv4 Addrinfo.new(Socket.sockaddr_in(Resolv::MDNS::Port, Socket::INADDR_ANY)), Resolv::MDNS::Port
+        started_callback&.call
         Thread.current[:started] = true
         loop do
           readers, = IO.select([sock, rd])

data/test/service_test.rb

@@ -26,44 +26,45 @@ module ZeroConf
       assert_equal [""], s.text
     end
 
-    def test_unicast_service_instance_answer
-      s = make_server iface
-      runner = Thread.new { s.start }
-      Thread.pass until s.started?
-
-      query = Resolv::DNS::Message.new 10
-      query.add_question "tc-lan-adapter._test-mdns._tcp.local.", SRV
-
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
-      multicast_send sock, query.encode
-      res = Resolv::DNS::Message.decode read_with_timeout(sock).first
-      s.stop
-      runner.join
+    def test_raises_when_creating_a_service_with_dot_in_the_name
+      assert_raises ArgumentError do
+        Service.new "_test-mdns._tcp.local.", 42424,
+          "some.subdomain.workstation"
+      end
 
-      expected = Resolv::DNS::Message.new(0)
-      expected.qr = 1
-      expected.aa = 1
+      assert_raises ArgumentError do
+        Service.new "_test-mdns._tcp.local.", 42424,
+          "ruby-mdns", instance_name: "ruby.test"
+      end
+    end
 
-      expected.add_additional s.qualified_host,
-        10,
-        Resolv::DNS::Resource::IN::A.new(iface.addr.ip_address)
+    def test_sets_correct_service_name_from_instance_name
+      s = Service.new "_test-mdns._tcp.local.", 42424,
+        "my-rb-service", instance_name: "My RB service"
+      assert_equal "my-rb-service.local.", s.qualified_host
+      assert_equal "My RB service._test-mdns._tcp.local.", s.service_name
+    end
 
-      expected.add_additional s.service_name,
-        10,
-        Resolv::DNS::Resource::IN::TXT.new(*s.text)
-      expected.add_answer s.service_name, 10, Resolv::DNS::Resource::IN::SRV.new(0, 0, s.service_port, s.qualified_host)
-      expected.add_question s.service_name, MDNS::Announce::IN::SRV
+    def test_removes_dot_local_tld_from_passed_hostname
+      s = Service.new "_test-mdns._tcp.local.", 42424,
+        "ThisMac.local"
+      assert_equal "ThisMac.local.", s.qualified_host
+      assert_equal "ThisMac._test-mdns._tcp.local.", s.service_name
 
-      assert_equal expected, res
+      s = Service.new "_test-mdns._tcp.local.", 42424,
+        "ThisMac.local."
+      assert_equal "ThisMac.local.", s.qualified_host
+      assert_equal "ThisMac._test-mdns._tcp.local.", s.service_name
     end
 
-    def test_legacy_unicast_service_instance_answer
-      s = make_server iface
+    def test_unicast_service_instance_answer
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
-      query.add_question "tc-lan-adapter._test-mdns._tcp.local.", Resolv::DNS::Resource::IN::SRV
+      query = Resolv::DNS::Message.new 0
+      query.add_question "tc-lan-adapter._test-mdns._tcp.local.", SRV
 
       sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
@@ -71,7 +72,7 @@ module ZeroConf
       s.stop
       runner.join
 
-      expected = Resolv::DNS::Message.new(10)
+      expected = Resolv::DNS::Message.new(0)
       expected.qr = 1
       expected.aa = 1
 
@@ -83,7 +84,7 @@ module ZeroConf
         10,
         Resolv::DNS::Resource::IN::TXT.new(*s.text)
       expected.add_answer s.service_name, 10, Resolv::DNS::Resource::IN::SRV.new(0, 0, s.service_port, s.qualified_host)
-      expected.add_question s.service_name, Resolv::DNS::Resource::IN::SRV
+      expected.add_question s.service_name, MDNS::Announce::IN::SRV
 
       assert_equal expected, res
     end
@@ -93,13 +94,14 @@ module ZeroConf
       rd, wr = IO.pipe
 
       listen = make_listener rd, q
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       server = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
+      query = Resolv::DNS::Message.new 0
       query.add_question "_services._dns-sd._udp.local.", Resolv::DNS::Resource::IN::PTR
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
 
       while res = q.pop
@@ -196,14 +198,15 @@ module ZeroConf
     end
 
     def test_dnssd_unicast_answer
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
+      query = Resolv::DNS::Message.new 0
       query.add_question "_services._dns-sd._udp.local.", PTR
 
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
 
       res = nil
@@ -230,53 +233,20 @@ module ZeroConf
       assert_equal expected, res
     end
 
-    def test_dnssd_legacy_unicast_answer
-      s = make_server iface
-      runner = Thread.new { s.start }
-      Thread.pass until s.started?
-
-      query = Resolv::DNS::Message.new 10
-      query.add_question "_services._dns-sd._udp.local.", Resolv::DNS::Resource::IN::PTR
-
-      sock = open_ipv4 iface.addr, 0
-      multicast_send sock, query.encode
-
-      res = nil
-      loop do
-        buf, from = read_with_timeout sock
-        res = Resolv::DNS::Message.decode buf
-        if from.last == iface.addr.ip_address
-          break if res.answer.find { |name, ttl, data| data.name.to_s == SERVICE }
-        end
-      end
-
-      s.stop
-      runner.join
-
-      expected = Resolv::DNS::Message.new(10)
-      expected.qr = 1
-      expected.aa = 1
-
-      expected.add_answer DISCOVERY_NAME, 10,
-        Resolv::DNS::Resource::IN::PTR.new(Resolv::DNS::Name.create(s.service))
-
-      expected.add_question DISCOVERY_NAME, Resolv::DNS::Resource::IN::PTR
-
-      assert_equal expected, res
-    end
-
     def test_service_multicast_answer
       q = Thread::Queue.new
       rd, wr = IO.pipe
 
-      listen = make_listener rd, q
-      s = make_server iface
+      latch = Queue.new
+      listen = make_listener rd, q, started_callback: -> { latch << :start }
+      s = make_server iface, started_callback: -> { latch << :start }
       server = Thread.new { s.start }
-      Thread.pass until s.started? && listen[:started]
+      latch.pop
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
+      query = Resolv::DNS::Message.new 0
       query.add_question "_test-mdns._tcp.local.", Resolv::DNS::Resource::IN::PTR
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
 
       service = Resolv::DNS::Name.create s.service
@@ -316,14 +286,15 @@ module ZeroConf
     end
 
     def test_service_unicast_answer
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
+      query = Resolv::DNS::Message.new 0
       query.add_question "_test-mdns._tcp.local.", PTR
 
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
       res = Resolv::DNS::Message.decode read_with_timeout(sock).first
       s.stop
@@ -349,53 +320,20 @@ module ZeroConf
       assert_equal expected, res
     end
 
-    def test_service_legacy_unicast_answer
-      s = make_server iface
-      runner = Thread.new { s.start }
-      Thread.pass until s.started?
-
-      query = Resolv::DNS::Message.new 10
-      query.add_question "_test-mdns._tcp.local.", PTR
-
-      sock = open_ipv4 iface.addr, 0
-      multicast_send sock, query.encode
-      res = Resolv::DNS::Message.decode read_with_timeout(sock).first
-      s.stop
-      runner.join
-
-      expected = Resolv::DNS::Message.new(10)
-      expected.qr = 1
-      expected.aa = 1
-
-      expected.add_additional s.service_name, 10, Resolv::DNS::Resource::IN::SRV.new(0, 0, s.service_port, s.qualified_host)
-      expected.add_additional s.qualified_host,
-            10,
-            Resolv::DNS::Resource::IN::A.new(iface.addr.ip_address)
-
-      expected.add_additional s.service_name,
-        10,
-        Resolv::DNS::Resource::IN::TXT.new(*s.text)
-      expected.add_answer s.service,
-        10,
-        Resolv::DNS::Resource::IN::PTR.new(Resolv::DNS::Name.create(s.service_name))
-      expected.add_question s.service, Resolv::DNS::Resource::IN::PTR
-
-      assert_equal expected, res
-    end
-
-
     def test_multicast_service_instance_answer
       q = Queue.new
       rd, wr = IO.pipe
 
-      listen = make_listener rd, q
-      s = make_server iface
+      latch = Queue.new
+      listen = make_listener rd, q, started_callback: -> { latch << :start }
+      s = make_server iface, started_callback: -> { latch << :start }
       server = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
+      query = Resolv::DNS::Message.new 0
       query.add_question "tc-lan-adapter._test-mdns._tcp.local.", Resolv::DNS::Resource::IN::PTR
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
 
       service_name = Resolv::DNS::Name.create s.service_name
@@ -430,14 +368,15 @@ module ZeroConf
     end
 
     def test_unicast_name_lookup
-      s = make_server iface
+      latch = Queue.new
+      s = make_server iface, started_callback: -> { latch << :start }
       runner = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
+      query = Resolv::DNS::Message.new 0
       query.add_question "tc-lan-adapter.local.", A
 
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
       res = Resolv::DNS::Message.decode read_with_timeout(sock).first
       s.stop
@@ -459,48 +398,20 @@ module ZeroConf
       assert_equal expected, res
     end
 
-    def test_legacy_unicast_name_lookup
-      s = make_server iface
-      runner = Thread.new { s.start }
-      Thread.pass until s.started?
-
-      query = Resolv::DNS::Message.new 10
-      query.add_question "tc-lan-adapter.local.", Resolv::DNS::Resource::IN::A
-
-      sock = open_ipv4 iface.addr, 0
-      multicast_send sock, query.encode
-      res = Resolv::DNS::Message.decode read_with_timeout(sock).first
-      s.stop
-      runner.join
-
-      expected = Resolv::DNS::Message.new(10)
-      expected.qr = 1
-      expected.aa = 1
-
-      expected.add_answer s.qualified_host, 10, Resolv::DNS::Resource::IN::A.new(iface.addr.ip_address)
-
-      expected.add_additional s.service_name,
-        10,
-        Resolv::DNS::Resource::IN::TXT.new(*s.text)
-
-      expected.add_question s.qualified_host,
-        Resolv::DNS::Resource::IN::A
-
-      assert_equal expected, res
-    end
-
     def test_multicast_name
       q = Queue.new
       rd, wr = IO.pipe
 
-      listen = make_listener rd, q
-      s = make_server iface
+      latch = Queue.new
+      listen = make_listener rd, q, started_callback: -> { latch << :start }
+      s = make_server iface, started_callback: -> { latch << :start }
       server = Thread.new { s.start }
-      Thread.pass until s.started?
+      latch.pop
+      latch.pop
 
-      query = Resolv::DNS::Message.new 10
+      query = Resolv::DNS::Message.new 0
       query.add_question "tc-lan-adapter.local.", Resolv::DNS::Resource::IN::A
-      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      sock = open_ipv4 iface.addr, 0
       multicast_send sock, query.encode
 
       host = Resolv::DNS::Name.create s.qualified_host
@@ -529,6 +440,21 @@ module ZeroConf
       assert_equal expected, res
     end
 
+    def test_raise_on_malformed_requests
+      latch = Queue.new
+      s = make_server iface, abort_on_malformed_requests: true, started_callback: -> { latch << :start }
+      runner = Thread.new {
+        assert_raises do
+          s.start
+        end
+      }
+      latch.pop
+
+      sock = open_ipv4 iface.addr, Resolv::MDNS::Port
+      multicast_send sock, "not a valid DNS message"
+      runner.join
+    end
+
     def read_with_timeout sock
       return unless sock.wait_readable(3)
       sock.recvfrom(2048)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: zeroconf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Aaron Patterson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resolv
@@ -80,7 +79,6 @@ homepage: https://github.com/tenderlove/zeroconf
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Multicast DNS client and server
 test_files: