r_socks 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4437c0dc6d60a5e4b7d70c4dea5074bddcd0eefe4e677a7530e30405c2752da3
-  data.tar.gz: bac15e8ca3fa6b945720c3699d8c0b1325323556f4ac54bcd64bd5438d68159c
+  metadata.gz: 61198ecf92ea464b8bfc7c185ff7a723edc2f2d12baa27208edb3237649968c3
+  data.tar.gz: e809c8bc99cf8503f2e482893a3782b654bd3b0a3a732f6a8f4bcad0467f5140
 SHA512:
-  metadata.gz: 1651e0dcdf4ff5af0ede3643cfb9990c2c654e2de79e9989c3c61a96ba2b84bbb84d16ae548eb7e071c62aef484c3cceadae4172308597f5081b4d8f1b9b686d
-  data.tar.gz: 483e9ee7aeec558334a27553cfbed7a5623e0e240c96b81a4ce96c2c597db6810a83e327124baaf178da0f3d1e13fe4658c385ae04d49797799206f3575933a8
+  metadata.gz: ebacf2bccba41f8ce5ed39be17b536706eb323edcdbe0790a11b5e7d3595623c8b2d3c6e97ce351fae7f7385b6e09b9ee910b52aa7c00c6be9742550bc47db37
+  data.tar.gz: 6e706ae3f7bb3cdcf518f92ce668660985865d602115847ae960d5df06684b3185ca8ecb336a6bceaf830db254fecb9d3591c63f0772bad406eefd3ea0376fc7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    r_socks (0.1.3)
+    r_socks (0.1.5)
       eventmachine (~> 1.2, >= 1.2.7)
 
 GEM

data/lib/r_socks/connection_handler.rb

@@ -55,14 +55,16 @@ module RSocks
 
         if @state_machine.connect?
           connect_request(data)
-          @target = EventMachine.attach(@current_socket, RSocks::TargetConnectionHandler)
-          @target.source_io = self
           return
         end
 
         return send_data(not_accept) unless @state_machine.start?
-        @target.send_data(data)
 
+        if @target.nil?
+          @target = EventMachine.connect(@addr, @port, RSocks::TargetConnectionHandler, self)
+        end
+
+        @target.send_data(data)
       rescue => error
         puts "Error at #{@ip}:#{@port}, message: #{data}, error: #{error.message}"
         puts error.backtrace
@@ -70,9 +72,7 @@ module RSocks
     end
 
     def unbind
-      if @current_socket && !@current_socket.closed?
-        @current_socket.close
-      end
+      @target.close_connection
     end
 
     private
@@ -118,8 +118,7 @@ module RSocks
       return not_accept if version != RSocks::VERSION
 
       begin
-        addr, port, type = check_sock_cmd(cmd, data[2..-1])
-        @current_socket = TCPSocket.new(addr, port)
+        @addr, @port, @type = check_sock_cmd(cmd, data[2..-1])
       rescue
         send_data([RSocks::VERSION,RSocks::CONNECT_FAIL].pack('CC'))
         return close_connection
@@ -128,7 +127,7 @@ module RSocks
       @state_machine.start!
 
       send_data([RSocks::VERSION, RSocks::CONNECT_SUCCESS].
-        pack('CC') + pack_address_and_port_info(type))
+        pack('CC') + pack_address_and_port_info(@type))
     end
 
     def check_sock_cmd(cmd, data)

data/lib/r_socks/target_connection_handler.rb

@@ -3,16 +3,16 @@ require 'eventmachine'
 module RSocks
   class TargetConnectionHandler < EM::Connection
 
-    def source_io=(io)
-      @source_io = io
+    def initialize(client)
+      @client = client
     end
 
     def receive_data(data)
-      @source_io.send_data(data)
+      @client.send_data(data)
     end
 
     def unbind
-      @source_io.close_connection
+      @client.close_connection_after_writing
     end
   end
 end

data/lib/r_socks/version.rb

@@ -1,3 +1,3 @@
 module RSocks
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/r_socks.rb

@@ -1 +1,8 @@
-require 'r_socks/tcp_server'
+require 'r_socks/tcp_server'
+# example
+#
+# server = RSocks::TcpServer.new('127.0.0.1', 8081)
+#
+# server.config.auth_method = :password
+#
+# server.run!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r_socks
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Nick An