rtunnel 0.3.6 → 0.3.7

data/lib/core.rb

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

data/lib/server.rb

@@ -16,9 +16,11 @@ module RTunnel
   # listens for incoming connections to tunnel
   class RemoteListenServer < GServer
     CONNECTIONS = SyncHash.new
+    CONTROL_CONNECTION_MAPPING = SyncHash.new
 
-    def initialize(port, host = DEFAULT_HOST)
+    def initialize(port, host, control_connection)
       super(port, host, 10)
+      @control_connection = control_connection
     end
 
     def serve(sock)
@@ -26,6 +28,7 @@ module RTunnel
 
       conn_id = UUID.t
       CONNECTIONS[conn_id] = sock
+      CONTROL_CONNECTION_MAPPING[conn_id] = @control_connection
       begin
         ControlServer.new_tunnel(conn_id)
 
@@ -36,9 +39,11 @@ module RTunnel
         D "error talking on control connection, dropping incoming connection: #{$!.inspect}"
       end
       
-      CONNECTIONS.delete conn_id
       ControlServer.close_tunnel(conn_id)
 
+      CONNECTIONS.delete conn_id
+      CONTROL_CONNECTION_MAPPING.delete conn_id
+
       D "sock closed"
     rescue
       p $!
@@ -47,32 +52,40 @@ module RTunnel
   end
 
   class ControlServer < GServer
-    @@control_connection = nil
-    @@remote_listen_server = nil
+    @@control_connections = []
+    @@remote_listen_servers = []
 
     @@m = Mutex.new
 
     attr_accessor :ping_interval
 
-    def self.new_tunnel(conn_id)
-      D "sending create connection command: #{conn_id}"
+    class << self
+      def new_tunnel(conn_id)
+        D "sending create connection command: #{conn_id}"
 
-      @@m.synchronize { @@control_connection.write CreateConnectionCommand.new(conn_id) }
-    end
+        @@m.synchronize { control_connection_for(conn_id).write CreateConnectionCommand.new(conn_id) }
+      end
 
-    def self.send_data(conn_id, data)
-      @@m.synchronize { @@control_connection.write SendDataCommand.new(conn_id, data) }
-    end
+      def send_data(conn_id, data)
+        @@m.synchronize { control_connection_for(conn_id).write SendDataCommand.new(conn_id, data) }
+      end
+
+      def close_tunnel(conn_id)
+        D "sending close connection command"
 
-    def self.close_tunnel(conn_id)
-      D "sending close connection command"
+        @@m.synchronize { control_connection_for(conn_id).write CloseConnectionCommand.new(conn_id) }
+      end
 
-      @@m.synchronize { @@control_connection.write CloseConnectionCommand.new(conn_id) }
+      private
+
+      def control_connection_for(conn_id)
+        RemoteListenServer::CONTROL_CONNECTION_MAPPING[conn_id]
+      end
     end
 
     def serve(sock)
       D "new control connection"
-      @@control_connection = sock
+      @@control_connections << sock
       sock.sync = true
 
       cmd_queue = ""
@@ -84,8 +97,13 @@ module RTunnel
             case cmd
             when RemoteListenCommand
               @@m.synchronize do
-                @@remote_listen_server.stop  if @@remote_listen_server
-                (@@remote_listen_server = RemoteListenServer.new(*cmd.address.split(/:/).reverse)).start
+                addr, port = cmd.address.split(/:/)
+                if rls = @@remote_listen_servers.detect {|s| s.port == port.to_i }
+                  rls.stop
+                  @@remote_listen_servers.delete rls
+                end
+                (new_rls = RemoteListenServer.new(port, addr, sock)).start
+                @@remote_listen_servers << new_rls
               end
               D "listening for remote connections on #{cmd.address}"
             when SendDataCommand
@@ -106,12 +124,15 @@ module RTunnel
           end
         end
         
-        @@m.synchronize { @@control_connection.write PingCommand.new }
+        # TODO: only do this every ping_interval instead of after each socket read
+        @@m.synchronize { @@control_connections.each {|cc| cc.write PingCommand.new } }
       end
     rescue
       D $!.inspect
       D $!.backtrace.join("\n")
       raise
+    ensure
+      @@control_connections.delete sock
     end
 
     def stopping
@@ -151,4 +172,4 @@ module RTunnel
       ControlServer.stop(@control_server.port, @control_server.host)
     end
   end
-end
+end

metadata

@@ -1,68 +1,22 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rtunnel
 version: !ruby/object:Gem::Version 
-  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
-email: ryand-ruby@zenspider.com
-homepage: http://www.zenspider.com/ZSS/Products/rtunnel/
-rubyforge_project: coderrr
-description: "OkExtensions by steved http://code.google.com/p/rtunnel  == DESCRIPTION:  http://code.google.com/p/rtunnel"
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.3.7
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Ryan Davis
-files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- rtunnel_client.rb
-- rtunnel_server.rb
-- bin/rtunnel_client
-- bin/rtunnel_server
-- lib/rtunnel_client_cmd.rb
-- lib/rtunnel_server_cmd.rb
-- lib/client.rb
-- lib/core.rb
-- lib/server.rb
-- lib/cmds.rb
-test_files: []
-
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: 
-- rtunnel_client
-- rtunnel_server
-extensions: []
-
-requirements: []
+- coderrr
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-09-15 00:00:00 +07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -70,8 +24,9 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: facets
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -79,10 +34,65 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.5.3
     version: 
+description: "OkExtensions by steved http://code.google.com/p/rtunnel  == DESCRIPTION:  http://code.google.com/p/rtunnel"
+email: coderrr.contact@gmail.com
+executables: 
+- rtunnel_client
+- rtunnel_server
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- rtunnel_client.rb
+- rtunnel_server.rb
+- bin/rtunnel_client
+- bin/rtunnel_server
+- lib/rtunnel_client_cmd.rb
+- lib/rtunnel_server_cmd.rb
+- lib/client.rb
+- lib/core.rb
+- lib/server.rb
+- lib/cmds.rb
+has_rdoc: true
+homepage: http://code.google.com/p/rtunnel
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: coderrr
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: http://code.google.com/p/rtunnel
+test_files: []
+