shadowsocks 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c05c7982253d7dca12efaf7d099f833cb023ecb7
-  data.tar.gz: 88c4af0e02523a3a84c3c7abdb87eff37b8797c6
+  metadata.gz: 13cd39701958e9cbe3c1aa72e2f4037becf509d6
+  data.tar.gz: f1d90a849085aec7408ce5f09e0e2f8e8a2cd350
 SHA512:
-  metadata.gz: c6863718700fd2284d59bc189b24b83d2c7658f4fe6cb81bc2e69b4b7a4c44f0f6f27a84a148c43b41364db93164379bd9200409d17928349e05637b7276e08d
-  data.tar.gz: 41ead82ef4f94379f39ac1a362e04d5dca166e684295224ad498a8fae859254fd6864578f8a9c412563098d80f69ea94126f1754e4eddc22e3e848b59bf185ab
+  metadata.gz: 688d4af6514d67b927edfcac45958619d844c07ad48473a7174ac84c34bf9625ffbe26ad0151a7a6e6c6625c683d58c4f8050d99cf64713614a6f53209d64122
+  data.tar.gz: 54a763dc6a4078a4fdff3b2bb4735139795b03e9f1cb9635e46110d32846125d9c2fb311dec77c2632be518a14595c1fe4eabea7fb2f4023aa80a299208a608a

data/README.md

@@ -1,9 +1,7 @@
 shadowsocks-ruby
 ================
 
-[![Code Climate](https://codeclimate.com/repos/524baea6c7f3a37df208dd4c/badges/9dd6c11b6a17c3a55631/gpa.png)](https://codeclimate.com/repos/524baea6c7f3a37df208dd4c/feed)
-
-Current version: 0.7
+Current version: 0.11
 
 shadowsocks-ruby is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
 
@@ -59,7 +57,7 @@ Command line args
 
 You can use args to override settings from `config.json`.
 
-    ss-local -s server_name -p server_port -l local_port -k password
+    ss-local -s server_name -p server_port -l local_port -k password -m aes-128-cfb -d true
     ss-server -p server_port -k password
     ss-server -c /etc/shadowsocks/config.json
 

data/config.json

@@ -1,8 +1,8 @@
 {
-    "server":"127.0.0.1",
+    "server":"162.243.140.72",
     "server_port":8388,
     "local_port":1080,
-    "password":"barfoo!",
+    "password":"marryrocks",
     "timeout":60,
     "method":"aes-128-cfb",
     "chnroutes":true

data/lib/shadowsocks/ip_detector.rb

@@ -1,5 +1,6 @@
 require 'ipaddr'
 require 'socket'
+require 'digest/md5'
 
 module Shadowsocks
   class IPDetector
@@ -8,6 +9,7 @@ module Shadowsocks
     def initialize
       @internals = {}
       @nums      = []
+      @dns_cache = {}
       lines = File.readlines(GFW_LIST_PATH)
       lines.each do |line|
         num = IPAddr.new(line).to_i
@@ -18,13 +20,29 @@ module Shadowsocks
     end
 
     def behind_gfw?(domain)
-      ip = IPSocket::getaddress(domain)
+      key = Digest::MD5.hexdigest domain
 
-      ip_num = IPAddr.new(ip).to_i
+      if @dns_cache[key]
+        @dns_cache[key]
+      else
+        begin
+          ip = IPSocket::getaddress(domain)
 
-      i = @nums.bsearch { |x| x > ip_num }
-      index = @nums.index(i) - 1
-      IPAddr.new(@internals[@nums[index].to_s]).include? ip
+          ip_num = IPAddr.new(ip).to_i
+
+          i = @nums.bsearch { |x| x > ip_num }
+          index = @nums.index(i) - 1
+          r = IPAddr.new(@internals[@nums[index].to_s]).include? ip
+          if @dns_cache.size > 512
+            @dns_cache.delete @dns_cache.first[0]
+          end
+
+          @dns_cache[key] = r
+          r
+        rescue Exception
+          false
+        end
+      end
     end
   end
 end

data/lib/shadowsocks/local.rb

@@ -71,19 +71,32 @@ module Shadowsocks
 
           @stage = 4
 
-          if config.chnroutes
-            @behind_gfw = @ip_detector.behind_gfw?(@remote_addr[3..-1])
-          end
+          op = proc {
+            if config.chnroutes
+              @behind_gfw = @ip_detector.behind_gfw?(@remote_addr[3..-1])
+            else
+              false
+            end
+          }
+
+          callback = proc { |result|
+            begin
+              if !(config.chnroutes and result)
+                raise 'will use remote server'
+              end
+              @connector = EM.connect @remote_addr[3..-1], @remote_port, \
+                DirectConnector, self, crypto
+            rescue Exception
+              @connector = EM.connect config.server, config.server_port, \
+                ServerConnector, self, crypto
+            end
 
-          if config.chnroutes == true and behind_gfw
-            @connector = EventMachine.connect @remote_addr[3..-1], @remote_port, DirectConnector, self, crypto
-          else
-            @connector = EventMachine.connect config.server, config.server_port, ServerConnector, self, crypto
-          end
+            if data.size > header_length
+              cached_pieces.push data[header_length, data.size]
+            end
+          }
 
-          if data.size > header_length
-            cached_pieces.push data[header_length, data.size]
-          end
+          EM.defer op, callback
         rescue Exception => e
           warn e
           connection_cleanup

data/lib/shadowsocks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shadowsocks
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
 platform: ruby
 authors:
 - Sen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine