dnssd 1.3.4 → 1.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.4 / 2010-09-07
+
+* Minor enhancements
+  * Where Encoding is available dnssd now converts to/from UTF-8.
+
 === 1.3.4 / 2010-08-29
 
 * Bug fixes

data/ext/dnssd/dnssd.h

@@ -2,6 +2,7 @@
 #define RDNSSD_INCLUDED
 
 #include <ruby.h>
+
 #include <dns_sd.h>
 
 #include <arpa/inet.h>  /* htons ntohs */
@@ -22,6 +23,21 @@
 #define SIN_LEN(si) sizeof(struct sockaddr_in)
 #endif
 
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#define dnssd_utf8_cstr(str, to) \
+  do {\
+    VALUE utf8;\
+    utf8 = rb_str_encode(str, rb_enc_from_encoding(rb_utf8_encoding()),\
+        0, Qnil);\
+    to = StringValueCStr(utf8);\
+  } while (0)
+#else
+#define dnssd_utf8_cstr(str, to) \
+  do { to = StringValueCStr(str); } while (0)
+#define rb_enc_associate(a, b) do {} while (0)
+#endif
+
 extern VALUE eDNSSDError;
 
 void dnssd_check_error_code(DNSServiceErrorType e);

data/ext/dnssd/extconf.rb

@@ -45,6 +45,7 @@ else
   abort('unable to find if_indextoname or if_nametoindex')
 end
 
+# HACK prefer Socket.getservbyport in 1.9
 have_func('getservbyport', 'netdb.h') ||
 abort('unable to find getservbyport')
 
@@ -69,5 +70,10 @@ have_func 'kDNSServiceFlagsShareConnection', 'dns_sd.h'
 # avahi 0.6.25 is missing errors after BadTime
 have_func 'kDNSServiceErr_BadSig', 'dns_sd.h'
 
+puts
+puts 'checking for ruby features'
+have_header 'ruby/encoding.h'
+
+puts
 create_makefile 'dnssd/dnssd'
 

data/ext/dnssd/service.c

