dnssd 1.2 → 1.3

data/lib/dnssd/text_record.rb

@@ -1,17 +1,36 @@
+require 'delegate'
+
 ##
-# DNSSD::TextRecord is a Hash wrapper that can encode its contents for DNSSD.
+# DNSSD::TextRecord is a Hash delegate that can encode its contents for DNSSD.
 
-class DNSSD::TextRecord
+class DNSSD::TextRecord < DelegateClass(Hash)
 
   ##
-  # Creates a new TextRecord, decoding an encoded +text_record+ if given.
+  # Creates a new TextRecord decoding an encoded +text_record+ if given or
+  # from a given Hash.
+  #
+  #   DNSSD::TextRecord.new "\003k=v"
+  #
+  # or
+  #
+  #   DNSSD::TextRecord.new 'k' => 'v'
 
   def initialize(text_record = nil)
-    @records = {}
+    super case text_record
+          when Hash then
+            text_record.dup
+          when String then
+            decode(text_record.dup)
+          else
+            Hash.new
+          end
+  end
 
-    return unless text_record
+  ##
+  # Decodes +text_record+ and returns a Hash
 
-    text_record = text_record.dup
+  def decode(text_record)
+    record = {}
 
     until text_record.empty? do
       size = text_record.slice! 0
@@ -28,16 +47,10 @@ class DNSSD::TextRecord
 
       next unless key
 
-      @records[key] = value
+      record[key] = value
     end
-  end
 
-  def [](key)
-    @records[key]
-  end
-
-  def []=(key, value)
-    @records[key] = value
+    record
   end
 
   ##
@@ -46,7 +59,7 @@ class DNSSD::TextRecord
   # clients.
 
   def encode
-    @records.sort.map do |key, value|
+    sort.map do |key, value|
       key = key.to_s
 
       raise DNSSD::Error, "empty key" if key.empty?
@@ -61,9 +74,5 @@ class DNSSD::TextRecord
     end.join ''
   end
 
-  def to_hash
-    @records.dup
-  end
-
 end
 

data/sample/browse.rb

@@ -1,11 +1,29 @@
 require 'dnssd'
 
-browser = DNSSD.browse '_presence._tcp' do |reply|
-  p reply
-end
+Thread.abort_on_exception = true
+trap 'INT' do exit end
+trap 'TERM' do exit end
+
+browser = DNSSD::Service.new
+services = {}
+
+puts "Browsing for TCP blackjack service"
+puts "(run sample/register.rb)"
+puts
 
-trap 'INT' do browser.stop; exit end
-trap 'TERM' do browser.stop; exit end
+browser.browse '_blackjack._tcp' do |reply|
+  services[reply.fullname] = reply
+  next if reply.flags.more_coming?
 
-sleep
+  services.sort_by do |_, service|
+    [(service.flags.add? ? 0 : 1), service.fullname]
+  end.each do |_, service|
+    add = service.flags.add? ? 'Add' : 'Remove'
+    puts "#{add} #{service.name} on #{service.domain}"
+  end
+
+  services.clear
+
+  puts
+end
 

data/sample/enumerate_domains.rb

@@ -2,8 +2,14 @@ require 'dnssd'
 
 Thread.abort_on_exception = true
 
+domains = []
+
 enumerator = DNSSD.enumerate_domains do |reply|
-  p reply.domain
+  domains << reply.domain
+  next if reply.flags.more_coming?
+
+  puts "Found domains:\n#{domains.join "\n"}"
+  exit
 end
 
 trap 'INT' do enumerator.stop; exit end

data/sample/getaddrinfo.rb

