dnssd 2.0.1 → 3.0.0

checksums.yaml

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

data/README.txt

@@ -1,7 +1,7 @@
 = dnssd
 
-* http://rubyforge.org/projects/dnssd
-* http://github.com/tenderlove/dnssd
+* https://github.com/tenderlove/dnssd
+* http://docs.seattlerb.org/dnssd
 * http://developer.apple.com/documentation/Networking/Conceptual/dns_discovery_api/Introduction.html
 
 == DESCRIPTION:

data/Rakefile

@@ -10,7 +10,7 @@ Hoe.plugin :compiler
 
 HOE = Hoe.spec 'dnssd' do
   developer 'Eric Hodel',      'drbrain@segment.net'
-  developer 'Aaron Patterson', 'aaronp@rubyforge.org'
+  developer 'Aaron Patterson', 'aaron.patterson@gmail.com'
   developer 'Phil Hagelberg',  'phil@hagelb.org'
   developer 'Chad Fowler',     'chad@chadfowler.com'
   developer 'Charles Mills',   ''
@@ -19,6 +19,11 @@ HOE = Hoe.spec 'dnssd' do
   rdoc_locations << 'docs.seattlerb.org:/data/www/docs.seattlerb.org/dnssd/'
 
   clean_globs << 'lib/dnssd/*.{so,bundle,dll}'
+
+  self.spec_extras = {
+    :extensions            => ["ext/dnssd/extconf.rb"],
+    :required_ruby_version => '>= 2.1.0'
+  }
 end
 
 # vim: syntax=Ruby

data/ext/dnssd/dnssd.c

@@ -5,37 +5,6 @@ void Init_DNSSD_Flags(void);
 void Init_DNSSD_Record(void);
 void Init_DNSSD_Service(void);
 
-/*
- * call-seq:
- *   DNSSD.getservbyport(port, proto = nil) => service_name
- * 
- * Wrapper for getservbyport(3) - returns the service name for +port+.
- *
- *   DNSSD.getservbyport 1025 # => 'blackjack'
- */
-
-static VALUE
-dnssd_getservbyport(int argc, VALUE * argv, VALUE self) {
-  VALUE _port, _proto;
-  struct servent * result;
-  int port;
-  char * proto = NULL;
-
-  rb_scan_args(argc, argv, "11", &_port, &_proto);
-
-  port = htons(FIX2INT(_port));
-
-  if (RTEST(_proto))
-    proto = StringValueCStr(_proto);
-
-  result = getservbyport(port, proto);
-
-  if (result == NULL)
-    return Qnil;
-
-  return rb_str_new2(result->s_name);
-}
-
 /*
  * call-seq:
  *   DNSSD.interface_name(interface_index) # => interface_name
@@ -89,8 +58,6 @@ Init_dnssd(void) {
       ULONG2NUM(kDNSServiceInterfaceIndexUnicast));
 #endif
 
-  rb_define_singleton_method(mDNSSD, "getservbyport", dnssd_getservbyport, -1);
-
   rb_define_singleton_method(mDNSSD, "interface_index", dnssd_if_nametoindex, 1);
   rb_define_singleton_method(mDNSSD, "interface_name", dnssd_if_indextoname, 1);
 

data/ext/dnssd/dnssd.h

@@ -23,7 +23,6 @@
 #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 {\
@@ -32,11 +31,6 @@
         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;
 

data/ext/dnssd/extconf.rb

@@ -45,13 +45,6 @@ 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')
-
-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')
 
@@ -79,4 +72,3 @@ have_header 'ruby/encoding.h'
 
 puts
 create_makefile 'dnssd/dnssd'
-

data/ext/dnssd/service.c

@@ -10,6 +10,7 @@ static VALUE cDNSSDReplyQueryRecord;
 static VALUE cDNSSDReplyRegister;
 static VALUE cDNSSDReplyResolve;
 static VALUE cDNSSDService;
+static VALUE cDNSSDServiceRegister;
 static VALUE cDNSSDTextRecord;
 static VALUE rb_cSocket;
 
@@ -23,23 +24,6 @@ static ID dnssd_iv_service;
 static ID dnssd_iv_thread;
 static ID dnssd_iv_type;
 
-#define get(klass, obj, type, var) \
-  do {\
-    Check_Type(obj, T_DATA);\
-    if (rb_obj_is_kind_of(obj, klass) != Qtrue)\
-    rb_raise(rb_eTypeError,\
-        "wrong argument type %s",\
-        rb_class2name(CLASS_OF(obj)));\
-    Data_Get_Struct(obj, type, var);\
-  } while (0)
-
-static void
-dnssd_service_callback(VALUE self, VALUE reply) {
-  VALUE replies = rb_ivar_get(self, dnssd_iv_replies);
-
-  rb_funcall(replies, dnssd_id_push, 1, reply);
-}
-
 static void
 dnssd_service_free_client(DNSServiceRef *client) {
   if (*client) {
@@ -58,6 +42,25 @@ dnssd_service_free(void *ptr) {
   free(client);
 }
 
+static const rb_data_type_t dnssd_service_type = {
+    "DNSSD/service",
+    {0, dnssd_service_free, 0,},
+    0, 0,
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
+};
+
+#define get(klass, obj, type, var) \
+  do {\
+    Check_Type(obj, T_DATA);\
+    if (rb_obj_is_kind_of(obj, klass) != Qtrue)\
+    rb_raise(rb_eTypeError,\
+        "wrong argument type %s",\
+        rb_class2name(CLASS_OF(obj)));\
+    Data_Get_Struct(obj, type, var);\
+  } while (0)
+
 static VALUE
 create_fullname(const char *name, const char *regtype,
     const char *domain) {
@@ -145,21 +148,6 @@ dnssd_service_s_allocate(VALUE klass) {
   return Data_Wrap_Struct(klass, 0, dnssd_service_free, client);
 }
 
-/* Returns true if the service has been stopped.
- */
-
-static VALUE
-dnssd_service_stopped_p(VALUE self) {
-  DNSServiceRef *client;
-
-  get(cDNSSDService, self, DNSServiceRef, client);
-
-  if (client)
-    return (*client) == NULL ? Qtrue : Qfalse;
-
-  return Qtrue;
-}
-
 /* Stops the service, closing the underlying socket and killing the underlying
  * thread.
  *
@@ -174,84 +162,33 @@ dnssd_service_stopped_p(VALUE self) {
 
 static VALUE
 dnssd_service_stop(VALUE self) {
-  VALUE thread;
   DNSServiceRef *client;
 
-  get(cDNSSDService, self, DNSServiceRef, client);
-
-  RDATA(self)->data = NULL;
-
-  if (client == NULL)
-    rb_raise(eDNSSDError, "service is already stopped");
-
-  thread = rb_ivar_get(self, dnssd_iv_thread);
-  rb_ivar_set(self, dnssd_iv_continue, Qfalse);
-
-  if (!NIL_P(thread) && thread != rb_thread_current()) {
-    rb_thread_run(thread);
-    rb_funcall(thread, dnssd_id_join, 0);
-  }
+  TypedData_Get_Struct(self, DNSServiceRef, &dnssd_service_type, client);
 
   dnssd_service_free_client(client);
 
-  rb_ivar_set(self, dnssd_iv_type, Qnil);
-
   return self;
 }
 
-/* Binding to DNSServiceProcessResult
- *
- * When run with a single thread _process will block.
- *
- * _process works intelligently with threads.  If a service is waiting on data
- * from the daemon in a thread you can force _process to abort by setting
- * @continue to false and running the thread.
- */
-
 static VALUE
-dnssd_service_process(VALUE self) {
+dnssd_ref_sock_fd(VALUE self) {
   DNSServiceRef *client;
-  int dnssd_fd, result;
-  rb_fdset_t read;
-  struct timeval timeout;
-
-  get(cDNSSDService, self, DNSServiceRef, client);
-
-  if (client == NULL) {
-    /* looks like this thread has already been stopped */
-    return Qnil;
-  }
-
-  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);
+  TypedData_Get_Struct(self, DNSServiceRef, &dnssd_service_type, client);
 
-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;
+  return INT2NUM(DNSServiceRefSockFD(*client));
+}
 
-  /* timeout */
-  if (result == 0)
-      goto retry;
+static VALUE
+dnssd_process_result(VALUE self) {
+  DNSServiceRef *client;
+  DNSServiceErrorType e;
+  TypedData_Get_Struct(self, DNSServiceRef, &dnssd_service_type, client);
 
-  DNSServiceErrorType e = DNSServiceProcessResult(*client);
+  e = DNSServiceProcessResult(*client);
   dnssd_check_error_code(e);
 
-  return self;
+  return Qtrue;
 }
 
 /* call-seq:
@@ -277,10 +214,10 @@ dnssd_service_add_record(VALUE self, VALUE _flags, VALUE _rrtype, VALUE _rdata,
   flags = (DNSServiceFlags)NUM2ULONG(_flags);
   rrtype = NUM2UINT(_rrtype);
   rdlen = RSTRING_LEN(_rdata);
-  rdata = (void *)RSTRING_PTR(_rdata);
+  rdata = (void *)StringValuePtr(_rdata);
   ttl = (uint32_t)NUM2ULONG(_ttl);
 
-  get(cDNSSDService, self, DNSServiceRef, client);
+  TypedData_Get_Struct(self, DNSServiceRef, &dnssd_service_type, client);
 
   _record = rb_class_new_instance(0, NULL, cDNSSDRecord);
 
@@ -292,7 +229,6 @@ dnssd_service_add_record(VALUE self, VALUE _flags, VALUE _rrtype, VALUE _rdata,
 
   /* record will become invalid when this service is destroyed */
   rb_ivar_set(_record, dnssd_iv_service, self);
-  rb_ary_push(rb_ivar_get(self, dnssd_iv_records), _record);
 
   return _record;
 }
@@ -319,7 +255,7 @@ dnssd_service_browse_reply(DNSServiceRef client, DNSServiceFlags flags,
 
   reply = rb_class_new_instance(6, argv, cDNSSDReplyBrowse);
 
-  dnssd_service_callback(service, reply);
+  rb_funcall(service, dnssd_id_push, 1, reply);
 }
 
 /* call-seq:
@@ -329,7 +265,7 @@ dnssd_service_browse_reply(DNSServiceRef client, DNSServiceFlags flags,
  */
 
 static VALUE
-dnssd_service_browse(VALUE self, VALUE _flags, VALUE _interface, VALUE _type,
+dnssd_service_browse(VALUE klass, VALUE _flags, VALUE _interface, VALUE _type,
     VALUE _domain) {
   const char *type;
   const char *domain = NULL;
@@ -338,6 +274,7 @@ dnssd_service_browse(VALUE self, VALUE _flags, VALUE _interface, VALUE _type,
 
   DNSServiceErrorType e;
   DNSServiceRef *client;
+  VALUE self;
 
   dnssd_utf8_cstr(_type, type);
 
@@ -350,7 +287,9 @@ dnssd_service_browse(VALUE self, VALUE _flags, VALUE _interface, VALUE _type,
   if (!NIL_P(_interface))
     interface = (uint32_t)NUM2ULONG(_interface);
 
-  get(cDNSSDService, self, DNSServiceRef, client);
+  client = xcalloc(1, sizeof(DNSServiceRef));
+  self = TypedData_Wrap_Struct(klass, &dnssd_service_type, client);
+  rb_obj_call_init(self, 0, 0);
 
   e = DNSServiceBrowse(client, flags, interface, type, domain,
       dnssd_service_browse_reply, (void *)self);
@@ -378,7 +317,7 @@ dnssd_service_enumerate_domains_reply(DNSServiceRef client,
 
   reply = rb_class_new_instance(4, argv, cDNSSDReplyDomain);
 
-  dnssd_service_callback(service, reply);
+  rb_funcall(service, dnssd_id_push, 1, reply);
 }
 
 /* call-seq:
@@ -388,9 +327,10 @@ dnssd_service_enumerate_domains_reply(DNSServiceRef client,
  */
 
 static VALUE
-dnssd_service_enumerate_domains(VALUE self, VALUE _flags, VALUE _interface) {
+dnssd_service_enumerate_domains(VALUE klass, VALUE _flags, VALUE _interface) {
   DNSServiceFlags flags = 0;
   uint32_t interface = 0;
+  VALUE self;
 
   DNSServiceErrorType e;
   DNSServiceRef *client;
@@ -401,7 +341,9 @@ dnssd_service_enumerate_domains(VALUE self, VALUE _flags, VALUE _interface) {
   if (!NIL_P(_interface))
     interface = (uint32_t)NUM2ULONG(_interface);
 
-  get(cDNSSDService, self, DNSServiceRef, client);
+  client = xcalloc(1, sizeof(DNSServiceRef));
+  self = TypedData_Wrap_Struct(klass, &dnssd_service_type, client);
+  rb_obj_call_init(self, 0, 0);
 
   e = DNSServiceEnumerateDomains(client, flags, interface,
       dnssd_service_enumerate_domains_reply, (void *)self);
@@ -433,7 +375,7 @@ dnssd_service_getaddrinfo_reply(DNSServiceRef client, DNSServiceFlags flags,
 
   reply = rb_class_new_instance(6, argv, cDNSSDReplyAddrInfo);
 
-  dnssd_service_callback(service, reply);
+  rb_funcall(service, dnssd_id_push, 1, reply);
 }
 
 /* call-seq:
@@ -443,12 +385,13 @@ dnssd_service_getaddrinfo_reply(DNSServiceRef client, DNSServiceFlags flags,
  */
 
 static VALUE
-dnssd_service_getaddrinfo(VALUE self, VALUE _flags, VALUE _interface,
+dnssd_service_getaddrinfo(VALUE klass, VALUE _flags, VALUE _interface,
     VALUE _protocol, VALUE _host) {
   DNSServiceFlags flags = 0;
   uint32_t interface = 0;
   DNSServiceProtocol protocol = 0;
   const char *host;
+  VALUE self;
 
   DNSServiceErrorType e;
   DNSServiceRef *client;
@@ -463,7 +406,9 @@ dnssd_service_getaddrinfo(VALUE self, VALUE _flags, VALUE _interface,
   if (!NIL_P(_interface))
     interface = (uint32_t)NUM2ULONG(_interface);
 
-  get(cDNSSDService, self, DNSServiceRef, client);
+  client = xcalloc(1, sizeof(DNSServiceRef));
+  self = TypedData_Wrap_Struct(klass, &dnssd_service_type, client);
+  rb_obj_call_init(self, 0, 0);
 
   e = DNSServiceGetAddrInfo(client, flags, interface, protocol, host,
       dnssd_service_getaddrinfo_reply, (void *)self);
@@ -498,7 +443,7 @@ dnssd_service_query_record_reply(DNSServiceRef client, DNSServiceFlags flags,
 
   reply = rb_class_new_instance(8, argv, cDNSSDReplyQueryRecord);
 
-  dnssd_service_callback(service, reply);
+  rb_funcall(service, dnssd_id_push, 1, reply);
 }
 
 /* call-seq:
@@ -508,7 +453,7 @@ dnssd_service_query_record_reply(DNSServiceRef client, DNSServiceFlags flags,
  */
 
 static VALUE
-dnssd_service_query_record(VALUE self, VALUE _flags, VALUE _interface,
+dnssd_service_query_record(VALUE klass, VALUE _flags, VALUE _interface,
     VALUE _fullname, VALUE _rrtype, VALUE _rrclass) {
   DNSServiceRef *client;
   DNSServiceFlags flags;
@@ -517,6 +462,7 @@ dnssd_service_query_record(VALUE self, VALUE _flags, VALUE _interface,
   uint32_t interface;
   uint16_t rrtype;
   uint16_t rrclass;
+  VALUE self;
 
   flags = (DNSServiceFlags)NUM2ULONG(_flags);
   interface = (uint32_t)NUM2ULONG(_interface);
@@ -524,7 +470,9 @@ dnssd_service_query_record(VALUE self, VALUE _flags, VALUE _interface,
   rrtype = NUM2UINT(_rrtype);
   rrclass = NUM2UINT(_rrclass);
 
-  get(cDNSSDService, self, DNSServiceRef, client);
+  client = xcalloc(1, sizeof(DNSServiceRef));
+  self = TypedData_Wrap_Struct(klass, &dnssd_service_type, client);
+  rb_obj_call_init(self, 0, 0);
 
   e = DNSServiceQueryRecord(client, flags, interface, fullname, rrtype,
       rrclass, dnssd_service_query_record_reply, (void *)self);
@@ -555,7 +503,7 @@ dnssd_service_register_reply(DNSServiceRef client, DNSServiceFlags flags,
 
   reply = rb_class_new_instance(5, argv, cDNSSDReplyRegister);
 
-  dnssd_service_callback(service, reply);
+  rb_funcall(service, dnssd_id_push, 1, reply);
 }
 
 /* call-seq:
@@ -565,7 +513,7 @@ dnssd_service_register_reply(DNSServiceRef client, DNSServiceFlags flags,
  */
 
 static VALUE
-dnssd_service_register(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
+dnssd_service_register(VALUE klass, VALUE _flags, VALUE _interface, VALUE _name,
     VALUE _type, VALUE _domain, VALUE _host, VALUE _port, VALUE _text_record) {
   const char *name, *type, *host = NULL, *domain = NULL;
   uint16_t port;
@@ -577,20 +525,30 @@ dnssd_service_register(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
 
   DNSServiceErrorType e;
   DNSServiceRef *client;
+  VALUE self;
 
-  dnssd_utf8_cstr(_name, name);
+  if (!NIL_P(_name)) {
+    Check_Type(_name, T_STRING);
+    dnssd_utf8_cstr(_name, name);
+  }
+
+  Check_Type(_type, T_STRING);
   dnssd_utf8_cstr(_type, type);
 
-  if (!NIL_P(_host))
+  if (!NIL_P(_host)) {
+    Check_Type(_host, T_STRING);
     dnssd_utf8_cstr(_host, host);
+  }
 
-  if (!NIL_P(_domain))
+  if (!NIL_P(_domain)) {
+    Check_Type(_domain, T_STRING);
     dnssd_utf8_cstr(_domain, domain);
+  }
 
   port = htons((uint16_t)NUM2UINT(_port));
 
   if (!NIL_P(_text_record)) {
-    txt_rec = RSTRING_PTR(_text_record);
+    txt_rec = StringValuePtr(_text_record);
     txt_len = RSTRING_LEN(_text_record);
   }
 
@@ -600,10 +558,11 @@ dnssd_service_register(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
   if (!NIL_P(_interface))
     interface = (uint32_t)NUM2ULONG(_interface);
 
-  if (rb_block_given_p())
-    callback = dnssd_service_register_reply;
+  callback = dnssd_service_register_reply;
 
-  get(cDNSSDService, self, DNSServiceRef, client);
+  client = xcalloc(1, sizeof(DNSServiceRef));
+  self = TypedData_Wrap_Struct(cDNSSDServiceRegister, &dnssd_service_type, client);
+  rb_obj_call_init(self, 0, 0);
 
   e = DNSServiceRegister(client, flags, interface, name, type,
       domain, host, port, txt_len, txt_rec, callback, (void*)self);
@@ -637,7 +596,7 @@ dnssd_service_resolve_reply(DNSServiceRef client, DNSServiceFlags flags,
 
   reply = rb_class_new_instance(7, argv, cDNSSDReplyResolve);
 
-  dnssd_service_callback(service, reply);
+  rb_funcall(service, dnssd_id_push, 1, reply);
 }
 
 /* call-seq:
@@ -647,11 +606,12 @@ dnssd_service_resolve_reply(DNSServiceRef client, DNSServiceFlags flags,
  */
 
 static VALUE
-dnssd_service_resolve(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
+dnssd_service_resolve(VALUE klass, VALUE _flags, VALUE _interface, VALUE _name,
     VALUE _type, VALUE _domain) {
   const char *name, *type, *domain;
   DNSServiceFlags flags = 0;
   uint32_t interface = 0;
+  VALUE self;
 
   DNSServiceErrorType e;
   DNSServiceRef *client;
@@ -666,7 +626,9 @@ dnssd_service_resolve(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
   if (!NIL_P(_interface))
     interface = (uint32_t)NUM2ULONG(_interface);
 
-  get(cDNSSDService, self, DNSServiceRef, client);
+  client = xcalloc(1, sizeof(DNSServiceRef));
+  self = TypedData_Wrap_Struct(klass, &dnssd_service_type, client);
+  rb_obj_call_init(self, 0, 0);
 
   e = DNSServiceResolve(client, flags, interface, name, type, domain,
       dnssd_service_resolve_reply, (void *)self);
@@ -678,6 +640,8 @@ dnssd_service_resolve(VALUE self, VALUE _flags, VALUE _interface, VALUE _name,
 
 void
 Init_DNSSD_Service(void) {
+  VALUE sDNSSDService;
+
   mDNSSD = rb_define_module("DNSSD");
 
   dnssd_id_join = rb_intern("join");
@@ -690,9 +654,10 @@ Init_DNSSD_Service(void) {
   dnssd_iv_thread      = rb_intern("@thread");
   dnssd_iv_type        = rb_intern("@type");
 
-  cDNSSDFlags      = rb_define_class_under(mDNSSD, "Flags", rb_cObject);
-  cDNSSDRecord     = rb_define_class_under(mDNSSD, "Record", rb_cObject);
-  cDNSSDService    = rb_define_class_under(mDNSSD, "Service", rb_cObject);
+  cDNSSDFlags           = rb_define_class_under(mDNSSD, "Flags", rb_cObject);
+  cDNSSDRecord          = rb_define_class_under(mDNSSD, "Record", rb_cObject);
+  cDNSSDService         = rb_define_class_under(mDNSSD, "Service", rb_cObject);
+  cDNSSDServiceRegister = rb_define_class_under(cDNSSDService, "Register", cDNSSDService);
   cDNSSDTextRecord = rb_path2class("DNSSD::TextRecord");
 
   cDNSSDReplyAddrInfo    = rb_path2class("DNSSD::Reply::AddrInfo");
@@ -701,6 +666,7 @@ Init_DNSSD_Service(void) {
   cDNSSDReplyQueryRecord = rb_path2class("DNSSD::Reply::QueryRecord");
   cDNSSDReplyRegister    = rb_path2class("DNSSD::Reply::Register");
   cDNSSDReplyResolve     = rb_path2class("DNSSD::Reply::Resolve");
+  sDNSSDService = rb_singleton_class(cDNSSDService);
 
   rb_cSocket = rb_path2class("Socket");
 
@@ -742,19 +708,20 @@ Init_DNSSD_Service(void) {
   rb_define_singleton_method(cDNSSDService, "get_property", dnssd_service_s_get_property, 1);
 #endif
 
-  rb_define_method(cDNSSDService, "stop", dnssd_service_stop, 0);
-  rb_define_method(cDNSSDService, "stopped?", dnssd_service_stopped_p, 0);
+  rb_define_private_method(cDNSSDService, "_stop", dnssd_service_stop, 0);
 
-  rb_define_method(cDNSSDService, "_add_record", dnssd_service_add_record, 4);
-  rb_define_method(cDNSSDService, "_browse", dnssd_service_browse, 4);
-  rb_define_method(cDNSSDService, "_enumerate_domains", dnssd_service_enumerate_domains, 2);
+  rb_define_private_method(cDNSSDServiceRegister, "_add_record", dnssd_service_add_record, 4);
+  rb_define_private_method(cDNSSDService, "ref_sock_fd", dnssd_ref_sock_fd, 0);
+  rb_define_private_method(cDNSSDService, "process_result", dnssd_process_result, 0);
+
+  /* private class methods */
+  rb_define_private_method(sDNSSDService, "_browse", dnssd_service_browse, 4);
+  rb_define_private_method(sDNSSDService, "_enumerate_domains", dnssd_service_enumerate_domains, 2);
 #ifdef HAVE_DNSSERVICEGETADDRINFO
-  rb_define_method(cDNSSDService, "_getaddrinfo", dnssd_service_getaddrinfo, 4);
+  rb_define_private_method(sDNSSDService, "_getaddrinfo", dnssd_service_getaddrinfo, 4);
 #endif
-  rb_define_method(cDNSSDService, "_query_record", dnssd_service_query_record, 5);
-  rb_define_method(cDNSSDService, "_register", dnssd_service_register, 8);
-  rb_define_method(cDNSSDService, "_resolve", dnssd_service_resolve, 5);
+  rb_define_private_method(sDNSSDService, "_query_record", dnssd_service_query_record, 5);
+  rb_define_private_method(sDNSSDService, "_register", dnssd_service_register, 8);
+  rb_define_private_method(sDNSSDService, "_resolve", dnssd_service_resolve, 5);
 
-  rb_define_method(cDNSSDService, "_process", dnssd_service_process, 0);
 }
-