girl 0.83.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28c02739bfb0608617fa46ef36d80d7ba9c84753eb3c34410eb98f05cab430f1
-  data.tar.gz: 94a70957768e52b1e40782c0df53451e1caebcac096829648009c6977219dd8b
+  metadata.gz: 5e4aab3d7602140945fbcdf5717c347e2cfa7bb409107f95453d604e334e4cf2
+  data.tar.gz: abad237f14da90667f236445a468be63107f8da57b92556507bd2fc71eb14b3e
 SHA512:
-  metadata.gz: d0e12984275ddf891c11b75ce86d13830798d2538b9b4b15962720ac268f61dc721d1fd355f99282f6274217879e1053d698dbcdaf59de30533fe59c53596173
-  data.tar.gz: dc98d8959fd53fc51f8e0e2851ce46afe78a7ddedf293a595148b885a8ed2055a7e1fa92e88b22826528e0a6399ff5c16700c689bf4a766a6d7ca809567e0a1d
+  metadata.gz: 20fa20702e7a4f174a7b44793db3c05dd9f42ae6449f708b025b716baf69fd339fb908d6399d82e9f625b598155f5683ee21d3018a16c3e75a0c0ffedcd8e3e0
+  data.tar.gz: 3e38693a5d467b323faf00feda3775f7a560a5e9744efa1116d942fdbc88f86de9ae4ac8f5eb4dc2ce8b14d92c522604bf0c8f83b0e51eb9d87861ee9d9ec3b2

data/girl.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['qqtakafan@gmail.com']
 
   spec.summary       = %q{妹子}
-  spec.description   = %q{while internet is evil, here's a girl.}
+  spec.description   = %q{escape evil.}
   spec.homepage      = 'https://github.com/takafan/girl'
   spec.license       = 'MIT'
 

data/lib/girl/head.rb

@@ -7,9 +7,10 @@ module Girl
   EXPIRE_NEW            = 10               # 创建之后多久没有流量进来，过期
   EXPIRE_AFTER          = 300              # 多久没有新流量，过期
   CHECK_EXPIRE_INTERVAL = 30               # 检查过期间隔
-  STATUS_INTERVAL       = 0.5              # 发送状态间隔
+  CHECK_STATUS_INTERVAL = 0.5              # 发送状态间隔
   SEND_STATUS_UNTIL     = 10               # 持续的告之对面状态，直到没有流量往来，持续多少秒
-  BREAK_SEND_MISS       = 10_000           # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
+  MISS_RANGE_LIMIT      = 100              # miss段上限，达到上限忽略要后面的段
+  RESENDING_LIMIT       = 5000             # 重传队列上限
   CONFUSE_UNTIL         = 5                # 混淆前几个包
   RESOLV_CACHE_EXPIRE   = 300              # dns查询结果缓存多久过期
   TUND_PORT             = 1

data/lib/girl/proxy_worker.rb

@@ -152,7 +152,7 @@ module Girl
     def loop_check_status
       Thread.new do
         loop do
-          sleep STATUS_INTERVAL
+          sleep CHECK_STATUS_INTERVAL
 
           @mutex.synchronize do
             if @tun && !@tun.closed? && @tun_info[ :tund_addr ]
@@ -1226,7 +1226,7 @@ module Girl
 
           tund_port = data[ 9, 2 ].unpack( 'n' ).first
 
-          # puts "debug1 got tund port #{ tund_port }"
+          puts "p#{ Process.pid } #{ Time.new } got tund port #{ tund_port }"
           tund_addr = Socket.sockaddr_in( tund_port, @proxyd_host )
           @tun_info[ :tund_addr ] = tund_addr
 
@@ -1291,36 +1291,36 @@ module Girl
           # 发miss
           if !src_ext[ :src ].closed? && ( src_ext[ :continue_dst_pack_id ] < relay_dst_pack_id )
             ranges = []
+            ignored = false
             curr_pack_id = src_ext[ :continue_dst_pack_id ] + 1
 
             src_ext[ :pieces ].keys.sort.each do | pack_id |
               if pack_id > curr_pack_id
                 ranges << [ curr_pack_id, pack_id - 1 ]
+
+                if range.size >= MISS_RANGE_LIMIT
+                  puts "p#{ Process.pid } #{ Time.new } break add miss range at #{ pack_id }"
+                  ignored = true
+                  break
+                end
               end
 
               curr_pack_id = pack_id + 1
             end
 
-            if curr_pack_id <= relay_dst_pack_id
+            if !ignored && ( curr_pack_id <= relay_dst_pack_id )
               ranges << [ curr_pack_id, relay_dst_pack_id ]
             end
 
-            pack_count = 0
             # puts "debug1 continue/relay #{ src_ext[ :continue_dst_pack_id ] }/#{ relay_dst_pack_id } send MISS #{ ranges.size }"
 
             ranges.each do | pack_id_begin, pack_id_end |
-              if pack_count >= BREAK_SEND_MISS
-                puts "p#{ Process.pid } #{ Time.new } break send miss at #{ pack_id_begin }"
-                break
-              end
-
               data2 = [ 0, MISS, dst_port, pack_id_begin, pack_id_end ].pack( 'Q>CnQ>Q>' )
               add_tun_ctlmsg( data2 )
-              pack_count += ( pack_id_end - pack_id_begin + 1 )
             end
           end
         when MISS
-          return if from_addr != @tun_info[ :tund_addr ]
+          return if ( from_addr != @tun_info[ :tund_addr ] ) || ( @tun_info[ :resendings ].size >= RESENDING_LIMIT )
 
           src_id, pack_id_begin, pack_id_end = data[ 9, 24 ].unpack( 'Q>Q>Q>' )
 
@@ -1331,7 +1331,7 @@ module Girl
             send_at = src_ext[ :send_ats ][ pack_id ]
 
             if send_at
-              break if now - send_at < STATUS_INTERVAL
+              break if now - send_at < CHECK_STATUS_INTERVAL
               @tun_info[ :resendings ] << [ src_id, pack_id ]
             end
           end

data/lib/girl/proxyd_worker.rb

@@ -144,7 +144,7 @@ module Girl
     def loop_check_status
       Thread.new do
         loop do
-          sleep STATUS_INTERVAL
+          sleep CHECK_STATUS_INTERVAL
 
           if @tunds.any?
             @mutex.synchronize do
@@ -866,35 +866,37 @@ module Girl
           # 发miss
           if !dst_ext[ :dst ].closed? && ( dst_ext[ :continue_src_pack_id ] < relay_src_pack_id )
             ranges = []
+            ignored = false
             curr_pack_id = dst_ext[ :continue_src_pack_id ] + 1
 
             dst_ext[ :pieces ].keys.sort.each do | pack_id |
               if pack_id > curr_pack_id
                 ranges << [ curr_pack_id, pack_id - 1 ]
+
+                if range.size >= MISS_RANGE_LIMIT
+                  puts "p#{ Process.pid } #{ Time.new } break add miss range at #{ pack_id }"
+                  ignored = true
+                  break
+                end
               end
 
               curr_pack_id = pack_id + 1
             end
 
-            if curr_pack_id <= relay_src_pack_id
+            if !ignored && ( curr_pack_id <= relay_src_pack_id )
               ranges << [ curr_pack_id, relay_src_pack_id ]
             end
 
-            pack_count = 0
             # puts "debug1 continue/relay #{ dst_ext[ :continue_src_pack_id ] }/#{ relay_src_pack_id } send MISS #{ ranges.size }"
 
             ranges.each do | pack_id_begin, pack_id_end |
-              if pack_count >= BREAK_SEND_MISS
-                puts "p#{ Process.pid } #{ Time.new } break send miss at #{ pack_id_begin }"
-                break
-              end
-
               data2 = [ 0, MISS, src_id, pack_id_begin, pack_id_end ].pack( 'Q>CQ>Q>Q>' )
               add_tund_ctlmsg( tund, data2 )
-              pack_count += ( pack_id_end - pack_id_begin + 1 )
             end
           end
         when MISS
+          return if tund_info[ :resendings ].size >= RESENDING_LIMIT
+
           dst_local_port, pack_id_begin, pack_id_end = data[ 9, 18 ].unpack( 'nQ>Q>' )
 
           dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
@@ -904,7 +906,7 @@ module Girl
             send_at = dst_ext[ :send_ats ][ pack_id ]
 
             if send_at
-              break if now - send_at < STATUS_INTERVAL
+              break if now - send_at < CHECK_STATUS_INTERVAL
               tund_info[ :resendings ] << [ dst_local_port, pack_id ]
             end
           end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.83.0'.freeze
+  VERSION = '0.84.0'.freeze
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.83.0
+  version: 0.84.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-05 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies: []
-description: while internet is evil, here's a girl.
+description: escape evil.
 email:
 - qqtakafan@gmail.com
 executables: []