@@ -0,0 +1,28 @@
+require 'dnssd'
+
+Thread.abort_on_exception = true
+
+abort "#{$0} \"http service name\"" if ARGV.empty?
+
+resolver = DNSSD.resolve ARGV.shift, '_http._tcp', 'local' do |reply|
+  addresses = []
+
+  service = DNSSD::Service.new
+  begin
+    service.getaddrinfo reply.target do |addrinfo|
+      addresses << addrinfo.address
+      break unless addrinfo.flags.more_coming?
+    end
+  ensure
+    service.stop
+  end
+
+  puts "Addresses for #{reply.target}:\n#{addresses.join "\n"}"
+  exit
+end
+
+trap 'INT' do resolver.stop; exit end
+trap 'TERM' do resolver.stop; exit end
+
+sleep
+

data/sample/growl.rb

@@ -1,5 +1,7 @@
 require 'dnssd'
 
+Thread.abort_on_exception = true
+
 browser = DNSSD.browse '_growl._tcp' do |b|
   DNSSD.resolve b.name, b.type, b.domain do |r|
     puts "#{b.name} of #{b.type} in #{b.domain} => #{r.target}:#{r.port} on #{b.interface} txt #{r.text_record.inspect}"

data/sample/query_record.rb

@@ -0,0 +1,15 @@
+require 'dnssd'
+
+Thread.abort_on_exception = true
+trap 'INT' do exit end
+trap 'TERM' do exit end
+
+query = DNSSD::Service.new
+
+abort "#{$0} fullname" if ARGV.empty?
+fullname = ARGV.shift
+
+query.query_record fullname, DNSSD::Record::SRV do |record|
+  puts record
+end
+

data/sample/register.rb

@@ -1,30 +1,29 @@
 require 'dnssd'
 
-DNSSD.register "hey ruby", "_http._tcp", nil, 8081
-
-registrar = DNSSD.register "chad ruby", "_http._tcp", nil, 8080 do |reply|
-  p :registered => reply.fullname
-end
-
-sleep 1
+Thread.abort_on_exception = true
+trap 'INT'  do exit end
+trap 'TERM' do exit end
 
+puts "Registering some blackjack services"
+puts "(run sample/browse.rb or sample/resolve.rb)"
 puts
 
-found = {}
+DNSSD.register 'blockless', '_blackjack._tcp', nil, 1025
+puts "registered blockless (no callback)"
 
-browser = DNSSD.browse '_http._tcp' do |reply|
-  if reply.flags.more_coming? then
-    found[reply.name] = true
-  else
-    puts "found:\n#{found.keys.join "\n"}"
-    puts
-
-    found.clear
-  end
+DNSSD.register 'block', '_blackjack._tcp', nil, 1026 do |r|
+  puts "registered #{r.fullname}" if r.flags.add?
 end
 
-sleep 0.1
+registrar = DNSSD::Service.new
+
+service = nil
 
-browser.stop
-registrar.stop
+tr = DNSSD::TextRecord.new
+tr['foo'] = 'bar'
+registrar.register 'add_record', '_blackjack._tcp', nil, 1027, nil, tr do |r|
+  puts "registered #{r.fullname}" if r.flags.add?
+  record = registrar.add_record DNSSD::Record::RP, 'nobody.local. .'
+  puts "added RP record"
+end
 

data/sample/resolve.rb

@@ -1,13 +1,37 @@
 require 'dnssd'
 
-abort "#{$0} \"http service name\"" if ARGV.empty?
+Thread.abort_on_exception = true
+trap 'INT' do exit end
+trap 'TERM' do exit end
 
-resolver = DNSSD.resolve ARGV.shift, '_http._tcp', 'local' do |reply|
-  p reply
-end
+puts "Resolving TCP blackjack services"
+puts "(run sample/register.rb)"
+puts
+
+browser = DNSSD::Service.new
+services = {}
+
+browser.browse '_blackjack._tcp' do |reply|
+  services[reply.fullname] = reply
+  next if reply.flags.more_coming?
+
+  services.sort_by do |_, service|
+    [(service.flags.add? ? 0 : 1), service.fullname]
+  end.each do |_, service|
+    next unless service.flags.add?
 
