girl 4.1.0 → 4.6.0

data/lib/girl/proxyd_custom.rb

@@ -1,12 +1,12 @@
-require 'girl/custom'
-
-module Girl
-  class ProxydCustom
-    include Custom
-
-    def check( data, addrinfo )
-      :success
-    end
-
-  end
-end
+require 'girl/custom'
+
+module Girl
+  class ProxydCustom
+    include Custom
+
+    def check( data, addrinfo )
+      :success
+    end
+
+  end
+end

data/lib/girl/proxyd_worker.rb

@@ -221,7 +221,7 @@ module Girl
       close_sock( btun )
       btun_info = @btun_infos.delete( btun )
       dst = btun_info[ :dst ]
-      
+
       if dst then
         @paused_dsts.delete( dst )
       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,6 +338,7 @@ module Girl
       }
 
       add_read( dst, :dst )
+      add_write( dst )
 
       ctl_info[ :dst_ids ][ src_id ] = dst_id
       ctl_info[ :dsts ][ dst_id ] = dst
@@ -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
@@ -507,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
@@ -519,6 +529,14 @@ module Girl
       @dotw.write( '.' )
     end
 
+    ##
+    # pack a chunk
+    #
+    def pack_a_chunk( data )
+      data = @custom.encode( data )
+      "#{ [ data.bytesize ].pack( 'n' ) }#{ data }"
+    end
+
     ##
     # resolve domain
     #
@@ -564,6 +582,8 @@ module Girl
     # send ctlmsg
     #
     def send_ctlmsg( data, to_addr )
+      data = @custom.encode( data )
+
       begin
         @ctld.sendmsg( data, 0, to_addr )
       rescue Exception => e
@@ -599,7 +619,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 ) }
@@ -635,6 +655,7 @@ module Girl
     #
     def read_ctld( ctld )
       data, addrinfo, rflags, *controls = ctld.recvmsg
+      data = @custom.decode( data )
       ctl_num = data[ 0 ].unpack( 'C' ).first
       ctl_addr = addrinfo.to_sockaddr
       ctl_info = @ctl_infos[ ctl_addr ]
@@ -644,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 )
 
@@ -698,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 ]
 
@@ -761,7 +782,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
@@ -777,12 +798,10 @@ module Girl
       end
 
       @traff_ins[ dst_info[ :im ] ] += data.bytesize
-      # puts "debug read dst #{ data.bytesize }, encode"
-      data = @custom.encode( data )
-      data = "#{ [ data.bytesize ].pack( 'n' ) }#{ data }"
+      # puts "debug read dst #{ data.bytesize }"
 
       if btun then
-        add_btun_wbuff( btun, data )
+        add_btun_wbuff( btun, pack_a_chunk( data ) )
       else
         # puts "debug add dst.rbuff #{ data.bytesize }"
         add_dst_rbuff( dst, data )
@@ -816,7 +835,8 @@ module Girl
         dst: nil,                          # 对应dst
         domain_port: nil,                  # dst的目的地和端口
         rbuff: '',                         # 暂存当前块没收全的流量
-        wait_bytes: 0                      # 还差多少字节收全当前块
+        wait_bytes: 0,                     # 还差多少字节收全当前块
+        lbuff: ''                          # 流量截断在长度前缀处
       }
 
       add_read( atun, :atun )
@@ -912,22 +932,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
+            data = data[ 2..-1 ]
+          elsif lbuff.bytesize == 1 then
+            # 长度缓存记有一个字节，补一个字节
+            lbuff = "#{ lbuff }#{ data[ 0 ] }"
 
-          len = data[ 0, 2 ].unpack( 'n' ).first
-          # puts "debug read len #{ len }"
-          data = data[ 2..-1 ]
+            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 ]
@@ -935,7 +977,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
@@ -1009,8 +1051,17 @@ module Girl
       btun_info[ :domain_port ] = dst_info[ :domain_port ]
 
       unless dst_info[ :rbuff ].empty? then
-        # puts "debug move dst.rbuff to btun.wbuff"
-        add_btun_wbuff( btun, dst_info[ :rbuff ] )
+        data2 = ''
+
+        until dst_info[ :rbuff ].empty? do
+          _data = dst_info[ :rbuff ][ 0, CHUNK_SIZE ]
+          data_size = _data.bytesize
+          # puts "debug move dst.rbuff to btun.wbuff"
+          data2 << pack_a_chunk( _data )
+          dst_info[ :rbuff ] = dst_info[ :rbuff ][ data_size..-1 ]
+        end
+
+        add_btun_wbuff( btun, data2 )
       end
 
       dst_info[ :btun ] = btun
@@ -1026,6 +1077,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

@@ -3,8 +3,8 @@ require 'girl/concurrent_hash'
 require 'girl/head'
 require 'girl/proxy_custom'
 require 'girl/relay_worker'
-require 'girl/resolv_custom'
 require 'girl/version'
+require 'ipaddr'
 require 'json'
 require 'socket'
 

data/lib/girl/relay_worker.rb

@@ -13,7 +13,6 @@ module Girl
       @directs = directs
       @remotes = remotes
       @custom = Girl::ProxyCustom.new( im )
-      @resolv_custom = Girl::ResolvCustom.new
       @reads = []
       @writes = []
       @closing_rsvs = []