@@ -61,6 +61,7 @@ dnssd_service_free(void *ptr) {
 static VALUE
 create_fullname(const char *name, const char *regtype,
     const char *domain) {
+  VALUE fullname;
   char buffer[kDNSServiceMaxDomainName];
 
   if (DNSServiceConstructFullName(buffer, name, regtype, domain)) {
@@ -69,7 +70,11 @@ create_fullname(const char *name, const char *regtype,
   }
 
   buffer[kDNSServiceMaxDomainName - 1] = '\000'; /* just in case */
-  return rb_str_new2(buffer);
+
+  fullname = rb_str_new2(buffer);
+  rb_enc_associate(fullname, rb_utf8_encoding());
+
+  return fullname;
 }
 
 /*
@@ -95,9 +100,14 @@ create_fullname(const char *name, const char *regtype,
  */
 
 static VALUE
-dnssd_service_s_fullname(VALUE klass, VALUE name, VALUE type, VALUE domain) {
-  return create_fullname(StringValueCStr(name), StringValueCStr(type),
-      StringValueCStr(domain));
+dnssd_service_s_fullname(VALUE klass, VALUE _name, VALUE _type, VALUE _domain) {
+  char * name, * type, * domain;
+
+  dnssd_utf8_cstr(_name, name);
+  dnssd_utf8_cstr(_type, type);
+  dnssd_utf8_cstr(_domain, domain);
+
+  return create_fullname(name, type, domain);
 }
 
 #ifdef HAVE_DNSSERVICEGETPROPERTY
@@ -109,12 +119,15 @@ dnssd_service_s_fullname(VALUE klass, VALUE name, VALUE type, VALUE domain) {
  * DNSSD is DaemonVersion
  */
 static VALUE
-dnssd_service_s_get_property(VALUE klass, VALUE property) {
+dnssd_service_s_get_property(VALUE klass, VALUE _property) {
+  char * property;
   uint32_t result = 0;
   uint32_t size = sizeof(result);
   DNSServiceErrorType e;
 
-  e = DNSServiceGetProperty(StringValueCStr(property), (void *)&result, &size);
+  dnssd_utf8_cstr(_property, property);
+
+  e = DNSServiceGetProperty(property, (void *)&result, &size);
 
   dnssd_check_error_code(e);
 
@@ -274,8 +287,11 @@ dnssd_service_browse_reply(DNSServiceRef client, DNSServiceFlags flags,
   argv[1] = ULONG2NUM(flags);
   argv[2] = ULONG2NUM(interface);
   argv[3] = rb_str_new2(name);
+  rb_enc_associate(argv[3], rb_utf8_encoding());
   argv[4] = rb_str_new2(type);
+  rb_enc_associate(argv[4], rb_utf8_encoding());
   argv[5] = rb_str_new2(domain);
+  rb_enc_associate(argv[5], rb_utf8_encoding());
 
   reply = rb_class_new_instance(6, argv, cDNSSDReplyBrowse);
 
@@ -299,10 +315,10 @@ dnssd_service_browse(VALUE self, VALUE _flags, VALUE _interface, VALUE _type,
   DNSServiceErrorType e;
   DNSServiceRef *client;
 
-  type = StringValueCStr(_type);
+  dnssd_utf8_cstr(_type, type);
 
   if (!NIL_P(_domain))
-    domain = StringValueCStr(_domain);
+    dnssd_utf8_cstr(_domain, domain);
 
   if (!NIL_P(_flags))
     flags = (DNSServiceFlags)NUM2ULONG(_flags);
@@ -334,6 +350,7 @@ dnssd_service_enumerate_domains_reply(DNSServiceRef client,
   argv[1] = ULONG2NUM(flags);
   argv[2] = ULONG2NUM(interface);
   argv[3] = rb_str_new2(domain);
+  rb_enc_associate(argv[3], rb_utf8_encoding());
 
   reply = rb_class_new_instance(4, argv, cDNSSDReplyDomain);
 
@@ -385,7 +402,9 @@ dnssd_service_getaddrinfo_reply(DNSServiceRef client, DNSServiceFlags flags,
   argv[1] = ULONG2NUM(flags);
   argv[2] = ULONG2NUM(interface);
   argv[3] = rb_str_new2(host);
+  rb_enc_associate(argv[3], rb_utf8_encoding());
   argv[4] = rb_str_new((char *)address, SIN_LEN((struct sockaddr_in*)address));
+  rb_enc_associate(argv[4], rb_utf8_encoding());
   argv[5] = ULONG2NUM(ttl);
 
   reply = rb_class_new_instance(6, argv, cDNSSDReplyAddrInfo);
@@ -410,7 +429,7 @@ dnssd_service_getaddrinfo(VALUE self, VALUE _flags, VALUE _interface,
   DNSServiceErrorType e;
   DNSServiceRef *client;
 
-  host = StringValueCStr(_host);
+  dnssd_utf8_cstr(_host, host);
 
   protocol = (DNSServiceProtocol)NUM2ULONG(_protocol);
 
@@ -446,9 +465,11 @@ dnssd_service_query_record_reply(DNSServiceRef client, DNSServiceFlags flags,
   argv[1] = ULONG2NUM(flags);
   argv[2] = ULONG2NUM(interface);
   argv[3] = rb_str_new2(fullname);
+  rb_enc_associate(argv[3], rb_utf8_encoding());
   argv[4] = UINT2NUM(rrtype);
   argv[5] = UINT2NUM(rrclass);
   argv[6] = rb_str_new((char *)rdata, rdlen);
+  rb_enc_associate(argv[6], rb_utf8_encoding());
   argv[7] = ULONG2NUM(ttl);
 
   reply = rb_class_new_instance(8, argv, cDNSSDReplyQueryRecord);
@@ -475,7 +496,7 @@ dnssd_service_query_record(VALUE self, VALUE _flags, VALUE _interface,
 
   flags = (DNSServiceFlags)NUM2ULONG(_flags);
   interface = (uint32_t)NUM2ULONG(_interface);
-  fullname = StringValueCStr(_fullname);
+  dnssd_utf8_cstr(_fullname, fullname);
   rrtype = NUM2UINT(_rrtype);
   rrclass = NUM2UINT(_rrclass);
 
@@ -502,8 +523,11 @@ dnssd_service_register_reply(DNSServiceRef client, DNSServiceFlags flags,
   argv[0] = service;
   argv[1] = ULONG2NUM(flags);
   argv[2] = rb_str_new2(name);
+  rb_enc_associate(argv[2], rb_utf8_encoding());
   argv[3] = rb_str_new2(type);
+  rb_enc_associate(argv[3], rb_utf8_encoding());
   argv[4] = rb_str_new2(domain);
+  rb_enc_associate(argv[4], rb_utf8_encoding());
 
   reply = rb_class_new_instance(5, argv, cDNSSDReplyRegister);
 
@@ -530,14 +554,14 @@ dnssd_service_register(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
   DNSServiceErrorType e;
   DNSServiceRef *client;
 
-  name = StringValueCStr(_name);
-  type = StringValueCStr(_type);
+  dnssd_utf8_cstr(_name, name);
+  dnssd_utf8_cstr(_type, type);
 
   if (!NIL_P(_host))
-    host = StringValueCStr(_host);
+    dnssd_utf8_cstr(_host, host);
 
   if (!NIL_P(_domain))
-    domain = StringValueCStr(_domain);
+    dnssd_utf8_cstr(_domain, domain);
 
   port = htons((uint16_t)NUM2UINT(_port));
 
@@ -580,9 +604,12 @@ dnssd_service_resolve_reply(DNSServiceRef client, DNSServiceFlags flags,
   argv[1] = ULONG2NUM(flags);
   argv[2] = ULONG2NUM(interface);
   argv[3] = rb_str_new2(name);
+  rb_enc_associate(argv[3], rb_utf8_encoding());
   argv[4] = rb_str_new2(target);
+  rb_enc_associate(argv[4], rb_utf8_encoding());
   argv[5] = UINT2NUM(ntohs(port));
   argv[6] = rb_str_new((char *)txt_rec, txt_len);
+  rb_enc_associate(argv[6], rb_utf8_encoding());
 
   reply = rb_class_new_instance(7, argv, cDNSSDReplyResolve);
 
@@ -605,9 +632,9 @@ dnssd_service_resolve(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
   DNSServiceErrorType e;
   DNSServiceRef *client;
 
-  name = StringValueCStr(_name);
-  type = StringValueCStr(_type);
-  domain = StringValueCStr(_domain);
+  dnssd_utf8_cstr(_name, name);
+  dnssd_utf8_cstr(_type, type);
+  dnssd_utf8_cstr(_domain, domain);
 
   if (!NIL_P(_flags))
     flags = (uint32_t)NUM2ULONG(_flags);

data/lib/dnssd.rb

@@ -13,7 +13,7 @@ module DNSSD
   ##
   # The version of DNSSD you're using.
 
-  VERSION = '1.3.4'
+  VERSION = '1.4'
 
   ##
   # Registers +socket+ with DNSSD as +name+.  If +service+ is omitted it is

data/test/test_dnssd_reply_browse.rb

@@ -3,19 +3,42 @@ require 'dnssd'
 
 class TestDNSSDReplyBrowse < MiniTest::Unit::TestCase
 
-  def setup
-    @reply = DNSSD::Reply::Browse.new nil, 0, 0, "blackjack\\032no\\032port",
-                                      '_blackjack._tcp', 'local'
-  end
-
   def test_connect
+    reply = DNSSD::Reply::Browse.new nil, 0, 0, 'blackjack no port',
+                                     '_blackjack._tcp', 'local'
+
     port = Socket.getservbyname 'blackjack'
     server = TCPServer.new nil, port
     Thread.start do server.accept end
 
     DNSSD.announce server, 'blackjack no port'
 
-    socket = @reply.connect
+    socket = reply.connect
+
+    assert_instance_of TCPSocket, socket
+    assert_equal port, socket.peeraddr[1]
+  ensure
+    socket.close if socket
+    server.close if server
+  end
+
+  def test_connect_encoding
+    skip 'Encoding not defined' unless Object.const_defined? :Encoding
+
+    reply = DNSSD::Reply::Browse.new nil, 0, 0, "\u00E9",
+                                     '_blackjack._tcp', 'local'
+
+
+    port = Socket.getservbyname 'blackjack'
+    server = TCPServer.new nil, port
+    Thread.start do server.accept end
+
+    name = "\u00E9"
+    name.encode! Encoding::ISO_8859_1
+
+    DNSSD.announce server, name
+
+    socket = reply.connect
 
     assert_instance_of TCPSocket, socket
     assert_equal port, socket.peeraddr[1]

data/test/test_dnssd_reply_query_record.rb

@@ -13,37 +13,37 @@ class TestDNSSDReplyQueryRecord < MiniTest::Unit::TestCase
 
   def test_record_data_A
     qr = util_qr DNSSD::Record::A, @ipv4
-    
+
     assert_equal IPAddr.new_ntoh(@ipv4), qr.record_data
   end
 
   def test_record_data_AAAA
     qr = util_qr DNSSD::Record::A, @ipv6
-    
+
     assert_equal IPAddr.new_ntoh(@ipv6), qr.record_data
   end
 
   def test_record_data_CNAME
     qr = util_qr DNSSD::Record::CNAME, @nowhere
-    
+
     assert_equal 'nowhere.example.', qr.record_data
   end
 
   def test_record_data_MX
     qr = util_qr DNSSD::Record::MX, "\000\010#{@nowhere}"
-    
+
     assert_equal [8, 'nowhere.example.'], qr.record_data
   end
 
   def test_record_data_NS
     qr = util_qr DNSSD::Record::NS, @nowhere
-    
+
     assert_equal 'nowhere.example.', qr.record_data
   end
 
   def test_record_data_PTR
     qr = util_qr DNSSD::Record::PTR, @nowhere
-    
+
     assert_equal 'nowhere.example.', qr.record_data
   end
 
@@ -62,7 +62,7 @@ class TestDNSSDReplyQueryRecord < MiniTest::Unit::TestCase
       'nowhere.example.', 'me.nowhere.example.',
       serial, refresh, rtry, expire, minimum
     ]
-    
+
     assert_equal expected, qr.record_data
   end
 
@@ -74,13 +74,13 @@ class TestDNSSDReplyQueryRecord < MiniTest::Unit::TestCase
     data = "#{[priority, weight, port].pack 'nnn'}#{@nowhere}"
 
     qr = util_qr DNSSD::Record::SRV, data
-    
+
     assert_equal [1, 5, 1025, 'nowhere.example.'], qr.record_data
   end
 
   def test_record_data_TXT
     qr = util_qr DNSSD::Record::TXT, "\005Hello\006World!"
-    
+
     assert_equal %w[Hello World!], qr.record_data
   end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dnssd
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
   - 4
-  version: 1.3.4
+  version: "1.4"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -41,7 +40,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-08-29 00:00:00 +09:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency