udat 1.4.0 → 1.4.1

data/lib/udat.rb

@@ -439,16 +439,16 @@ module Udat
       port = port.to_int if port
       socket_args = nil
       result = nil
-      Resolv::DNS.open do |dns|
-        if port.nil?
+      if port.nil?
+        Resolv::DNS.open do |dns|
           srv_rr = dns.getresource(
             "_udat-rpc._tcp.#{domain}",
             Resolv::DNS::Resource::IN::SRV
           )
           socket_args = [srv_rr.target.to_s, srv_rr.port.to_i]
-        else
-          socket_args = [domain, port]
         end
+      else
+        socket_args = [domain, port]
       end
       socket = nil
       begin
@@ -1089,16 +1089,45 @@ module Udat
 
   end
 
-  # Waits in an endless loop for incoming TCP connections on the given port
-  # and runs a new thread for each incoming connection, reads and parses
-  # UDAT objects, passes them each to a given block (by calling yield) and
-  # writes the result of the called block in form of an encoded UDAT object
-  # back to the TCP socket. A timeout can be specified, to determine how
-  # long it may take to read an object.
-  def run_rpc_server(port, timeout = 180)
-    server = nil
+  # Waits in an endless loop for incoming connections and runs a new thread
+  # for each incoming connection, reads and parses UDAT objects, passes
+  # them each to a given block (by calling yield) and writes the result of
+  # the called block in form of an encoded UDAT object back to the socket.
+  # If the argument "listen_on" is an Integer, it is used as a TCP port
+  # number, if the argument is a String, the port being listened on will
+  # be determined by a DNS look-up of an _udat-rpc._tcp SRV record. In both
+  # cases the TCP socket is bound to all interfaces. Alternatively
+  # "listen_on" may be a non Integer object, supplying an "accept" method
+  # like TCPServer or UNIXServer, which returns a socket for each incoming
+  # connection.
+  def run_rpc_server(listen_on, timeout = 180)
+    unless block_given?
+      raise ArgumentError, "No block given for Udat::run_rpc_server call."
+    end
+    if listen_on.kind_of? String
+      Resolv::DNS.open do |dns|
+        srv_rr = dns.getresource(
+          "_udat-rpc._tcp.#{listen_on}",
+          Resolv::DNS::Resource::IN::SRV
+        )
+        listen_on = srv_rr.port.to_i
+      end
+    end
+    new_server = nil
     begin
-      server = TCPServer.new(port)
+      if listen_on.kind_of? Integer
+        new_server = TCPServer.new(listen_on)
+        server = new_server
+      elsif listen_on.respond_to? :accept
+        server = listen_on
+      elsif listen_on.respond_to? :to_int
+        new_server = TCPServer.new(listen_on.to_int)
+        server = new_server
+      else
+        raise ArgumentError,
+          "Argument \"listen_on\" passed to Udat::run_rpc_server " <<
+          "is not an integer and has no \"accept\" or \"to_int\" method."
+      end
       while true
         Thread.new(server.accept) do |socket|
           begin
@@ -1106,7 +1135,11 @@ module Udat
               query = nil
               begin
                 Timeout.timeout(timeout) do
-                  query = socket.read_udat
+                  begin
+                    query = socket.read_udat
+                  rescue EOFError, ParseError
+                    break
+                  end
                 end
               rescue Timeout::Error
               end
@@ -1119,7 +1152,7 @@ module Udat
         end
       end
     ensure
-      server.close if server
+      new_server.close if server
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: udat
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2007-05-30 00:00:00 +00:00
+  version: 1.4.1
+date: 2007-06-01 00:00:00 +00:00
 summary: Parser and generator for UDAT documents, a generic data format similar to XML or YAML.
 require_paths: 
 - lib/