dnssd 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.3.3 / 2010-08-29
+
+* Bug fixes
+  * Fix LocalJumpError issue on 1.9.  Patch by Tim Lucas.
+  * Force reverse lookup on 1.9 for tests.  Patch by Tim Lucas.
+  * Fix default protocol for DNSSD::Service.getaddrinfo to prevent a crash.
+    Patch by Adam Elliot.
+  * Possibly fix solaris compilation by adding -lxnet.  Issue #5 by Pedro
+    Palazón Candel.
+
 === 1.3.2 / 2010-08-28
 
 * Bug fixes

data/Manifest.txt

@@ -34,7 +34,6 @@ sample/server.rb
 sample/socket.rb
 test/test_dnssd.rb
 test/test_dnssd_flags.rb
-test/test_dnssd_getaddrinfo.rb
 test/test_dnssd_record.rb
 test/test_dnssd_reply.rb
 test/test_dnssd_reply_browse.rb

data/ext/dnssd/extconf.rb

@@ -33,6 +33,13 @@ if have_header 'iphlpapi.h' then
   have_func('if_nametoindex', %w[iphlpapi.h netioapi.h]) ||
   abort('unable to find if_indextoname or if_nametoindex')
 else
+  if RUBY_PLATFORM =~ /solaris/ then
+    have_library('xnet') ||
+      abort('unable to find xnet library for if_indextoname/if_nametoindex')
+
+    $CFLAGS << ' -lxnet'
+  end
+
   have_func('if_indextoname', %w[sys/types.h sys/socket.h net/if.h]) &&
   have_func('if_nametoindex', %w[sys/types.h sys/socket.h net/if.h]) ||
   abort('unable to find if_indextoname or if_nametoindex')

data/lib/dnssd.rb

@@ -13,7 +13,7 @@ module DNSSD
   ##
   # The version of DNSSD you're using.
 
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
   ##
   # Registers +socket+ with DNSSD as +name+.  If +service+ is omitted it is
@@ -28,7 +28,7 @@ module DNSSD
 
   def self.announce(socket, name, service = nil, text_record = nil, flags = 0,
                     interface = DNSSD::InterfaceAny, &block)
-    _, port, _, address = socket.addr
+    _, port, = socket.addr
 
     raise ArgumentError, 'socket not bound' if port == 0
 

data/lib/dnssd/reply/resolve.rb

@@ -63,8 +63,6 @@ class DNSSD::Reply::Resolve < DNSSD::Reply
                         else raise ArgumentError, "invalid family #{family}"
                         end
 
-    addresses = []
-
     service = DNSSD::Service.new
 
     begin

data/test/test_dnssd.rb

@@ -20,7 +20,6 @@ class TestDNSSD < MiniTest::Unit::TestCase
     DNSSD.browse '_blackjack._tcp' do |reply|
       next unless 'blackjack tcp server' == reply.name
       t[:reply] = reply
-      break
     end
 
     s = TCPServer.new 'localhost', @port
@@ -37,10 +36,8 @@ class TestDNSSD < MiniTest::Unit::TestCase
   def test_class_announce_tcp_server_service
     t = Thread.current
 
-    resolver = DNSSD.resolve 'blackjack resolve', '_blackjack._tcp',
-                             'local.' do |reply|
+    DNSSD.resolve 'blackjack resolve', '_blackjack._tcp', 'local.' do |reply|
       t[:reply] = reply
-      break
     end
 
     s = TCPServer.new 'localhost', @port + 1

data/test/test_dnssd_reply_resolve.rb

@@ -19,7 +19,12 @@ class TestDNSSDReplyResolve < MiniTest::Unit::TestCase
 
     assert_instance_of TCPSocket, socket
     assert_equal @port,       socket.peeraddr[1]
-    assert_equal 'localhost', socket.peeraddr[2]
+
+    if socket.method(:peeraddr).arity.zero? then
+      assert_equal 'localhost', socket.peeraddr[2]
+    else
+      assert_equal 'localhost', socket.peeraddr(true)[2]
+    end
   ensure
     socket.close if socket
     server.close if server
@@ -37,7 +42,12 @@ class TestDNSSDReplyResolve < MiniTest::Unit::TestCase
 
     assert_instance_of UDPSocket, socket
     assert_equal @port,       socket.peeraddr[1]
-    assert_equal 'localhost', socket.peeraddr[2]
+
+    if socket.method(:peeraddr).arity.zero? then
+      assert_equal 'localhost', socket.peeraddr[2]
+    else
+      assert_equal 'localhost', socket.peeraddr(true)[2]
+    end
   ensure
     socket.close if socket
     server.close if server

