shadowsocks 0.9 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edffb244c439aa899a453546ac27e75450760537
-  data.tar.gz: be8b590362834af9b7316be79c9231be3e40e571
+  metadata.gz: c05c7982253d7dca12efaf7d099f833cb023ecb7
+  data.tar.gz: 88c4af0e02523a3a84c3c7abdb87eff37b8797c6
 SHA512:
-  metadata.gz: 8e9760f05c09cf16a090f9895d4f1668dde35b613ea90b61dab6fe6667726d4cc83a1edfa244a03b6a8302467fceb499173186075168c6d8f33a61f64ee6a063
-  data.tar.gz: 2d5156fc848ba769cc3e4a1d3c97de5493c947b2c590628acdf58c955ead15e389905fbdba1ba48b9a05c714f71f572ff200b5027c19a6fc43377cf65b549270
+  metadata.gz: c6863718700fd2284d59bc189b24b83d2c7658f4fe6cb81bc2e69b4b7a4c44f0f6f27a84a148c43b41364db93164379bd9200409d17928349e05637b7276e08d
+  data.tar.gz: 41ead82ef4f94379f39ac1a362e04d5dca166e684295224ad498a8fae859254fd6864578f8a9c412563098d80f69ea94126f1754e4eddc22e3e848b59bf185ab

data/lib/shadowsocks/parser/base.rb

@@ -35,21 +35,11 @@ module Shadowsocks
       end
 
       def remote_addr
-        case mode
-        when :domain
-          data[2, addr_len + 3]
-        when :ip
-          inet_ntoa data[1..4]
-        end
+        raise 'Called abstract method: remote_addr'
       end
 
       def remote_port
-        case mode
-        when :domain
-          data[5 + addr_len, 2].unpack('s>')[0]
-        when :ip
-          data[5, 2].unpack('s>')[0]
-        end
+        raise 'Called abstract method: remote_port'
       end
 
       def header_length

data/lib/shadowsocks/parser/local.rb

@@ -10,6 +10,24 @@ module Shadowsocks
           data[4].unpack('c')[0]
         end
       end
+
+      def remote_addr
+        case mode
+        when :domain
+          data[2, addr_len + 3]
+        when :ip
+          inet_ntoa data[1..4]
+        end
+      end
+
+      def remote_port
+        case mode
+        when :domain
+          data[5 + addr_len, 2].unpack('s>')[0]
+        when :ip
+          data[5, 2].unpack('s>')[0]
+        end
+      end
     end
   end
 end

data/lib/shadowsocks/parser/server.rb

@@ -10,6 +10,25 @@ module Shadowsocks
           data[1].unpack('c')[0]
         end
       end
+
+      def remote_addr
+        case mode
+        when :domain
+          data[2, addr_len]
+        when :ip
+          inet_ntoa data[1..4]
+        end
+      end
+
+      def remote_port
+        case mode
+        when :domain
+          data[2 + addr_len, 2].unpack('s>')[0]
+        when :ip
+          data[5, 2].unpack('s>')[0]
+        end
+      end
+
     end
   end
 end

data/lib/shadowsocks/server.rb

@@ -2,7 +2,7 @@ module Shadowsocks
   module Server
     class RequestConnector < ::Shadowsocks::Tunnel
       def post_init
-        p "connecting #{server.remote_addr} via #{server.config.server}"
+        p "connecting #{server.remote_addr}:#{server.remote_port} via #{server.config.server}"
 
         server.cached_pieces.each { |piece| send_data piece }
         server.cached_pieces = nil

data/lib/shadowsocks/version.rb

@@ -1,3 +1,3 @@
 module Shadowsocks
-  VERSION = '0.9'
+  VERSION = '0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shadowsocks
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
 platform: ruby
 authors:
 - Sen