zeroconf 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b9ec7f1320fa0807e2cdb89addcc9b6796745c9248ac0463a72877d908b74f4
-  data.tar.gz: 3be32a8bdabfc923576ce8ed0b8c9dbf430141aae8be1eaf9bc7898b1f425109
+  metadata.gz: 7e5fe766c828fdaf41bdacf9ecce12d863c4a636f7c2292ec3ca8aef89413950
+  data.tar.gz: 51786741d2dbc2dffb92a1b4ec25b31a994db81aa1d099dc6f530dded84964e7
 SHA512:
-  metadata.gz: b3eedb494ee9507f0e4d541b05f2627fb94d9b63b90d1d1a27f303a901b02fa4c5640719857f35927fd922b511960e753b7e530dc40e30cccf106b0e2cc10168
-  data.tar.gz: ef7526948bbe2a34ae9a850c48ba0d12760ad4acb846c33f808338c277d184d9056e8681246e7bbb6154ce1cd31398feb9a4336c4dc6835bc36a63c489642c6a
+  metadata.gz: 89974e69dce75b540f73e70313944bea011fcfe00bd8519af0cba02cb27e823600325d117efabe2febaac05d8d782edf2ecd5014143e35bfa8a31f27019314bc
+  data.tar.gz: e4f99e2f61956d457d2ae10fdb4969e682f86cb959a9bd7f4937c389a160c07c4a8e9f5f4ca4d5dab925390ed3ac80909b3603698c80629b70e83072ef51ea62

data/Rakefile

@@ -7,6 +7,5 @@ Bundler::GemHelper.install_tasks
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']
-  t.verbose = true
   t.warning = true
 end

data/lib/zeroconf/utils.rb

@@ -23,18 +23,22 @@ module ZeroConf
     ::Resolv::DNS::Resource::ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
   end
 
+  # ZeroConf::A and ZeroConf::SRV are referenced by name when constructing
+  # outgoing queries (see ZeroConf::Resolver). They share the numeric
+  # ClassValue (0x8001) with the MDNS::Announce::IN equivalents below, so
+  # only one of the two should populate Resolv's ClassHash to avoid
+  # "already initialized constant" warnings. The MDNS::Announce::IN side
+  # owns the registration.
   class A < Resolv::DNS::Resource::IN::A
     MDNS_UNICAST_RESPONSE = 0x8000
 
     ClassValue = Resolv::DNS::Resource::IN::ClassValue | MDNS_UNICAST_RESPONSE
-    ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
   end
 
   class SRV < Resolv::DNS::Resource::IN::SRV
     MDNS_UNICAST_RESPONSE = 0x8000
 
     ClassValue = Resolv::DNS::Resource::IN::ClassValue | MDNS_UNICAST_RESPONSE
-    ClassHash[[TypeValue, ClassValue]] = self # :nodoc:
   end
 
   module MDNS

data/lib/zeroconf/version.rb

@@ -1,3 +1,3 @@
 module ZeroConf
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/zeroconf.rb

@@ -46,7 +46,7 @@ module ZeroConf
       port = nil
       ipv4 = []
       ipv6 = []
-      r.additional.each { |name, ttl, data|
+      (r.answer + r.additional).each { |name, ttl, data|
         case data
         when Resolv::DNS::Resource::IN::SRV
           host = data.target.to_s

data/test/client_test.rb

@@ -1,6 +1,45 @@
 require "helper"
 
 module ZeroConf
+  # Mimics responders like Nanoleaf which place SRV in the answer section of
+  # the PTR response instead of in the additional section. See
+  # https://github.com/tenderlove/zeroconf/issues/10
+  class NanoleafService < Service
+    private
+
+    def service_unicast_answer
+      msg = Resolv::DNS::Message.new(0)
+      msg.qr = 1
+      msg.aa = 1
+
+      # SRV goes in ANSWER (Nanoleaf-style), not additional
+      msg.add_answer service_name, 10,
+        Resolv::DNS::Resource::IN::SRV.new(0, 0, service_port, qualified_host)
+
+      service_interfaces.each do |iface|
+        if iface.addr.ipv4?
+          msg.add_additional qualified_host, 10,
+            Resolv::DNS::Resource::IN::A.new(iface.addr.ip_address)
+        else
+          msg.add_additional qualified_host, 10,
+            Resolv::DNS::Resource::IN::AAAA.new(iface.addr.ip_address)
+        end
+      end
+
+      if @text
+        msg.add_additional service_name, 10,
+          Resolv::DNS::Resource::IN::TXT.new(*@text)
+      end
+
+      msg.add_answer service, 10,
+        Resolv::DNS::Resource::IN::PTR.new(Resolv::DNS::Name.create(service_name))
+
+      msg.add_question service, PTR
+
+      msg
+    end
+  end
+
   class ClientTest < Test
     attr_reader :iface
 
@@ -9,6 +48,34 @@ module ZeroConf
       @iface = ZeroConf.interfaces.find_all { |x| x.addr.ipv4? }.first
     end
 
+    # Regression test for https://github.com/tenderlove/zeroconf/issues/10
+    # If a responder places SRV in the answer section (rather than additional),
+    # find_addrinfos must still return a usable [host, Addrinfo] tuple instead
+    # of crashing with "no implicit conversion from nil to integer".
+    def test_find_addrinfos_with_srv_in_answer
+      latch = Queue.new
+      s = NanoleafService.new SERVICE + ".",
+        42424,
+        HOST_NAME,
+        service_interfaces: [iface],
+        text: ["test=1", "other=value"],
+        started_callback: -> { latch << :start }
+      runner = Thread.new { s.start }
+      latch.pop
+
+      addrinfos = ZeroConf.find_addrinfos(SERVICE, timeout: 1)
+
+      s.stop
+      runner.join
+
+      ours = addrinfos.find { |host, _| host == "#{HOST_NAME}.local" }
+      assert ours, "expected to find #{HOST_NAME}.local in #{addrinfos.inspect}"
+      host, addr = ours
+      assert_equal "#{HOST_NAME}.local", host
+      assert_equal 42424, addr.ip_port
+      assert_equal iface.addr.ip_address, addr.ip_address
+    end
+
     def test_resolve
       latch = Queue.new
       s = make_server iface, "coolhostname", started_callback: -> { latch << :start }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeroconf
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Aaron Patterson
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Multicast DNS client and server
 test_files: