girl 0.65.0 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d217fe38a61d01846b2cbf57e0a43a5c456406237007c852d6e4f2d69be3bc
-  data.tar.gz: 61641d8b22ee04b1e0daf71d410fe420939e6e6fd6c6ff65c49641a1f502baaf
+  metadata.gz: 1b2ece41d566cc27562dff36a48b1c53c53000390587b5e424bc38e78636e74c
+  data.tar.gz: c3d80d9b98804d0f1f37cf479052fc5c68b7cf907c800813cf3dd0d9a1691855
 SHA512:
-  metadata.gz: cf51f0e222f05a488ca6c5e437bdd3a6231b1ece0aa184b8907d14f0fe1ff2b3c5daa66bca56c376b1e02ca8162744f1156721f8ad48c73b9b4f3118a73a3cf5
-  data.tar.gz: b373766e42e420240a47eb5b54f4d3ea6d4c74c630b6a137fc5b91706486635f06717d6e92a1881e92bc841a640f851cb6b8c018e9b2540d16898a8104ae5d24
+  metadata.gz: c2c0d92f7dbd582f04a8d49e5285d863e790070a3ffd2c08313695f66388df436fa59441b9fef992600e1611a39053ea3df8b3f453004e2bcbc0ad126c4e257e
+  data.tar.gz: e4baabb1843d03f27101e43407927febdf0dd3a1917a30ae017297c75cb5336a32f1fb033bc484ffc0f6cf053a4b3ea63ed8726b4aece5ae662bd72767ff730d

data/lib/girl/head.rb

@@ -5,10 +5,10 @@ module Girl
   WMEMS_LIMIT           = 100_000                # 写后上限，达到上限暂停写
   RESUME_BELOW          = 50_000                 # 降到多少以下恢复写
   EXPIRE_NEW            = 10                     # 创建之后多久没有流量进来，过期
-  EXPIRE_AFTER          = 3600                   # 多久没有新流量进来，过期
+  EXPIRE_AFTER          = 300                    # 多久没有新流量，过期
   CHECK_EXPIRE_INTERVAL = 30                     # 检查过期间隔
   HEARTBEAT_INTERVAL    = 30                     # 心跳间隔
-  STATUS_INTERVAL       = 0.3                    # 发送状态间隔
+  STATUS_INTERVAL       = 0.5                    # 发送状态间隔
   SEND_STATUS_UNTIL     = 10                     # 持续的告之对面状态，直到没有流量往来，持续多少秒
   BREAK_SEND_MISS       = 10_000                 # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
   CONFUSE_UNTIL         = 5                      # 混淆前几个包

data/lib/girl/proxy_worker.rb

@@ -102,13 +102,14 @@ module Girl
             now = Time.new
 
             if @tun && !@tun.closed?
-              is_expired = @tun_info[ :last_recv_at ].nil? && ( now - @tun_info[ :created_at ] > EXPIRE_NEW )
+              is_expired = @tun_info[ :last_recv_at ] ? ( now - @tun_info[ :last_recv_at ] > EXPIRE_AFTER ) : ( now - @tun_info[ :created_at ] > EXPIRE_NEW )
 
               if is_expired
                 puts "p#{ Process.pid } #{ Time.new } expire tun"
                 set_is_closing( @tun )
               else
                 data = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
+                # puts "debug1 #{ Time.new } heartbeat"
                 add_tun_ctlmsg( data )
 
                 @tun_info[ :src_exts ].each do | src_id, src_ext |
@@ -1211,8 +1212,8 @@ module Girl
       data, addrinfo, rflags, *controls = tun.recvmsg
       from_addr = addrinfo.to_sockaddr
       now = Time.new
-      pack_id = data[ 0, 8 ].unpack( 'Q>' ).first
       @tun_info[ :last_recv_at ] = now
+      pack_id = data[ 0, 8 ].unpack( 'Q>' ).first
 
       if pack_id == 0
         ctl_num = data[ 8 ].unpack( 'C' ).first

data/lib/girl/proxyd_worker.rb

@@ -103,18 +103,22 @@ module Girl
                 is_expired = tund_info[ :last_recv_at ] ? ( now - tund_info[ :last_recv_at ] > EXPIRE_AFTER ) : ( now - tund_info[ :created_at ] > EXPIRE_NEW )
 
                 if is_expired
-                  puts "p#{ Process.pid } #{ Time.new } expire tund"
+                  puts "p#{ Process.pid } #{ Time.new } expire tund #{ tund_info[ :port ] }"
                   set_is_closing( tund )
-                  need_trigger = true
                 else
+                  data = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
+                  # puts "debug1 #{ Time.new } #{ tund_info[ :port ] } heartbeat"
+                  add_tund_ctlmsg( tund, data )
+
                   tund_info[ :dst_exts ].each do | dst_local_port, dst_ext |
                     if dst_ext[ :dst ].closed? && ( now - dst_ext[ :last_continue_at ] > EXPIRE_AFTER )
                       puts "p#{ Process.pid } #{ Time.new } expire dst ext #{ dst_local_port }"
                       del_dst_ext( tund, dst_local_port )
-                      need_trigger = true
                     end
                   end
                 end
+
+                need_trigger = true
               end
             end
 
@@ -736,7 +740,6 @@ module Girl
         chunks: [],           # 块队列 filename
         spring: 0,            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
         tun_addr: from_addr,  # tun地址
-        is_tunneled: false,   # 是否已和tun打通
         dst_exts: {},         # dst额外信息 dst_addr => {}
         dst_local_ports: {},  # src_id => dst_local_port
         paused: false,        # 是否暂停写
@@ -800,7 +803,7 @@ module Girl
         end
       end
 
-      tund_info[ :is_tunneled ] = true
+      tund_info[ :last_recv_at ] = now
       pack_id = data[ 0, 8 ].unpack( 'Q>' ).first
 
       if pack_id == 0
@@ -826,8 +829,6 @@ module Girl
             return
           end
 
-          tund_info[ :last_recv_at ] = now
-
           data = data[ 17..-1 ]
           # puts "debug1 #{ data }"
           destination_domain_port = @custom.decode( data )
@@ -842,7 +843,6 @@ module Girl
           return unless dst_ext
 
           # puts "debug2 got source status"
-          tund_info[ :last_recv_at ] = now
 
           # 更新对面发到几
           if biggest_src_pack_id > dst_ext[ :biggest_src_pack_id ]
@@ -895,8 +895,6 @@ module Girl
           dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
           return unless dst_ext
 
-          tund_info[ :last_recv_at ] = now
-
           ( pack_id_begin..pack_id_end ).each do | pack_id |
             send_at = dst_ext[ :send_ats ][ pack_id ]
 
@@ -916,8 +914,6 @@ module Girl
           dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
           return unless dst_ext
 
-          tund_info[ :last_recv_at ] = now
-
           # puts "debug1 got fin1 #{ src_id } biggest src pack #{ biggest_src_pack_id } completed dst pack #{ continue_dst_pack_id }"
           dst_ext[ :is_src_closed ] = true
           dst_ext[ :biggest_src_pack_id ] = biggest_src_pack_id
@@ -934,13 +930,10 @@ module Girl
           dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
           return unless dst_local_port
 
-          tund_info[ :last_recv_at ] = now
-
           # puts "debug1 1-2. recv fin2 -> del dst ext"
           del_dst_ext( tund, dst_local_port )
         when TUN_FIN
           puts "p#{ Process.pid } #{ Time.new } recv tun fin"
-          tund_info[ :last_recv_at ] = now
           set_is_closing( tund )
         end
 
@@ -956,8 +949,6 @@ module Girl
       return if dst_ext.nil? || dst_ext[ :dst ].closed?
       return if ( pack_id <= dst_ext[ :continue_src_pack_id ] ) || dst_ext[ :pieces ].include?( pack_id )
 
-      tund_info[ :last_recv_at ] = now
-
       data = data[ 16..-1 ]
       # puts "debug2 got pack #{ pack_id }"
 

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.65.0'.freeze
+  VERSION = '0.66.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.65.0
+  version: 0.66.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: