rtunnel 0.4.0 → 0.4.1

data/Manifest

@@ -20,6 +20,7 @@ lib/rtunnel/server.rb
 lib/rtunnel/socket_factory.rb
 lib/rtunnel/connection_id.rb
 lib/rtunnel/command_processor.rb
+rtunnel.gemspec
 spec/client_spec.rb
 spec/cmds_spec.rb
 spec/integration_spec.rb

data/README.markdown

@@ -56,7 +56,7 @@ ports that clients can open up on the rtunnel server.
 restricts clients to using ports 3000-3999 for reverse tunnels.
 
 
-RTunnel?
+<a name="about">RTunnel?</a>
 -
 
 This client/server allow you to reverse tunnel traffic.  Reverse tunneling is useful if you want to run a server behind a NAT and you do not have the ability to use port forwarding.  The specific reason I created this program was to reduce the pain of Facebook App development on a crappy internet connection that drops often.  ssh -R was not cutting it.
@@ -81,4 +81,4 @@ With tunneling, usually your connections are made in the same direction you crea
 
 **Why not just use ssh -R?**
 
-The same thing can be achieved with ssh -R, so why not just use it?  A lot of ssh servers don't have the GatewayPorts sshd option set up to allow you to reverse tunnel.  If you are not in control of the server and it is not setup correctly then you are SOL.  RTunnel does not require you are in control of the server.  ssh -R also has other annoyances.  When your connection drops and you try to re-initiate the reverse tunnel sometimes you get an 'address already in use error' because the old tunnel process is still laying around.  This may require you to kill the existing sshd process.  RTunnel does not have this problem.
+The same thing can be achieved with ssh -R, so why not just use it?  A lot of ssh servers don't have the GatewayPorts sshd option set up to allow you to reverse tunnel.  If you are not in control of the server and it is not setup correctly then you are SOL.  RTunnel does not require you are in control of the server.  ssh -R also has other annoyances.  When your connection drops and you try to re-initiate the reverse tunnel sometimes you get an 'address already in use error' because the old tunnel process is still laying around.  This may require you to kill the existing sshd process.  RTunnel does not have this problem.

data/lib/rtunnel/client.rb

@@ -23,14 +23,15 @@ class RTunnel::Client
   def start
     return if @server_connection
     @control_host = SocketFactory.host_from_address @control_address
+    @control_bind_host = SocketFactory.bind_host_from_address @control_address
     @control_port = SocketFactory.port_from_address @control_address
     connect_to_server
   end
     
   def connect_to_server
     D "Connecting to #{@control_host} port #{@control_port}"
-    @server_connection = EventMachine.connect @control_host, @control_port,
-                                               Client::ServerConnection, self
+    @server_connection = EventMachine.bind_connect @control_bind_host, nil, @control_host, @control_port,
+                                                   Client::ServerConnection, self
   end
   
   def stop

data/lib/rtunnel/socket_factory.rb

@@ -2,12 +2,8 @@ require 'socket'
 
 module RTunnel::SocketFactory
   def self.split_address(address)
-    port_index = address.index /[^:]\:[^:]/
-    if port_index
-      [address[0, port_index + 1], address[port_index + 2, address.length]]
-    else
-      [address, nil]
-    end
+    address =~ /\A(.+?[^:])(?::([^:].+?[^:])(?::([^:].+?[^:]))?)?\Z/
+    [$1, $2, $3]
   end
   
   def self.host_from_address(address)
@@ -17,6 +13,10 @@ module RTunnel::SocketFactory
   def self.port_from_address(address)
     address and (port_string = split_address(address)[1]) and port_string.to_i
   end
+
+  def self.bind_host_from_address(address)
+    address and split_address(address)[2]
+  end
   
   def self.inbound?(options)
     options[:inbound] or [:in_port, :in_host, :in_addr].any? { |k| options[k] }

data/test/test_socket_factory.rb

@@ -28,6 +28,16 @@ class SocketFactoryTest < Test::Unit::TestCase
     assert_equal nil, SF.port_from_address('fe80::1%lo0')
     assert_equal 19020, SF.port_from_address('fe80::1%lo0:19020')
   end
+
+  def test_bind_host_from_address
+    assert_equal nil, SF.bind_host_from_address('127.0.0.1')
+    assert_equal nil, SF.bind_host_from_address('127.0.0.1:1234')
+    assert_equal nil, SF.bind_host_from_address('fe80::1%lo0')
+    assert_equal nil, SF.bind_host_from_address('fe80::1%lo0:19020')
+    assert_equal '127.0.0.1', SF.bind_host_from_address('127.0.0.1:1234:127.0.0.1')
+    assert_equal '192.168.1.1', SF.bind_host_from_address('fe80::1%lo0:19020:192.168.1.1')
+    assert_equal 'fe80::1%eth1', SF.bind_host_from_address('fe80::1%lo0:19020:fe80::1%eth1')
+  end
   
   def test_inbound
     assert SF.inbound?(:in_port => 1)

metadata

@@ -1,105 +1,65 @@
 --- !ruby/object:Gem::Specification 
 name: rtunnel
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - coderrr
+- costan
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 +07:00
+date: 2010-06-26 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 12
+        - 2
         version: 0.12.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
         version: 2.0.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: simple-daemon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: thin
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-description: Reverse tunnel server and client.
+  type: :runtime
+  version_requirements: *id002
+description: ""
 email: coderrr.contact@gmail.com
 executables: 
 - rtunnel_client
 - rtunnel_server
 extensions: []
 
-extra_rdoc_files: 
-- CHANGELOG
-- LICENSE
-- README.markdown
-- bin/rtunnel_client
-- bin/rtunnel_server
-- lib/rtunnel.rb
-- lib/rtunnel/client.rb
-- lib/rtunnel/command_protocol.rb
-- lib/rtunnel/commands.rb
-- lib/rtunnel/core.rb
-- lib/rtunnel/crypto.rb
-- lib/rtunnel/frame_protocol.rb
-- lib/rtunnel/io_extensions.rb
-- lib/rtunnel/leak.rb
-- lib/rtunnel/rtunnel_client_cmd.rb
-- lib/rtunnel/rtunnel_server_cmd.rb
-- lib/rtunnel/server.rb
-- lib/rtunnel/socket_factory.rb
-- lib/rtunnel/connection_id.rb
-- lib/rtunnel/command_processor.rb
+extra_rdoc_files: []
+
 files: 
 - CHANGELOG
 - LICENSE
@@ -149,46 +109,39 @@ files:
 - tests/_ab_test.rb
 - tests/_stress_test.rb
 - tests/lo_http_server.rb
-- rtunnel.gemspec
 has_rdoc: true
 homepage: http://github.com/coderrr/rtunnel
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Rtunnel
-- --main
-- README.markdown
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: coderrr
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Reverse tunnel server and client.
-test_files: 
-- test/test_commands.rb
-- test/test_frame_protocol.rb
-- test/test_connection_id.rb
-- test/test_tunnel.rb
-- test/test_socket_factory.rb
-- test/test_client.rb
-- test/test_crypto.rb
-- test/test_io_extensions.rb
-- test/test_command_protocol.rb
-- test/test_server.rb
+test_files: []
+

data/rtunnel.gemspec

@@ -1,51 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rtunnel}
-  s.version = "0.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["coderrr"]
-  s.date = %q{2009-01-26}
-  s.description = %q{Reverse tunnel server and client.}
-  s.email = %q{coderrr.contact@gmail.com}
-  s.executables = ["rtunnel_client", "rtunnel_server"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.markdown", "bin/rtunnel_client", "bin/rtunnel_server", "lib/rtunnel.rb", "lib/rtunnel/client.rb", "lib/rtunnel/command_protocol.rb", "lib/rtunnel/commands.rb", "lib/rtunnel/core.rb", "lib/rtunnel/crypto.rb", "lib/rtunnel/frame_protocol.rb", "lib/rtunnel/io_extensions.rb", "lib/rtunnel/leak.rb", "lib/rtunnel/rtunnel_client_cmd.rb", "lib/rtunnel/rtunnel_server_cmd.rb", "lib/rtunnel/server.rb", "lib/rtunnel/socket_factory.rb", "lib/rtunnel/connection_id.rb", "lib/rtunnel/command_processor.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.markdown", "Rakefile", "bin/rtunnel_client", "bin/rtunnel_server", "lib/rtunnel.rb", "lib/rtunnel/client.rb", "lib/rtunnel/command_protocol.rb", "lib/rtunnel/commands.rb", "lib/rtunnel/core.rb", "lib/rtunnel/crypto.rb", "lib/rtunnel/frame_protocol.rb", "lib/rtunnel/io_extensions.rb", "lib/rtunnel/leak.rb", "lib/rtunnel/rtunnel_client_cmd.rb", "lib/rtunnel/rtunnel_server_cmd.rb", "lib/rtunnel/server.rb", "lib/rtunnel/socket_factory.rb", "lib/rtunnel/connection_id.rb", "lib/rtunnel/command_processor.rb", "spec/client_spec.rb", "spec/cmds_spec.rb", "spec/integration_spec.rb", "spec/server_spec.rb", "spec/spec_helper.rb", "test/command_stubs.rb", "test/protocol_mocks.rb", "test/scenario_connection.rb", "test/test_client.rb", "test/test_command_protocol.rb", "test/test_commands.rb", "test/test_crypto.rb", "test/test_frame_protocol.rb", "test/test_io_extensions.rb", "test/test_server.rb", "test/test_socket_factory.rb", "test/test_tunnel.rb", "test/test_connection_id.rb", "test_data/known_hosts", "test_data/ssh_host_rsa_key", "test_data/random_rsa_key", "test_data/ssh_host_dsa_key", "test_data/authorized_keys2", "tests/_ab_test.rb", "tests/_stress_test.rb", "tests/lo_http_server.rb", "rtunnel.gemspec"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/coderrr/rtunnel}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rtunnel", "--main", "README.markdown"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{coderrr}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Reverse tunnel server and client.}
-  s.test_files = ["test/test_commands.rb", "test/test_frame_protocol.rb", "test/test_connection_id.rb", "test/test_tunnel.rb", "test/test_socket_factory.rb", "test/test_client.rb", "test/test_crypto.rb", "test/test_io_extensions.rb", "test/test_command_protocol.rb", "test/test_server.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.2"])
-      s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.4"])
-      s.add_development_dependency(%q<echoe>, [">= 3.0.1"])
-      s.add_development_dependency(%q<rspec>, [">= 1.1.11"])
-      s.add_development_dependency(%q<simple-daemon>, [">= 0.1.2"])
-      s.add_development_dependency(%q<thin>, [">= 1.0.0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.2"])
-      s.add_dependency(%q<net-ssh>, [">= 2.0.4"])
-      s.add_dependency(%q<echoe>, [">= 3.0.1"])
-      s.add_dependency(%q<rspec>, [">= 1.1.11"])
-      s.add_dependency(%q<simple-daemon>, [">= 0.1.2"])
-      s.add_dependency(%q<thin>, [">= 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.2"])
-    s.add_dependency(%q<net-ssh>, [">= 2.0.4"])
-    s.add_dependency(%q<echoe>, [">= 3.0.1"])
-    s.add_dependency(%q<rspec>, [">= 1.1.11"])
-    s.add_dependency(%q<simple-daemon>, [">= 0.1.2"])
-    s.add_dependency(%q<thin>, [">= 1.0.0"])
-  end
-end