@@ -24,7 +23,7 @@ module Girl
       @resume_srcs = []
       @resume_dsts = []
       @resume_btuns = []
-      @pending_srcs = []                     # 还没配到tund，暂存的src
+      @pending_srcs = []                     # 还没得到atund和btund地址，暂存的src
       @roles = ConcurrentHash.new            # sock => :dotr / :resolv / :rsv / :redir / :proxy / :src / :dst / :atun / :btun
       @rsv_infos = ConcurrentHash.new        # rsv => {}
       @src_infos = ConcurrentHash.new        # src => {}
@@ -445,9 +444,8 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
 
-      if ip_info.ipv4_loopback? \
-        || ip_info.ipv6_loopback? \
-        || ( ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) ) then
+      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
         puts "p#{ Process.pid } #{ Time.new } ignore #{ ip_info.ip_address }:#{ src_info[ :destination_port ] }"
         add_closing_src( src )
         return
@@ -464,7 +462,6 @@ module Girl
         is_direct = @is_direct_caches[ ip_info.ip_address ]
       else
         is_direct = @directs.any? { | direct | direct.include?( ip_info.ip_address ) }
-        # 判断直连耗时较长（树莓派 0.27秒），这里可能切去主线程，回来src可能已关闭
         puts "p#{ Process.pid } #{ Time.new } cache is direct #{ ip_info.ip_address } #{ is_direct }"
         @is_direct_caches[ ip_info.ip_address ] = is_direct
       end
@@ -473,7 +470,6 @@ module Girl
         # puts "debug #{ ip_info.inspect } hit directs"
         new_a_dst( src, ip_info )
       else
-        # 走远端
         # puts "debug #{ ip_info.inspect } go tunnel"
         set_proxy_type_tunnel( src )
       end
@@ -524,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
@@ -541,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 )
 
@@ -572,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
@@ -583,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
@@ -598,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
@@ -612,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
@@ -656,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
@@ -678,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
 
     ##
@@ -722,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' ) )
@@ -754,13 +768,13 @@ module Girl
       rsv.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
 
       if @qnames.any? { | qname | data.include?( qname ) } then
-        data = @resolv_custom.encode( data )
+        data = @custom.encode( data )
         to_addr = @resolvd_addr
       else
         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,
@@ -774,6 +788,7 @@ module Girl
     # new tuns
     #
     def new_tuns( src_id, dst_id )
+      return if @ctl_info[ :atund_addr ].nil? || @ctl_info[ :btund_addr ].nil?
       src = @srcs[ src_id ]
       return if src.nil? || src.closed?
       src_info = @src_infos[ src ]
@@ -781,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
@@ -806,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 )
@@ -827,7 +844,8 @@ module Girl
         domain: domain,    # 目的地
         wbuff: btun_wbuff, # 写前
         rbuff: '',         # 暂存当前块没收全的流量
-        wait_bytes: 0      # 还差多少字节收全当前块
+        wait_bytes: 0,     # 还差多少字节收全当前块
+        lbuff: ''          # 流量截断在长度前缀处
       }
 
       src_info[ :dst_id ] = dst_id
@@ -860,6 +878,7 @@ module Girl
     #
     def send_ctlmsg( data )
       return if @ctl.nil? || @ctl.closed?
+      data = @custom.encode( data )
 
       begin
         @ctl.sendmsg( data, 0, @proxyd_addr )
@@ -888,9 +907,7 @@ module Girl
     def send_data( sock, to_addr, data )
       begin
         sock.sendmsg( data, 0, to_addr )
-      rescue IO::WaitWritable, Errno::EINTR
-        print 'w'
-      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+      rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } sendmsg to #{ to_addr.ip_unpack.inspect } #{ e.class }"
       end
     end
@@ -933,30 +950,11 @@ module Girl
       add_write( src )
     end
 
-    ##
-    # sub http request
-    #
-    def sub_http_request( data )
-      lines = data.split( "\r\n" )
-
-      return [ data, nil ] if lines.empty?
-
-      method, url, proto = lines.first.split( ' ' )
-
-      if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://' then
-        domain_port = url.split( '/' )[ 2 ]
-        data = data.sub( "http://#{ domain_port }", '' )
-        # puts "debug subed #{ data.inspect } #{ domain_port }"
-      end
-
-      [ data, domain_port ]
-    end
-
     ##
     # 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' ) )
@@ -1018,7 +1016,7 @@ module Girl
       # puts "debug rsv recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
 
       if addrinfo.to_sockaddr == @resolvd_addr then
-        data = @resolv_custom.decode( data )
+        data = @custom.decode( data )
       end
 
       rsv_info = @rsv_infos[ rsv ]
@@ -1061,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
@@ -1093,11 +1093,12 @@ module Girl
         return
       end
 
+      data = @custom.decode( data )
       ctl_num = data[ 0 ].unpack( 'C' ).first
 
       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' ) )
@@ -1111,14 +1112,14 @@ module Girl
           @pending_srcs.clear
         end
       when PAIRED then
-        return if @ctl_info[ :atund_addr ].nil? || @ctl_info[ :btund_addr ].nil? || 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
@@ -1135,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
@@ -1197,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
@@ -1238,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 ]
@@ -1261,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 ] = ''
@@ -1340,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 ]
 
       # 写前为空，处理关闭写
@@ -1370,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