-trap 'INT' do resolver.stop; exit end
-trap 'TERM' do resolver.stop; exit end
+    resolver = DNSSD::Service.new
+    resolver.resolve service do |r|
+      puts "#{r.name} on #{r.target}:#{r.port}"
+      puts "\t#{r.text_record.inspect}" unless r.text_record.empty?
+      break unless r.flags.more_coming?
+    end
 
-sleep
+    resolver.stop
+  end
+
+  services.clear
+
+  puts
+end
 

data/sample/resolve_ichat.rb

@@ -1,12 +1,14 @@
 require 'dnssd'
-require 'pp'
+
+Thread.abort_on_exception = true
+trap 'INT' do exit end
+trap 'TERM' do exit end
 
 class ChatNameResolver
   def self.resolve_add(reply)
     Thread.new reply do |reply|
       DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply|
         puts "Adding: #{resolve_reply.inspect}"
-        pp resolve_reply.text_record
         resolve_reply.service.stop
       end
     end
@@ -21,7 +23,7 @@ class ChatNameResolver
   end
 end
 
-browser = DNSSD.browse '_presence._tcp' do |reply|
+DNSSD.browse '_presence._tcp' do |reply|
   if reply.flags.add? then
     ChatNameResolver.resolve_add reply
   else
@@ -29,8 +31,5 @@ browser = DNSSD.browse '_presence._tcp' do |reply|
   end
 end
 
-trap 'INT' do browser.stop; exit end
-trap 'TERM' do browser.stop; exit end
-
 sleep
 

data/sample/server.rb

@@ -1,5 +1,7 @@
 require 'dnssd'
 
+Thread.abort_on_exception = true
+
 port = Socket.getservbyname 'blackjack'
 blackjack = TCPServer.new nil, port
 

data/sample/socket.rb

@@ -1,8 +1,11 @@
 require 'dnssd'
 
+Thread.abort_on_exception = true
 trap 'INT'  do exit end
 trap 'TERM' do exit end
 
+puts 'run sample/server.rb'
+
 service = nil
 
 DNSSD.browse! '_blackjack._tcp', 'local.' do |reply|
@@ -15,4 +18,5 @@ puts "found service #{service.name}"
 socket = service.connect
 
 puts "Connected to %s:%d" % socket.peeraddr.values_at(2, 1)
+puts "        from %s:%d" % socket.addr.values_at(2, 1)
 

data/test/test_dnssd.rb

@@ -61,14 +61,16 @@ class TestDNSSD < MiniTest::Unit::TestCase
   end
 
   def test_class_interface_index
-    index = DNSSD.interface_index('lo0')
-    refute_equal 0, index, 'what? no lo0?'
+    index = DNSSD.interface_index 'lo0'
+    index = DNSSD.interface_index 'lo' if index.zero?
+    refute_equal 0, index, 'what? no lo0? no lo?'
   end
 
   def test_class_interface_name
-    index = DNSSD.interface_index('lo0')
+    index = DNSSD.interface_index 'lo0'
+    index = DNSSD.interface_index 'lo' if index.zero?
 
-    assert_equal 'lo0', DNSSD.interface_name(index)
+    assert_match %r%^lo0?$%, DNSSD.interface_name(index)
   end
 
 end

data/test/test_dnssd_flags.rb

@@ -65,21 +65,7 @@ class TestDNSSDFlags < MiniTest::Unit::TestCase
   def test_complement
     new_flags = ~@flags
 
-    expected = DNSSD::Flags.new(DNSSD::Flags::Add,
-                                DNSSD::Flags::AllowRemoteQuery,
-                                DNSSD::Flags::BrowseDomains,
-                                DNSSD::Flags::Default,
-                                DNSSD::Flags::Force,
-                                DNSSD::Flags::ForceMulticast,
-                                DNSSD::Flags::LongLivedQuery,
-                                DNSSD::Flags::MoreComing,
-                                DNSSD::Flags::NoAutoRename,
-                                DNSSD::Flags::RegistrationDomains,
-                                DNSSD::Flags::ReturnIntermediates,
-                                DNSSD::Flags::Shared,
-                                DNSSD::Flags::Unique)
-
-    assert_equal expected, new_flags
+    assert_equal DNSSD::Flags.new(*DNSSD::Flags::ALL_FLAGS), new_flags
   end
 
   def test_equals

data/test/test_dnssd_record.rb

@@ -0,0 +1,92 @@
+require 'minitest/autorun'
+require 'dnssd'
+
+class TestDNSSDRecord < MiniTest::Unit::TestCase
+
+  def setup
+    @fullname = 'blackjack._blackjack._tcp.test.'
+    @IN = DNSSD::Record::IN
+    @ipv4 = "\300\000\002\001"
+    @ipv6 = " \001\r\270\000\000\000\000\000\000\000\000\000\000\000\001"
+    @nowhere = "\007nowhere\007example\000"
+
+    @R = DNSSD::Record
+  end
+
+  def test_class_to_data_invalid
+    assert_raises ArgumentError do
+      @R.to_data(-1)
+    end
+  end
+
+  def test_class_to_data_A
+    assert_equal @ipv4, @R.to_data(DNSSD::Record::A, '192.0.2.1')
+    assert_equal @ipv4, @R.to_data(DNSSD::Record::A, IPAddr.new('192.0.2.1'))
+
+    assert_raises ArgumentError do
+      @R.to_data DNSSD::Record::A, '2001:db8::1'
+    end
+  end
+
+  def test_class_to_data_AAAA
+    assert_equal @ipv6, @R.to_data(DNSSD::Record::AAAA, '2001:db8::1')
+    assert_equal @ipv6,
+                 @R.to_data(DNSSD::Record::AAAA, IPAddr.new('2001:db8::1'))
+
+    assert_raises ArgumentError do
+      @R.to_data DNSSD::Record::AAAA, '192.0.2.1'
+    end
+  end
+
+  def test_class_to_data_CNAME
+    assert_equal @nowhere, @R.to_data(DNSSD::Record::CNAME, 'nowhere.example.')
+  end
+
+  def test_class_to_data_MX
+    assert_equal "\000\010#{@nowhere}",
+                 @R.to_data(DNSSD::Record::MX, 8, 'nowhere.example.')
+  end
+
+  def test_class_to_data_NS
+    assert_equal @nowhere, @R.to_data(DNSSD::Record::NS, 'nowhere.example.')
+  end
+
+  def test_class_to_data_PTR
+    assert_equal @nowhere, @R.to_data(DNSSD::Record::PTR, 'nowhere.example.')
+  end
+
+  def test_class_to_data_SOA
+    serial = 1
+    refresh = 86400
+    rtry = 3600
+    expire = 86400 * 2
+    minimum = 3600 * 12
+
+    expected = "#{@nowhere}\002me#{@nowhere}#{[serial, refresh, rtry, expire, minimum].pack 'NNNNN'}"
+
+    data = @R.to_data(DNSSD::Record::SOA, 'nowhere.example.',
+                      'me.nowhere.example.', serial, refresh, rtry, expire,
+                      minimum)
+
+    assert_equal expected, data
+  end
+
+  def test_class_to_data_SRV
+    priority = 1
+    weight = 5
+    port = 1025
+
+    expected = "#{[priority, weight, port].pack 'nnn'}#{@nowhere}"
+
+    assert_equal expected,
+                 @R.to_data(DNSSD::Record::SRV, priority, weight, port,
+                            'nowhere.example.')
+  end
+
+  def test_class_to_data_TXT
+    assert_equal "\005Hello\006World!",
+                 @R.to_data(DNSSD::Record::TXT, 'Hello', 'World!')
+  end
+
+end
+