girl 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2631d53d8c27dfb593364dc65b8d84cfbcad3e27f231c906f1b5ae6ceeea44fd
-  data.tar.gz: 6bef34c3cf545b9851038dcd630f62afd5117402ac4955ecadf6bdda3f633e68
+  metadata.gz: 8d3b294765df9759f671cd5916a4315aa5872a85e42ea9739d8e2bd409f55f49
+  data.tar.gz: 8405a9e93e8c038e757c3a191c40c3801ff34e9ce593be0b0187ee728cb70fa7
 SHA512:
-  metadata.gz: 221343c8278bea0f825adee69c7bc392005c637a787e6561004607ce5529105e9ecb5cdfd88d9b6523caff23b05cd0dcf4085d523e873f44c80e37a6360b3947
-  data.tar.gz: c1efea95b6fb2d91111abd3d97d36b557a40b6261361209abf39f9a645452afdadf85014ae338229a2b8333efb32c773456c169cc9fc9c015614b9decf8f7cd4
+  metadata.gz: 8b09b4c9b12257b9fc8672eace67cd89bfac89b5032ffb6ccf2a6810342a3c09e45ba0b6658b86cafd7d671fdeaf0235de794a3f0b356c2835a3c5248de9743b
+  data.tar.gz: 5e16e91e812c7c53d3fbb47e4c16fc90f7f922a011d4983b6ee955306fd88496b7965e0f02c7ab78b9db80e25a4468c483dffab634d009d1f459d1a16c589a8f

data/lib/girl/head.rb

@@ -5,7 +5,7 @@ module Girl
   CHUNK_SIZE            = 65535            # 按块加解密，块尺寸上限，不超过65535
   EXPIRE_NEW            = 5                # 多久没有建立通道，过期
   EXPIRE_CONNECTING     = 2                # 连接中，多久没连上过期
-  EXPIRE_AFTER          = 300              # 多久没有新流量，过期
+  EXPIRE_AFTER          = 86400            # 多久没有新流量，过期
   EXPIRE_CTL            = 86400            # 多久没有ctlmsg来，过期
   RESET_TRAFF_DAY       = 1                # 流量计数重置日，0为不重置
   CHECK_TRAFF_INTERVAL  = 86400            # 检查今天是否是流量计数重置日间隔

data/lib/girl/proxy_worker.rb

@@ -507,8 +507,8 @@ module Girl
           if @ctl && !@ctl.closed? then
             last_recv_at = @ctl_info[ :last_recv_at ] || @ctl_info[ :created_at ]
 
-            if now - last_recv_at >= EXPIRE_AFTER then
-               puts "p#{ Process.pid } #{ Time.new } expire ctl"
+            if now - last_recv_at >= EXPIRE_CTL then
+               puts "p#{ Process.pid } #{ Time.new } expire ctl #{ EXPIRE_CTL }"
                @ctl_info[ :closing ] = true
                next_tick
             end
@@ -563,7 +563,7 @@ module Girl
               if !dst.closed? then
                 dst_info = @dst_infos[ dst ]
 
-                if dst_info[ :wbuff ].size < RESUME_BELOW then
+                if dst_info[ :wbuff ].bytesize < RESUME_BELOW then
                   puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
                   add_resume_src( src )
                 end
@@ -574,7 +574,7 @@ module Girl
               if atun && !atun.closed? then
                 atun_info = @atun_infos[ atun ]
 
-                if atun_info[ :wbuff ].size < RESUME_BELOW then
+                if atun_info[ :wbuff ].bytesize < RESUME_BELOW then
                   puts "p#{ Process.pid } #{ Time.new } resume tunnel src #{ src_info[ :destination_domain ] }"
                   add_resume_src( src )
                 end
@@ -589,7 +589,7 @@ module Girl
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain ] }"
                 add_resume_dst( dst )
               end
@@ -603,7 +603,7 @@ module Girl
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume btun #{ btun_info[ :domain ] }"
                 add_resume_btun( btun )
               end
@@ -647,13 +647,14 @@ module Girl
       domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
+      dst.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         dst.connect_nonblock( destination_addr )
       rescue IO::WaitWritable
         # connect nonblock 必抛 wait writable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }, close src"
+        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }"
         dst.close
         add_closing_src( src )
         return
@@ -721,6 +722,7 @@ module Girl
     #
     def new_a_redir( redir_port )
       redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      redir.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
 
       if RUBY_PLATFORM.include?( 'linux' ) then
@@ -747,23 +749,25 @@ module Girl
 
       # puts "debug new atun and btun"
       atun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      atun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         atun.connect_nonblock( @ctl_info[ :atund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }, close atun"
+        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }"
         atun.close
         return
       end
 
       btun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      btun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         btun.connect_nonblock( @ctl_info[ :btund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }, close btun"
+        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }"
         btun.close
         return
       end
@@ -1047,7 +1051,7 @@ module Girl
 
       case ctl_num
       when TUND_PORT then
-        return if @ctl_info[ :atund_addr ] || data.size != 5
+        return if @ctl_info[ :atund_addr ] || data.bytesize != 5
         atund_port, btund_port = data[ 1, 4 ].unpack( 'nn' )
         puts "p#{ Process.pid } #{ Time.new } got tund port #{ atund_port } #{ btund_port }"
         @ctl_info[ :resends ].delete( [ HELLO ].pack( 'C' ) )
@@ -1061,14 +1065,14 @@ module Girl
           @pending_srcs.clear
         end
       when PAIRED then
-        return if data.size != 11
+        return if data.bytesize != 11
         src_id, dst_id = data[ 1, 10 ].unpack( 'Q>n' )
         # puts "debug got paired #{ src_id } #{ dst_id }"
         @ctl_info[ :resends ].delete( [ A_NEW_SOURCE, src_id ].pack( 'CQ>' ) )
         @ctl_info[ :last_recv_at ] = Time.new
         new_tuns( src_id, dst_id )
       when UNKNOWN_CTL_ADDR then
-        puts "p#{ Process.pid } #{ Time.new } got unknown ctl addr, close ctl"
+        puts "p#{ Process.pid } #{ Time.new } got unknown ctl addr"
         close_ctl( ctl )
       end
     end

data/lib/girl/proxyd_worker.rb

@@ -306,6 +306,7 @@ module Girl
     #
     def deal_with_destination_addr( ctl_addr, src_id, destination_addr, domain_port )
       dst = Socket.new( Addrinfo.new( destination_addr ).ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
+      dst.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         dst.connect_nonblock( destination_addr )
@@ -444,7 +445,7 @@ module Girl
             if btun && !btun.closed? then
               btun_info = @btun_infos[ btun ]
 
-              if btun_info[ :wbuff ].size < RESUME_BELOW then
+              if btun_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain_port ] }"
                 add_resume_dst( dst )
               end
@@ -458,7 +459,7 @@ module Girl
             if dst && !dst.closed? then
               dst_info = @dst_infos[ dst ]
 
-              if dst_info[ :wbuff ].size < RESUME_BELOW then
+              if dst_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume atun #{ atun_info[ :domain_port ] }"
                 add_resume_atun( atun )
               end
@@ -515,6 +516,7 @@ module Girl
     #
     def new_a_tund
       tund = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      tund.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       tund.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
       tund.listen( 127 )
       tund
@@ -663,7 +665,7 @@ module Girl
         if ctl_info then
           atund_port, btund_port = ctl_info[ :atund_port ], ctl_info[ :btund_port ]
         else
-          return if data.size <= 1
+          return if data.bytesize <= 1
           im = data[ 1..-1 ]
           result = @custom.check( im, addrinfo )
 
@@ -717,7 +719,7 @@ module Girl
           return
         end
 
-        return if data.size <= 9
+        return if data.bytesize <= 9
         src_id = data[ 1, 8 ].unpack( 'Q>' ).first
         dst_id = ctl_info[ :dst_ids ][ src_id ]
 

data/lib/girl/relay_worker.rb

@@ -520,8 +520,8 @@ module Girl
           if @ctl && !@ctl.closed? then
             last_recv_at = @ctl_info[ :last_recv_at ] || @ctl_info[ :created_at ]
 
-            if now - last_recv_at >= EXPIRE_AFTER then
-               puts "p#{ Process.pid } #{ Time.new } expire ctl"
+            if now - last_recv_at >= EXPIRE_CTL then
+               puts "p#{ Process.pid } #{ Time.new } expire ctl #{ EXPIRE_CTL }"
                @ctl_info[ :closing ] = true
                next_tick
             end
@@ -583,7 +583,7 @@ module Girl
               if !dst.closed? then
                 dst_info = @dst_infos[ dst ]
 
-                if dst_info[ :wbuff ].size < RESUME_BELOW then
+                if dst_info[ :wbuff ].bytesize < RESUME_BELOW then
                   puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
                   add_resume_src( src )
                 end
@@ -594,7 +594,7 @@ module Girl
               if atun && !atun.closed? then
                 atun_info = @atun_infos[ atun ]
 
-                if atun_info[ :wbuff ].size < RESUME_BELOW then
+                if atun_info[ :wbuff ].bytesize < RESUME_BELOW then
                   puts "p#{ Process.pid } #{ Time.new } resume tunnel src #{ src_info[ :destination_domain ] }"
                   add_resume_src( src )
                 end
@@ -609,7 +609,7 @@ module Girl
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain ] }"
                 add_resume_dst( dst )
               end
@@ -623,7 +623,7 @@ module Girl
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume btun #{ btun_info[ :domain ] }"
                 add_resume_btun( btun )
               end
@@ -667,14 +667,14 @@ module Girl
       domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
-      dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      dst.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         dst.connect_nonblock( destination_addr )
       rescue IO::WaitWritable
         # connect nonblock 必抛 wait writable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }, close src"
+        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }"
         dst.close
         add_closing_src( src )
         return
@@ -735,6 +735,7 @@ module Girl
     #
     def new_a_redir( redir_port )
       redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      redir.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
       redir.bind( Socket.sockaddr_in( redir_port, '0.0.0.0' ) )
@@ -773,7 +774,7 @@ module Girl
         to_addr = @nameserver_addr
       end
 
-      puts "p#{ Process.pid } #{ Time.new } new a rsv to #{ Addrinfo.new( to_addr ).inspect }"
+      # puts "debug new a rsv to #{ Addrinfo.new( to_addr ).inspect }"
 
       @rsv_infos[ rsv ] = {
         src_addr: src_addr,
@@ -795,23 +796,25 @@ module Girl
 
       # puts "debug new atun and btun"
       atun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      atun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         atun.connect_nonblock( @ctl_info[ :atund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }, close atun"
+        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }"
         atun.close
         return
       end
 
       btun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      btun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         btun.connect_nonblock( @ctl_info[ :btund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }, close btun"
+        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }"
         btun.close
         return
       end
@@ -1095,7 +1098,7 @@ module Girl
 
       case ctl_num
       when TUND_PORT then
-        return if @ctl_info[ :atund_addr ] || data.size != 5
+        return if @ctl_info[ :atund_addr ] || data.bytesize != 5
         atund_port, btund_port = data[ 1, 4 ].unpack( 'nn' )
         puts "p#{ Process.pid } #{ Time.new } got tund port #{ atund_port } #{ btund_port }"
         @ctl_info[ :resends ].delete( [ HELLO ].pack( 'C' ) )
@@ -1109,14 +1112,14 @@ module Girl
           @pending_srcs.clear
         end
       when PAIRED then
-        return if data.size != 11
+        return if data.bytesize != 11
         src_id, dst_id = data[ 1, 10 ].unpack( 'Q>n' )
         # puts "debug got paired #{ src_id } #{ dst_id }"
         @ctl_info[ :resends ].delete( [ A_NEW_SOURCE, src_id ].pack( 'CQ>' ) )
         @ctl_info[ :last_recv_at ] = Time.new
         new_tuns( src_id, dst_id )
       when UNKNOWN_CTL_ADDR then
-        puts "p#{ Process.pid } #{ Time.new } got unknown ctl addr, close ctl"
+        puts "p#{ Process.pid } #{ Time.new } got unknown ctl addr"
         close_ctl( ctl )
       end
     end

data/lib/girl/ssl_worker.rb

@@ -244,7 +244,7 @@ module Girl
       redir.close
       @roles.delete( redir )
       @reads.delete( redir )
-      @src_infos.each { | src, _ | close_src( src ) }
+      @src_infos.keys.each { | src | close_src( src ) }
     end
 
     ##
@@ -340,9 +340,21 @@ module Girl
           @src_infos.each do | src, src_info |
             last_recv_at = src_info[ :last_recv_at ] || src_info[ :created_at ]
             last_sent_at = src_info[ :last_sent_at ] || src_info[ :created_at ]
-            expire_after = src_info[ :dst ] ? EXPIRE_AFTER : EXPIRE_NEW
 
-            if ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after ) then
+            if src_info[ :dst ] then
+              if src_info[ :dst_connected ] then
+                expire_after = EXPIRE_AFTER
+                is_expire = ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after )
+              else
+                expire_after = EXPIRE_CONNECTING
+                is_expire = ( now - src_info[ :dst_created_at ] >= expire_after )
+              end
+            else
+              expire_after = EXPIRE_NEW
+              is_expire = ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after )
+            end
+
+            if is_expire then
               puts "p#{ Process.pid } #{ Time.new } expire src #{ expire_after } #{ src_info[ :id ] } #{ src_info[ :destination_domain ] }"
               add_closing_src( src )
 
@@ -370,7 +382,7 @@ module Girl
             if dst && !dst.closed? then
               dst_info = @dst_infos[ dst ]
 
-              if dst_info[ :wbuff ].size < RESUME_BELOW then
+              if dst_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
                 add_resume_src( src )
               end
@@ -384,7 +396,7 @@ module Girl
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain ] }"
                 add_resume_dst( dst )
               end
@@ -403,13 +415,14 @@ module Girl
       domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
+      dst.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         dst.connect_nonblock( destination_addr )
       rescue IO::WaitWritable
         # connect nonblock 必抛 wait writable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }, close src"
+        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }"
         dst.close
         add_closing_src( src )
         return
@@ -424,10 +437,12 @@ module Girl
       }
 
       @dst_infos[ dst ] = dst_info
-      add_read( dst, :dst )
       src_info[ :proxy_type ] = :direct
       src_info[ :dst ] = dst
+      src_info[ :dst_created_at ] = Time.new
       add_socks5_conn_reply( src )
+      add_read( dst, :dst )
+      add_write( dst )
     end
 
     ##
@@ -435,6 +450,7 @@ module Girl
     #
     def new_a_redir
       pre = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      pre.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       pre.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       pre.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
       pre.bind( Socket.sockaddr_in( @redir_port, '0.0.0.0' ) )
@@ -599,6 +615,8 @@ module Girl
         is_connect: true,        # 代理协议是http的场合，是否是CONNECT
         rbuff: '',               # 读到的流量
         dst: nil,                # 对应的dst
+        dst_created_at: nil,     # 对应的dst的创建时间
+        dst_connected: false,    # 对应的dst是否已连接
         wbuff: '',               # 从dst读到的流量
         created_at: Time.new,    # 创建时间
         last_recv_at: nil,       # 上一次收到新流量（由dst收到）的时间
@@ -812,6 +830,12 @@ module Girl
 
       dst_info = @dst_infos[ dst ]
       src = dst_info[ :src ]
+      src_info = @src_infos[ src ]
+
+      unless src.closed? then
+        src_info[ :dst_connected ] = true
+      end
+
       data = dst_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -842,7 +866,6 @@ module Girl
       dst_info[ :wbuff ] = data
 
       unless src.closed? then
-        src_info = @src_infos[ src ]
         src_info[ :last_sent_at ] = Time.new
       end
     end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '4.5.0'.freeze
+  VERSION = '4.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email:
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 妹子