data/test/test_dnssd_service.rb

@@ -8,5 +8,20 @@ class TestDNSSDService < MiniTest::Unit::TestCase
                    DNSSD::Service.get_property(DNSSD::Service::DaemonVersion)
   end if DNSSD::Service.respond_to? :get_property
 
+  def test_class_getaddrinfo
+    service = DNSSD::Service.new
+
+    addresses = []
+    begin
+      service.getaddrinfo 'localhost' do |addrinfo|
+        addresses << addrinfo.address
+        break unless addrinfo.flags.more_coming?
+      end
+    ensure
+      service.stop
+    end
+    assert addresses.index('127.0.0.1')
+  end
+
 end
 

data/test/test_dnssd_text_record.rb

@@ -2,13 +2,10 @@ require 'minitest/autorun'
 require 'dnssd'
 
 class TestDNSSDTextRecord < MiniTest::Unit::TestCase
-
-  def setup
-    @TR = DNSSD::TextRecord
-  end
+  TR = DNSSD::TextRecord
 
   def test_encode
-    tr = @TR.new
+    tr = TR.new
 
     tr['key1'] = nil
     tr['key2'] = ''
@@ -18,7 +15,7 @@ class TestDNSSDTextRecord < MiniTest::Unit::TestCase
   end
 
   def test_encode_long
-    tr = @TR.new
+    tr = TR.new
 
     tr['key'] = 'X' * 252
 
@@ -48,35 +45,35 @@ class TestDNSSDTextRecord < MiniTest::Unit::TestCase
       'email'     => ''
     }
 
-    assert_equal expected, @TR.new(text_record).to_hash
+    assert_equal expected, TR.new(text_record).to_hash
   end
 
   def test_decode_bad
     assert_raises ArgumentError do
-      @TR.new("\x01") # length past end-of-record
+      TR.new("\x01") # length past end-of-record
     end
 
     assert_raises ArgumentError do
       # no key
-      @TR.new("\x01=")
+      TR.new("\x01=")
     end
 
     assert_raises ArgumentError do
       # 0-length key
-      @TR.new("\x02=v")
+      TR.new("\x02=v")
     end
   end
 
   def test_decode_empty
-    assert_equal({}, @TR.new(""))
-    assert_equal({}, @TR.new("\x00"))
-    assert_equal({}, @TR.new("\x00\x00"))
+    assert_equal({}, TR.new(""))
+    assert_equal({}, TR.new("\x00"))
+    assert_equal({}, TR.new("\x00\x00"))
   end
 
   def test_decode_value
-    assert_equal({ 'k' => nil }, @TR.new("\x01k").to_hash)
-    assert_equal({ 'k' => ''  }, @TR.new("\x02k=").to_hash)
-    assert_equal({ 'k' => 'v' }, @TR.new("\x03k=v").to_hash)
+    assert_equal({ 'k' => nil }, TR.new("\x01k").to_hash)
+    assert_equal({ 'k' => ''  }, TR.new("\x02k=").to_hash)
+    assert_equal({ 'k' => 'v' }, TR.new("\x03k=v").to_hash)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnssd
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Eric Hodel
@@ -41,7 +41,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-08-28 00:00:00 +09:00
+date: 2010-08-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,7 +193,6 @@ files:
 - sample/socket.rb
 - test/test_dnssd.rb
 - test/test_dnssd_flags.rb
-- test/test_dnssd_getaddrinfo.rb
 - test/test_dnssd_record.rb
 - test/test_dnssd_reply.rb
 - test/test_dnssd_reply_browse.rb
@@ -239,7 +238,6 @@ summary: DNS Service Discovery (aka Bonjour, MDNS) API for Ruby
 test_files: 
 - test/test_dnssd.rb
 - test/test_dnssd_flags.rb
-- test/test_dnssd_getaddrinfo.rb
 - test/test_dnssd_record.rb
 - test/test_dnssd_reply.rb
 - test/test_dnssd_reply_browse.rb

data/test/test_dnssd_getaddrinfo.rb

@@ -1,23 +0,0 @@
-require 'minitest/autorun'
-require 'dnssd'
-require 'socket'
-
-class TestDNSSD < MiniTest::Unit::TestCase
-
-  def test_getaddrinfo
-    service = DNSSD::Service.new
-
-    addresses = []
-    begin
-      service.getaddrinfo 'localhost' do |addrinfo|
-        addresses << addrinfo.address
-        break unless addrinfo.flags.more_coming?
-      end
-    ensure
-      service.stop
-    end
-    assert addresses.index('127.0.0.1')
-  end
-
-end
-