rtunnel 0.3.5 → 0.3.6

data/lib/client.rb

@@ -98,7 +98,7 @@ module RTunnel
           write_to_control_sock RemoteListenCommand.new(@remote_listen_address)
 
           cmd_queue = ""
-          while data = (@control_sock.readpartial(16384)  rescue (D "#{$!.inspect}"; nil))
+          while data = (@control_sock.readpartial(16384)  rescue (D "control sock read error: #{$!.inspect}"; nil))
             cmd_queue << data
             while Command.match(cmd_queue)
               case command = Command.parse(cmd_queue)
@@ -117,11 +117,16 @@ module RTunnel
                       while localdata = conn.readpartial(16834)
                         write_to_control_sock SendDataCommand.new(cmd.conn_id, localdata)
                       end
-                    rescue EOFError
+                    rescue Exception
+                      begin
                       D "to tunnel closed, closing from tunnel"
                       conn.close
                       CONNECTIONS.delete cmd.conn_id
                       write_to_control_sock CloseConnectionCommand.new(cmd.conn_id)
+                      rescue
+                        p $!
+                        puts $!.backtrace.join("\n")
+                      end
                     end
                   end                  
                 rescue Exception

data/lib/core.rb

@@ -1,5 +1,5 @@
 module RTunnel
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
   
   DEFAULT_CONTROL_PORT = 19050
   PING_TIMEOUT = 10

data/lib/server.rb

@@ -89,7 +89,12 @@ module RTunnel
               end
               D "listening for remote connections on #{cmd.address}"
             when SendDataCommand
-              RemoteListenServer::CONNECTIONS[cmd.conn_id].write cmd.data
+              conn = RemoteListenServer::CONNECTIONS[cmd.conn_id]
+              begin
+                conn.write(cmd.data)  if conn
+              rescue Errno::EPIPE
+                D "broken pipe on #{cmd.conn_id}"
+              end
             when CloseConnectionCommand
               if connection = RemoteListenServer::CONNECTIONS[cmd.conn_id]
                 D "closing remote connection: #{cmd.conn_id}"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rtunnel
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
-date: 2007-12-03 00:00:00 +07:00
+  version: 0.3.6
+date: 2008-02-12 00:00:00 +07:00
 summary: The author was too lazy to write a summary
 require_paths: 
 - lib