rtunnel 0.3.1 → 0.3.5

data/lib/client.rb

@@ -4,7 +4,7 @@ require 'timeout'
 require 'resolv'
 
 require 'facets'
-require 'synchash'
+require 'facets/synchash'
 
 require 'core'
 require 'cmds'
@@ -59,7 +59,6 @@ module RTunnel
           while true
             last_objects = objects.dup
             ObjectSpace.each_object do |o|
-              next  if ! o.respond_to? :class
               objects[o.class] += 1
             end
 
@@ -106,27 +105,31 @@ module RTunnel
               when PingCommand
                 @last_ping = Time.now
               when CreateConnectionCommand
-                # TODO: this currently blocks, but if we put it in thread, a SendDataCommand may try to get run for this connection before the connection exists
-                CONNECTIONS[command.conn_id] = TCPSocket.new(*@tunnel_to_address.split(/:/))
-                Thread.safe do
-                  cmd = command
-                  conn = CONNECTIONS[cmd.conn_id]
-
-                  begin
-                    D "reading local data"
-                    while localdata = conn.readpartial(16834)
-                      D "sending data back to server: #{localdata.size}"
-                      write_to_control_sock SendDataCommand.new(cmd.conn_id, localdata)
+                begin
+                  # TODO: this currently blocks, but if we put it in thread, a SendDataCommand may try to get run for this connection before the connection exists
+                  CONNECTIONS[command.conn_id] = TCPSocket.new(*@tunnel_to_address.split(/:/))
+
+                  Thread.safe do
+                    cmd = command
+                    conn = CONNECTIONS[cmd.conn_id]
+
+                    begin
+                      while localdata = conn.readpartial(16834)
+                        write_to_control_sock SendDataCommand.new(cmd.conn_id, localdata)
+                      end
+                    rescue EOFError
+                      D "to tunnel closed, closing from tunnel"
+                      conn.close
+                      CONNECTIONS.delete cmd.conn_id
+                      write_to_control_sock CloseConnectionCommand.new(cmd.conn_id)
                     end
-                  rescue EOFError
-                    D "to tunnel closed, closing from tunnel"
-                    conn.close
-                    CONNECTIONS.delete cmd.conn_id
-                    write_to_control_sock CloseConnectionCommand.new(cmd.conn_id)
-                  end
+                  end                  
+                rescue Exception
+                  D "error connecting to local port"
+                  write_to_control_sock CloseConnectionCommand.new(command.conn_id)
                 end
               when CloseConnectionCommand
-                D "close " + command.conn_id
+                D "closing connection #{command.conn_id}"
                 if connection = CONNECTIONS[command.conn_id]
                   # TODO: how the hell do u catch a .close error?
                   connection.close_read
@@ -134,7 +137,6 @@ module RTunnel
                   CONNECTIONS.delete(command.conn_id)
                 end
               when SendDataCommand
-                D "send to local " + command.conn_id + " " + command.inspect
                 if connection = CONNECTIONS[command.conn_id]
                   connection.write(command.data)
                 else
@@ -175,4 +177,4 @@ module RTunnel
       @check_ping = false
     end
   end
-end
+end

data/lib/core.rb

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

data/lib/server.rb

@@ -3,7 +3,7 @@ require 'optparse'
 require 'uuidtools'
 
 require 'facets'
-require 'synchash'
+require 'facets/synchash'
 
 require 'core'
 require 'cmds'
@@ -45,52 +45,6 @@ module RTunnel
       puts $!.backtrace.join("\n")
     end
   end
-#
-#  class TunnelListenServer < GServer
-#    @@tunneled_connections = []
-#
-#    def initialize(port, host = DEFAULT_HOST)
-#      super(port, host, 10)
-#    end
-#
-#    def serve(sock)
-#      D "new tunneled connection"
-#      cv, incoming_connection = RemoteListenServer.next_incoming_connection
-#      if ! incoming_connection
-#        D "no incoming connections for this tunneled connection, closing"
-#        return
-#      end
-#
-#      while ready = (IO.select([incoming_connection, sock], nil, nil, 0.5).first  rescue [])
-#        if ready.include? incoming_connection
-#          begin
-#            sock.write(incoming_connection.readpartial(1024))
-#          rescue EOFError
-#            D "incoming socket closed, closing tunneled socket"
-#            sock.close
-#            cv.signal
-#
-#            return
-#          end
-#        end
-#
-#        if ready.include? sock
-#          begin
-#            incoming_connection.write(sock.readpartial(1024))
-#          rescue EOFError
-#            D "tunneled socket closed, closing incoming connection socket"
-#            incoming_connection.close
-#            cv.signal
-#
-#            return
-#          end
-#        end
-#      end
-#    rescue Exception
-#      p $!
-#      puts $!.backtrace.join("\n")
-#    end
-#  end
 
   class ControlServer < GServer
     @@control_connection = nil
@@ -107,7 +61,6 @@ module RTunnel
     end
 
     def self.send_data(conn_id, data)
-      D "send to client: #{conn_id}"
       @@m.synchronize { @@control_connection.write SendDataCommand.new(conn_id, data) }
     end
 
@@ -130,11 +83,12 @@ module RTunnel
             cmd = Command.parse(cmd_queue)
             case cmd
             when RemoteListenCommand
-              @@remote_listen_server.stop  if @@remote_listen_server
-              (@@remote_listen_server = RemoteListenServer.new(*cmd.address.split(/:/).reverse)).start
+              @@m.synchronize do
+                @@remote_listen_server.stop  if @@remote_listen_server
+                (@@remote_listen_server = RemoteListenServer.new(*cmd.address.split(/:/).reverse)).start
+              end
               D "listening for remote connections on #{cmd.address}"
             when SendDataCommand
-              D "send data to remote conn #{cmd.conn_id}"
               RemoteListenServer::CONNECTIONS[cmd.conn_id].write cmd.data
             when CloseConnectionCommand
               if connection = RemoteListenServer::CONNECTIONS[cmd.conn_id]
@@ -146,11 +100,12 @@ module RTunnel
             end
           end
         end
-        D "ping"
+        
         @@m.synchronize { @@control_connection.write PingCommand.new }
       end
     rescue
       D $!.inspect
+      D $!.backtrace.join("\n")
       raise
     end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rtunnel
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2007-11-27 00:00:00 +07:00
+  version: 0.3.5
+date: 2007-12-03 00:00:00 +07:00
 summary: The author was too lazy to write a summary
 require_paths: 
 - lib
@@ -59,6 +59,24 @@ extensions: []
 requirements: []
 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: facets
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: