girl 4.2.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e6e47afe34c123e702c013b4b2f71c3ef836902edd8ab7508b9fe666c2052c7
-  data.tar.gz: 673a5b27d4863a9c1daa34abc94536e7c7d68549363071e73d9f57a1db4056bc
+  metadata.gz: e06e25ddc6594959cceb39bd5d4ad420941dfaeec6866a86d7817e974cf9bc2f
+  data.tar.gz: 6d8016cd3a42b0cf611bad16759e34f130f193bb9e68a88f5f8b80597bd62dc9
 SHA512:
-  metadata.gz: 1c105f47f7cfd38572adef3c40be156e88fe1b767d6144cd923154e57c19a5508fbaaaff325e2c252f8371ca97c621a8a6b5ce020381c8738b2529bade9840b9
-  data.tar.gz: 3b13786e8062bad65c975e48340c2b1deae88be8965862543bd644783b3ecbab6b446c2e872a64169a8380fef0679d7c504c6fdbfbe08995d5ae2662b67319b8
+  metadata.gz: d1d49eddf9232d1af3cbf4d9426a257cdaf48003fe9a1b08fdca5b1caaba5497eda97b3092b49191c228868026d70843839ac711b1a70201832901062caeecf8
+  data.tar.gz: aa1f7dc236106913f5ea2c061fd5b54c7675da04e0db71fc2d200f1665213c8c33b5ed78a4959111453b19189562d0ba233cbf3cc71e32fb3575e7199050b77f

data/lib/girl/head.rb

@@ -1,13 +1,15 @@
 module Girl
-  READ_SIZE             = 1024 * 1024      # atun, btun一次读多少
+  READ_SIZE             = 1024 * 1024      # 一次读多少
   WBUFF_LIMIT           = 50 * 1024 * 1024 # 写前上限，超过上限暂停读
   RESUME_BELOW          = WBUFF_LIMIT / 2  # 降到多少以下恢复读
+  CHUNK_SIZE            = 65535            # 按块加解密，块尺寸上限，不超过65535
   EXPIRE_NEW            = 5                # 多久没有建立通道，过期
-  EXPIRE_AFTER          = 300              # 多久没有新流量，过期
+  EXPIRE_CONNECTING     = 2                # 连接中，多久没连上过期
+  EXPIRE_AFTER          = 86400            # 多久没有新流量，过期
   EXPIRE_CTL            = 86400            # 多久没有ctlmsg来，过期
   RESET_TRAFF_DAY       = 1                # 流量计数重置日，0为不重置
   CHECK_TRAFF_INTERVAL  = 86400            # 检查今天是否是流量计数重置日间隔
-  CHECK_EXPIRE_INTERVAL = 5                # 检查过期间隔
+  CHECK_EXPIRE_INTERVAL = 1                # 检查过期间隔
   CHECK_RESUME_INTERVAL = 1                # 检查恢复读间隔
   RESOLV_CACHE_EXPIRE   = 300              # dns查询结果缓存多久过期
   RESEND_LIMIT          = 5                # ctlmsg重传次数
@@ -52,7 +54,9 @@ EOF
     READ_SIZE
     WBUFF_LIMIT
     RESUME_BELOW
+    CHUNK_SIZE
     EXPIRE_NEW
+    EXPIRE_CONNECTING
     EXPIRE_AFTER
     EXPIRE_CTL
     RESET_TRAFF_DAY

data/lib/girl/proxy_worker.rb

@@ -7,7 +7,6 @@ module Girl
     def initialize( redir_port, proxyd_host, proxyd_port, directs, remotes, im )
       @proxyd_host = proxyd_host
       @proxyd_port = proxyd_port
-      @proxyd_addr = Socket.sockaddr_in( proxyd_port, proxyd_host )
       @directs = directs
       @remotes = remotes
       @custom = Girl::ProxyCustom.new( im )
@@ -431,8 +430,7 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
 
-      if ( ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) ) \
-        || ( ( ip_info.ip_address == @proxyd_host ) && ( src_info[ :destination_port ] == @proxyd_port ) ) then
+      if ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) then
         puts "p#{ Process.pid } #{ Time.new } ignore #{ ip_info.ip_address }:#{ src_info[ :destination_port ] }"
         add_closing_src( src )
         return
@@ -507,19 +505,33 @@ 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"
-               @ctl_info[ :closing ] = true
-               next_tick
+            if now - last_recv_at >= EXPIRE_CTL then
+               puts "p#{ Process.pid } #{ Time.new } expire ctl #{ EXPIRE_CTL }"
+               set_ctl_closing
             end
           end
 
           @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 ] || src_info[ :atun ] ) ? 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
+            elsif src_info[ :atun ] then
+              expire_after = EXPIRE_AFTER
+              is_expire = ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after )
+            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 )
 
@@ -548,7 +560,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
@@ -559,7 +571,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
@@ -574,7 +586,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
@@ -588,7 +600,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
@@ -615,6 +627,7 @@ module Girl
 
           if resend >= RESEND_LIMIT then
             @ctl_info[ :resends ].delete( key )
+            set_ctl_closing
             break
           end
 
@@ -632,13 +645,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
@@ -653,9 +667,9 @@ 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
 
       if src_info[ :proxy_proto ] == :http then
         if src_info[ :is_connect ] then
@@ -664,11 +678,13 @@ module Girl
         elsif src_info[ :rbuff ] then
           # puts "debug move src.rbuff to dst.wbuff"
           dst_info[ :wbuff ] << src_info[ :rbuff ]
-          add_write( dst )
         end
       elsif src_info[ :proxy_proto ] == :socks5 then
         add_socks5_conn_reply( src )
       end
+
+      add_read( dst, :dst )
+      add_write( dst )
     end
 
     ##
@@ -684,7 +700,10 @@ module Girl
       @ctl = ctl
       add_read( ctl, :ctl )
 
+      ctld_port = @proxyd_port + 5.times.to_a.sample
+      ctld_addr = Socket.sockaddr_in( ctld_port, @proxyd_host )
       @ctl_info = {
+        ctld_addr: ctld_addr,        # ctld地址
         resends: ConcurrentHash.new, # key => count
         atund_addr: nil,             # atund地址，src->dst
         btund_addr: nil,             # btund地址，dst->src
@@ -694,7 +713,7 @@ module Girl
       }
 
       hello = @custom.hello
-      puts "p#{ Process.pid } #{ Time.new } hello i'm #{ hello.inspect }"
+      puts "p#{ Process.pid } #{ Time.new } hello i'm #{ hello.inspect } #{ ctld_port }"
       key = [ HELLO ].pack( 'C' )
       add_ctlmsg( key, hello )
     end
@@ -704,6 +723,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
@@ -730,23 +750,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
@@ -755,7 +777,7 @@ module Girl
       atun_wbuff = [ dst_id ].pack( 'n' )
 
       until src_info[ :rbuff ].empty? do
-        data = src_info[ :rbuff ][ 0, 65535 ]
+        data = src_info[ :rbuff ][ 0, CHUNK_SIZE ]
         data_size = data.bytesize
         # puts "debug move src.rbuff #{ data_size } to atun.wbuff"
         atun_wbuff << pack_a_chunk( data )
@@ -776,7 +798,8 @@ module Girl
         domain: domain,    # 目的地
         wbuff: btun_wbuff, # 写前
         rbuff: '',         # 暂存当前块没收全的流量
-        wait_bytes: 0      # 还差多少字节收全当前块
+        wait_bytes: 0,     # 还差多少字节收全当前块
+        lbuff: ''          # 流量截断在长度前缀处
       }
 
       src_info[ :dst_id ] = dst_id
@@ -808,7 +831,6 @@ module Girl
     # pack a chunk
     #
     def pack_a_chunk( data )
-      # puts "debug pack a chunk"
       data = @custom.encode( data )
       "#{ [ data.bytesize ].pack( 'n' ) }#{ data }"
     end
@@ -866,7 +888,7 @@ module Girl
       data = @custom.encode( data )
 
       begin
-        @ctl.sendmsg( data, 0, @proxyd_addr )
+        @ctl.sendmsg( data, 0, @ctl_info[ :ctld_addr ] )
         @ctl_info[ :last_sent_at ] = Time.new
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } sendmsg #{ e.class }"
@@ -886,6 +908,15 @@ module Girl
       add_write( atun )
     end
 
+    ##
+    # set ctl closing
+    #
+    def set_ctl_closing
+      return if @ctl.closed?
+      @ctl_info[ :closing ] = true
+      next_tick
+    end
+
     ##
     # set dst closing write
     #
@@ -929,7 +960,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @ctl_info && @ctl_info[ :closing ] then
         send_ctlmsg( [ CTL_FIN ].pack( 'C' ) )
@@ -993,6 +1024,8 @@ module Girl
         is_connect: true,        # 代理协议是http的场合，是否是CONNECT
         rbuff: '',               # 读到的流量
         dst: nil,                # :direct的场合，对应的dst
+        dst_created_at: nil,     # :direct的场合，对应的dst的创建时间
+        dst_connected: false,    # :direct的场合，对应的dst是否已连接
         ctl: nil,                # :tunnel的场合，对应的ctl
         atun: nil,               # :tunnel的场合，对应的atun
         btun: nil,               # :tunnel的场合，对应的btun
@@ -1028,7 +1061,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' ) )
@@ -1042,14 +1075,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
@@ -1066,7 +1099,7 @@ module Girl
       src_info = @src_infos[ src ]
 
       begin
-        data = src.read_nonblock( 65535 )
+        data = src.read_nonblock( CHUNK_SIZE )
       rescue IO::WaitReadable
         print 'r'
         return
@@ -1248,7 +1281,7 @@ module Girl
       src = dst_info[ :src ]
 
       begin
-        data = dst.read_nonblock( 65535 )
+        data = dst.read_nonblock( CHUNK_SIZE )
       rescue IO::WaitReadable
         print 'r'
         return
@@ -1289,22 +1322,44 @@ module Girl
       end
 
       until data.empty? do
-        rbuff = btun_info[ :rbuff ]
         wait_bytes = btun_info[ :wait_bytes ]
 
         if wait_bytes > 0 then
           len = wait_bytes
           # puts "debug wait bytes #{ len }"
         else
-          if data.bytesize <= 2 then
-            # puts "debug unexpect data length #{ data.bytesize }"
-            close_btun( btun )
-            return
-          end
+          lbuff = btun_info[ :lbuff ]
+
+          if lbuff.empty? then
+            # 长度缓存为空，从读到的流量里取长度
+            # 两个字节以下，记进长度缓存
+            if data.bytesize <= 2 then
+              # puts "debug set btun.lbuff #{ data.inspect }"
+              btun_info[ :lbuff ] = data
+              return
+            end
+
+            len = data[ 0, 2 ].unpack( 'n' ).first
+            data = data[ 2..-1 ]
+          elsif lbuff.bytesize == 1 then
+            # 长度缓存记有一个字节，补一个字节
+            lbuff = "#{ lbuff }#{ data[ 0 ] }"
+
+            if data.bytesize == 1 then
+              # puts "debug add btun.lbuff a byte #{ data.inspect }"
+              btun_info[ :lbuff ] = lbuff
+              return
+            end
 
-          len = data[ 0, 2 ].unpack( 'n' ).first
-          # puts "debug read len #{ len }"
-          data = data[ 2..-1 ]
+            # 使用长度缓存
+            len = lbuff.unpack( 'n' ).first
+            btun_info[ :lbuff ].clear
+            data = data[ 1..-1 ]
+          else
+            # 使用长度缓存
+            len = lbuff.unpack( 'n' ).first
+            btun_info[ :lbuff ].clear
+          end
         end
 
         chunk = data[ 0, len ]
@@ -1312,7 +1367,7 @@ module Girl
 
         if chunk_size == len then
           # 取完整了
-          chunk = @custom.decode( "#{ rbuff }#{ chunk }" )
+          chunk = @custom.decode( "#{ btun_info[ :rbuff ] }#{ chunk }" )
           # puts "debug decode and add src.wbuff #{ chunk.bytesize }"
           add_src_wbuff( src, chunk )
           btun_info[ :rbuff ].clear
@@ -1391,6 +1446,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 ]
 
       # 写前为空，处理关闭写
@@ -1421,7 +1482,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/proxyd_worker.rb

@@ -28,7 +28,7 @@ module Girl
       dotr, dotw = IO.pipe
       @dotw = dotw
       add_read( dotr, :dotr )
-      new_a_ctld( proxyd_port )
+      new_ctlds( proxyd_port )
       new_a_infod( infod_port )
     end
 
@@ -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 )
@@ -324,6 +325,7 @@ module Girl
         ctl_addr: ctl_addr,       # 对应ctl
         im: ctl_info[ :im ],      # 标识
         domain_port: domain_port, # 目的地和端口
+        connected: false,         # 是否已连接
         rbuff: '',                # 对应的tun没准备好，暂存读到的流量
         atun: nil,                # 对应的atun
         btun: nil,                # 对应的btun
@@ -336,13 +338,14 @@ module Girl
       }
 
       add_read( dst, :dst )
+      add_write( dst )
 
       ctl_info[ :dst_ids ][ src_id ] = dst_id
       ctl_info[ :dsts ][ dst_id ] = dst
 
       data = [ PAIRED, src_id, dst_id ].pack( 'CQ>n' )
       # puts "debug add ctlmsg paired #{ src_id } #{ dst_id }"
-      send_ctlmsg( data, ctl_addr )
+      send_ctlmsg( ctl_info[ :ctld ], data, ctl_addr )
     end
 
     ##
@@ -404,11 +407,17 @@ module Girl
           end
 
           @dst_infos.each do | dst, dst_info |
-            last_recv_at = dst_info[ :last_recv_at ] || dst_info[ :created_at ]
-            last_sent_at = dst_info[ :last_sent_at ] || dst_info[ :created_at ]
-            expire_after = dst_info[ :btun ] ? EXPIRE_AFTER : EXPIRE_NEW
+            if dst_info[ :connected ] then
+              last_recv_at = dst_info[ :last_recv_at ] || dst_info[ :created_at ]
+              last_sent_at = dst_info[ :last_sent_at ] || dst_info[ :created_at ]
+              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 - dst_info[ :created_at ] >= expire_after )
+            end
 
-            if ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after ) then
+            if is_expire then
               puts "p#{ Process.pid } #{ Time.new } expire dst #{ expire_after } #{ dst_info[ :domain_port ] }"
 
               unless @closing_dsts.include?( dst ) then
@@ -436,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
@@ -450,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
@@ -479,18 +488,6 @@ module Girl
       end
     end
 
-    ##
-    # new a ctld
-    #
-    def new_a_ctld( proxyd_port )
-      ctld = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      ctld.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      ctld.bind( Socket.sockaddr_in( proxyd_port, '0.0.0.0' ) )
-      puts "p#{ Process.pid } #{ Time.new } ctld bind on #{ proxyd_port }"
-      add_read( ctld, :ctld )
-      @ctld = ctld
-    end
-
     ##
     # new a infod
     #
@@ -507,11 +504,26 @@ 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
     end
 
+    ##
+    # new ctlds
+    #
+    def new_ctlds( proxyd_port )
+      5.times do | i |
+        ctld_port = proxyd_port + i
+        ctld = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+        ctld.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        ctld.bind( Socket.sockaddr_in( ctld_port, '0.0.0.0' ) )
+        puts "p#{ Process.pid } #{ Time.new } ctld bind on #{ ctld_port }"
+        add_read( ctld, :ctld )
+      end
+    end
+
     ##
     # next tick
     #
@@ -523,7 +535,6 @@ module Girl
     # pack a chunk
     #
     def pack_a_chunk( data )
-      # puts "debug pack a chunk"
       data = @custom.encode( data )
       "#{ [ data.bytesize ].pack( 'n' ) }#{ data }"
     end
@@ -572,11 +583,11 @@ module Girl
     ##
     # send ctlmsg
     #
-    def send_ctlmsg( data, to_addr )
+    def send_ctlmsg( ctld, data, to_addr )
       data = @custom.encode( data )
 
       begin
-        @ctld.sendmsg( data, 0, to_addr )
+        ctld.sendmsg( data, 0, to_addr )
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } sendmsg #{ e.class }"
       end
@@ -610,7 +621,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @deleting_ctl_infos.any? then
         @deleting_ctl_infos.each { | ctl_addr | del_ctl_info( ctl_addr ) }
@@ -656,7 +667,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 )
 
@@ -688,6 +699,7 @@ module Girl
           }
 
           @ctl_infos[ ctl_addr ] = {
+            ctld: ctld,                  # 对应的ctld
             addrinfo: addrinfo,          # 地址
             im: im,                      # 标识
             atund: atund,                # 对应atund，src->dst
@@ -703,21 +715,21 @@ module Girl
         end
 
         data2 = [ TUND_PORT, atund_port, btund_port ].pack( 'Cnn' )
-        send_ctlmsg( data2, ctl_addr )
+        send_ctlmsg( ctld, data2, ctl_addr )
       when A_NEW_SOURCE then
         unless ctl_info then
-          send_ctlmsg( [ UNKNOWN_CTL_ADDR ].pack( 'C' ), addrinfo )
+          send_ctlmsg( ctld, [ UNKNOWN_CTL_ADDR ].pack( 'C' ), addrinfo )
           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 ]
 
         if dst_id then
           data2 = [ PAIRED, src_id, dst_id ].pack( 'CQ>n' )
           # puts "debug dst id exist, send ctlmsg paired #{ src_id } #{ dst_id }"
-          send_ctlmsg( data2, ctl_addr )
+          send_ctlmsg( ctld, data2, ctl_addr )
           return
         end
 
@@ -773,7 +785,7 @@ module Girl
       btun = dst_info[ :btun ]
 
       begin
-        data = dst.read_nonblock( 65535 )
+        data = dst.read_nonblock( CHUNK_SIZE )
       rescue IO::WaitReadable
         print 'r'
         return
@@ -826,7 +838,8 @@ module Girl
         dst: nil,                          # 对应dst
         domain_port: nil,                  # dst的目的地和端口
         rbuff: '',                         # 暂存当前块没收全的流量
-        wait_bytes: 0                      # 还差多少字节收全当前块
+        wait_bytes: 0,                     # 还差多少字节收全当前块
+        lbuff: ''                          # 流量截断在长度前缀处
       }
 
       add_read( atun, :atun )
@@ -922,22 +935,44 @@ module Girl
       end
 
       until data.empty? do
-        rbuff = atun_info[ :rbuff ]
         wait_bytes = atun_info[ :wait_bytes ]
 
         if wait_bytes > 0 then
           len = wait_bytes
           # puts "debug wait bytes #{ len }"
         else
-          if data.bytesize <= 2 then
-            # puts "debug unexpect data length #{ data.bytesize }"
-            close_atun( atun )
-            return
-          end
+          lbuff = atun_info[ :lbuff ]
+
+          if lbuff.empty? then
+            # 长度缓存为空，从读到的流量里取长度
+            # 两个字节以下，记进长度缓存
+            if data.bytesize <= 2 then
+              # puts "debug set atun.lbuff #{ data.inspect }"
+              atun_info[ :lbuff ] = data
+              return
+            end
 
-          len = data[ 0, 2 ].unpack( 'n' ).first
-          # puts "debug read len #{ len }"
-          data = data[ 2..-1 ]
+            len = data[ 0, 2 ].unpack( 'n' ).first
+            data = data[ 2..-1 ]
+          elsif lbuff.bytesize == 1 then
+            # 长度缓存记有一个字节，补一个字节
+            lbuff = "#{ lbuff }#{ data[ 0 ] }"
+
+            if data.bytesize == 1 then
+              # puts "debug add atun.lbuff a byte #{ data.inspect }"
+              atun_info[ :lbuff ] = lbuff
+              return
+            end
+
+            # 使用长度缓存
+            len = lbuff.unpack( 'n' ).first
+            atun_info[ :lbuff ].clear
+            data = data[ 1..-1 ]
+          else
+            # 使用长度缓存
+            len = lbuff.unpack( 'n' ).first
+            atun_info[ :lbuff ].clear
+          end
         end
 
         chunk = data[ 0, len ]
@@ -945,7 +980,7 @@ module Girl
 
         if chunk_size == len then
           # 取完整了
-          chunk = @custom.decode( "#{ rbuff }#{ chunk }" )
+          chunk = @custom.decode( "#{ atun_info[ :rbuff ] }#{ chunk }" )
           # puts "debug decode and add dst.wbuff #{ chunk.bytesize }"
           add_dst_wbuff( dst, chunk )
           atun_info[ :rbuff ].clear
@@ -1022,7 +1057,7 @@ module Girl
         data2 = ''
 
         until dst_info[ :rbuff ].empty? do
-          _data = dst_info[ :rbuff ][ 0, 65535 ]
+          _data = dst_info[ :rbuff ][ 0, CHUNK_SIZE ]
           data_size = _data.bytesize
           # puts "debug move dst.rbuff to btun.wbuff"
           data2 << pack_a_chunk( _data )
@@ -1045,6 +1080,7 @@ module Girl
       end
 
       dst_info = @dst_infos[ dst ]
+      dst_info[ :connected ] = true
       atun = dst_info[ :atun ]
       data = dst_info[ :wbuff ]
 

data/lib/girl/relay.rb

@@ -4,6 +4,7 @@ require 'girl/head'
 require 'girl/proxy_custom'
 require 'girl/relay_worker'
 require 'girl/version'
+require 'ipaddr'
 require 'json'
 require 'socket'
 

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
@@ -537,9 +537,24 @@ 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 ] || src_info[ :tun ] ) ? 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
+            elsif src_info[ :atun ] then
+              expire_after = EXPIRE_AFTER
+              is_expire = ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after )
+            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 )
 
@@ -568,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
@@ -579,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
@@ -594,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
@@ -608,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
@@ -652,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
@@ -674,15 +689,17 @@ 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
 
       if src_info[ :rbuff ] then
         # puts "debug move src.rbuff to dst.wbuff"
         dst_info[ :wbuff ] << src_info[ :rbuff ]
-        add_write( dst )
       end
+
+      add_read( dst, :dst )
+      add_write( dst )
     end
 
     ##
@@ -718,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' ) )
@@ -756,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,
@@ -778,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
@@ -803,7 +823,7 @@ module Girl
       atun_wbuff = [ dst_id ].pack( 'n' )
 
       until src_info[ :rbuff ].empty? do
-        data = src_info[ :rbuff ][ 0, 65535 ]
+        data = src_info[ :rbuff ][ 0, CHUNK_SIZE ]
         data_size = data.bytesize
         # puts "debug move src.rbuff #{ data_size } to atun.wbuff"
         atun_wbuff << pack_a_chunk( data )
@@ -824,7 +844,8 @@ module Girl
         domain: domain,    # 目的地
         wbuff: btun_wbuff, # 写前
         rbuff: '',         # 暂存当前块没收全的流量
-        wait_bytes: 0      # 还差多少字节收全当前块
+        wait_bytes: 0,     # 还差多少字节收全当前块
+        lbuff: ''          # 流量截断在长度前缀处
       }
 
       src_info[ :dst_id ] = dst_id
@@ -933,7 +954,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @ctl_info && @ctl_info[ :closing ] then
         send_ctlmsg( [ CTL_FIN ].pack( 'C' ) )
@@ -1038,6 +1059,8 @@ module Girl
         destination_port: dest_port, # 目的地端口
         rbuff: '',                   # 读到的流量
         dst: nil,                    # :direct的场合，对应的dst
+        dst_created_at: nil,         # :direct的场合，对应的dst的创建时间
+        dst_connected: false,        # :direct的场合，对应的dst是否已连接
         ctl: nil,                    # :tunnel的场合，对应的ctl
         atun: nil,                   # :tunnel的场合，对应的atun
         btun: nil,                   # :tunnel的场合，对应的btun
@@ -1075,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' ) )
@@ -1089,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
@@ -1113,7 +1136,7 @@ module Girl
       src_info = @src_infos[ src ]
 
       begin
-        data = src.read_nonblock( 65535 )
+        data = src.read_nonblock( CHUNK_SIZE )
       rescue IO::WaitReadable
         print 'r'
         return
@@ -1175,7 +1198,7 @@ module Girl
       src = dst_info[ :src ]
 
       begin
-        data = dst.read_nonblock( 65535 )
+        data = dst.read_nonblock( CHUNK_SIZE )
       rescue IO::WaitReadable
         print 'r'
         return
@@ -1216,22 +1239,44 @@ module Girl
       end
 
       until data.empty? do
-        rbuff = btun_info[ :rbuff ]
         wait_bytes = btun_info[ :wait_bytes ]
 
         if wait_bytes > 0 then
           len = wait_bytes
           # puts "debug wait bytes #{ len }"
         else
-          if data.bytesize <= 2 then
-            # puts "debug unexpect data length #{ data.bytesize }"
-            close_btun( btun )
-            return
-          end
+          lbuff = btun_info[ :lbuff ]
+
+          if lbuff.empty? then
+            # 长度缓存为空，从读到的流量里取长度
+            # 两个字节以下，记进长度缓存
+            if data.bytesize <= 2 then
+              # puts "debug set btun.lbuff #{ data.inspect }"
+              btun_info[ :lbuff ] = data
+              return
+            end
 
-          len = data[ 0, 2 ].unpack( 'n' ).first
-          # puts "debug read len #{ len }"
-          data = data[ 2..-1 ]
+            len = data[ 0, 2 ].unpack( 'n' ).first
+            data = data[ 2..-1 ]
+          elsif lbuff.bytesize == 1 then
+            # 长度缓存记有一个字节，补一个字节
+            lbuff = "#{ lbuff }#{ data[ 0 ] }"
+
+            if data.bytesize == 1 then
+              # puts "debug add btun.lbuff a byte #{ data.inspect }"
+              btun_info[ :lbuff ] = lbuff
+              return
+            end
+
+            # 使用长度缓存
+            len = lbuff.unpack( 'n' ).first
+            btun_info[ :lbuff ].clear
+            data = data[ 1..-1 ]
+          else
+            # 使用长度缓存
+            len = lbuff.unpack( 'n' ).first
+            btun_info[ :lbuff ].clear
+          end
         end
 
         chunk = data[ 0, len ]
@@ -1239,7 +1284,7 @@ module Girl
 
         if chunk_size == len then
           # 取完整了
-          chunk = @custom.decode( "#{ rbuff }#{ chunk }" )
+          chunk = @custom.decode( "#{ btun_info[ :rbuff ] }#{ chunk }" )
           # puts "debug read btun decoded #{ chunk.bytesize }"
           add_src_wbuff( src, chunk )
           btun_info[ :rbuff ] = ''
@@ -1318,6 +1363,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 ]
 
       # 写前为空，处理关闭写
@@ -1348,7 +1399,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/resolvd_worker.rb

@@ -162,7 +162,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @closing_dsts.any? then
         @closing_dsts.each { | dst | close_dst( dst ) }

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' ) )
@@ -534,7 +550,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @closing_srcs.any? then
         @closing_srcs.each { | src | close_src( src ) }
@@ -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收到）的时间
@@ -623,7 +641,7 @@ module Girl
       src_info = @src_infos[ src ]
 
       begin
-        data = src.read_nonblock( 65535 )
+        data = src.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable
         return
       rescue Errno::EINTR => e
@@ -741,7 +759,7 @@ module Girl
       src = dst_info[ :src ]
 
       begin
-        data = dst.read_nonblock( 65535 )
+        data = dst.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
         print 'r'
         return
@@ -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.2.0'.freeze
+  VERSION = '4.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.7.0
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-22 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.2.15
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 妹子