dnssd 2.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0c8d81b701b90525df7e2bc543879262595b7a36
+  data.tar.gz: b329dcb5c3f3dd2aceb00c042303bd4311009983
+SHA512:
+  metadata.gz: c3e53069b168de693d9d3d46dff6697fe091092b635f4e5961d3819bc200a6349d3a2a8b292f4db7d107f9e88179e7f68b9d41ab52a5378580066c58ee1023ac
+  data.tar.gz: 8f57f4190921acb814e3e74a86ddde676cf717b1807197661ccc406295f121c78ea522a7300df3869045286c3e9b7086befb532efe1483ba3c0df36ab8042636

data/History.txt

@@ -1,3 +1,12 @@
+=== 2.0.1 / 2015-01-08
+
+* Bug fix:
+  * Use rb_thread_fd_select() with a timeout instead of rb_thread_wait_fd()
+    which allows DNSSD#service to stop in a timely manner.  Fixes #10 by Mick
+    Staugaard, #13 by Linux-cpp-lisp
+  * Document necessary dependencies for dnssd on debian.  Issue #14 by
+    elmatou.
+
 === 2.0 / 2011-03-02
 
 * Major enhancment

data/README.txt

@@ -38,7 +38,7 @@ Browsing services:
 
 * OS X
 * The dns-sd library on other operating systems
-* avahi 0.6.25+
+* avahi 0.6.25+ (plus libavahi-compat-libdnssd-dev on debian)
 
 == INSTALL:
 

data/Rakefile

@@ -9,8 +9,6 @@ Hoe.plugin :git
 Hoe.plugin :compiler
 
 HOE = Hoe.spec 'dnssd' do
-  self.rubyforge_name = 'dnssd'
-
   developer 'Eric Hodel',      'drbrain@segment.net'
   developer 'Aaron Patterson', 'aaronp@rubyforge.org'
   developer 'Phil Hagelberg',  'phil@hagelb.org'
@@ -18,6 +16,8 @@ HOE = Hoe.spec 'dnssd' do
   developer 'Charles Mills',   ''
   developer 'Rich Kilmer',     ''
 
+  rdoc_locations << 'docs.seattlerb.org:/data/www/docs.seattlerb.org/dnssd/'
+
   clean_globs << 'lib/dnssd/*.{so,bundle,dll}'
 end
 

data/ext/dnssd/extconf.rb

@@ -49,6 +49,9 @@ end
 have_func('getservbyport', 'netdb.h') ||
 abort('unable to find getservbyport')
 
+have_func('rb_thread_fd_select', 'ruby/intern.h') ||
+abort('unable to find rb_thread_fd_select, your ruby is too old')
+
 have_type('struct sockaddr_in', 'netinet/in.h') ||
 abort('unable to find struct sockaddr_in')
 

data/ext/dnssd/service.c

@@ -211,6 +211,9 @@ dnssd_service_stop(VALUE self) {
 static VALUE
 dnssd_service_process(VALUE self) {
   DNSServiceRef *client;
+  int dnssd_fd, result;
+  rb_fdset_t read;
+  struct timeval timeout;
 
   get(cDNSSDService, self, DNSServiceRef, client);
 
@@ -219,11 +222,32 @@ dnssd_service_process(VALUE self) {
     return Qnil;
   }
 
-  rb_thread_wait_fd(DNSServiceRefSockFD(*client));
+  dnssd_fd = DNSServiceRefSockFD(*client);
+
+  if (-1 == dnssd_fd)
+    rb_raise(eDNSSDError, "unable to get DNSSD FD for result processing");
+
+  timeout.tv_sec = 0;
+  timeout.tv_usec = 10000;
+
+  rb_fd_init(&read);
+
+retry:
+  rb_fd_zero(&read);
+  rb_fd_set(dnssd_fd, &read);
+
+  result = rb_thread_fd_select(dnssd_fd + 1, &read, NULL, NULL, &timeout);
+
+  if (result == -1)
+      rb_sys_fail("select");
 
   if (rb_ivar_get(self, dnssd_iv_continue) == Qfalse)
     return Qnil;
 
+  /* timeout */
+  if (result == 0)
+      goto retry;
+
   DNSServiceErrorType e = DNSServiceProcessResult(*client);
   dnssd_check_error_code(e);
 

data/lib/dnssd.rb

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

metadata

@@ -1,14 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dnssd
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 2
-  - 0
-  version: "2.0"
+version: !ruby/object:Gem::Version
+  version: 2.0.1
 platform: ruby
-authors: 
+authors:
 - Eric Hodel
 - Aaron Patterson
 - Phil Hagelberg
@@ -17,100 +12,86 @@ authors:
 - Rich Kilmer
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
-  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
-  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
-  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
-  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
-  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
-  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
-  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
-  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
-  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
-  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
-  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
-  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
-  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
-  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
-  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
-  x52qPcexcYZR7w==
-  -----END CERTIFICATE-----
-
-date: 2011-03-03 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain: []
+date: 2015-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
-        version: 2.0.2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
-        version: 2.9.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: |-
   DNS Service Discovery (aka Bonjour, MDNS) API for Ruby.  Implements browsing,
   resolving, registration and domain enumeration.  Supports avahi's DNSSD
   compatibility layer for avahi 0.6.25 or newer.
-email: 
+email:
 - drbrain@segment.net
 - aaronp@rubyforge.org
 - phil@hagelb.org
 - chad@chadfowler.com
-- ""
-- ""
+- ''
+- ''
 executables: []
-
-extensions: 
+extensions:
 - ext/dnssd/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
-- .autotest
+files:
+- ".autotest"
+- ".gemtest"
 - History.txt
 - Manifest.txt
 - README.txt
@@ -153,43 +134,33 @@ files:
 - test/test_dnssd_reply_resolve.rb
 - test/test_dnssd_service.rb
 - test/test_dnssd_text_record.rb
-- .gemtest
-has_rdoc: true
 homepage: http://rubyforge.org/projects/dnssd
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: dnssd
-rubygems_version: 1.6.0
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DNS Service Discovery (aka Bonjour, MDNS) API for Ruby
-test_files: 
+test_files:
 - test/test_dnssd.rb
 - test/test_dnssd_flags.rb
 - test/test_dnssd_record.rb