girl 4.0.0 → 4.5.0

data/lib/girl/proxyd_worker.rb

@@ -42,7 +42,6 @@ module Girl
       loop_check_traff
 
       loop do
-        # puts "debug select"
         rs, ws = IO.select( @reads, @writes )
 
         rs.each do | sock |
@@ -200,9 +199,7 @@ module Girl
       return if atun.closed?
       # puts "debug close atun"
       close_sock( atun )
-      @atun_infos.delete( atun )
-      @paused_atuns.delete( atun )
-      @resume_atuns.delete( atun )
+      del_atun_info( atun )
     end
 
     ##
@@ -222,7 +219,12 @@ module Girl
       return if btun.closed?
       # puts "debug close btun"
       close_sock( btun )
-      @btun_infos.delete( btun )
+      btun_info = @btun_infos.delete( btun )
+      dst = btun_info[ :dst ]
+
+      if dst then
+        @paused_dsts.delete( dst )
+      end
     end
 
     ##
@@ -247,11 +249,13 @@ module Girl
       btun = dst_info[ :btun ]
 
       if atun then
-        close_atun( atun )
+        close_sock( atun )
+        del_atun_info( atun )
       end
 
       if btun then
-        close_btun( btun )
+        close_sock( btun )
+        @btun_infos.delete( btun )
       end
     end
 
@@ -320,6 +324,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
@@ -332,6 +337,7 @@ module Girl
       }
 
       add_read( dst, :dst )
+      add_write( dst )
 
       ctl_info[ :dst_ids ][ src_id ] = dst_id
       ctl_info[ :dsts ][ dst_id ] = dst
@@ -341,6 +347,15 @@ module Girl
       send_ctlmsg( data, ctl_addr )
     end
 
+    ##
+    # del atun info
+    #
+    def del_atun_info( atun )
+      @atun_infos.delete( atun )
+      @paused_atuns.delete( atun )
+      @resume_atuns.delete( atun )
+    end
+
     ##
     # del ctl info
     #
@@ -391,11 +406,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
@@ -419,22 +440,28 @@ module Girl
           @paused_dsts.each do | dst |
             dst_info = @dst_infos[ dst ]
             btun = dst_info[ :btun ]
-            btun_info = @btun_infos[ btun ]
 
-            if btun_info[ :wbuff ].size < RESUME_BELOW then
-              puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain_port ] }"
-              add_resume_dst( dst )
+            if btun && !btun.closed? then
+              btun_info = @btun_infos[ btun ]
+
+              if btun_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain_port ] }"
+                add_resume_dst( dst )
+              end
             end
           end
 
           @paused_atuns.each do | atun |
             atun_info = @atun_infos[ atun ]
             dst = atun_info[ :dst ]
-            dst_info = @dst_infos[ dst ]
 
-            if dst_info[ :wbuff ].size < RESUME_BELOW then
-              puts "p#{ Process.pid } #{ Time.new } resume atun #{ atun_info[ :domain_port ] }"
-              add_resume_atun( atun )
+            if dst && !dst.closed? then
+              dst_info = @dst_infos[ dst ]
+
+              if dst_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } resume atun #{ atun_info[ :domain_port ] }"
+                add_resume_atun( atun )
+              end
             end
           end
         end
@@ -500,6 +527,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
     #
@@ -545,6 +580,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
@@ -580,7 +617,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 ) }
@@ -616,6 +653,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 ]
@@ -742,7 +780,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
@@ -758,12 +796,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 )
@@ -797,7 +833,8 @@ module Girl
         dst: nil,                          # 对应dst
         domain_port: nil,                  # dst的目的地和端口
         rbuff: '',                         # 暂存当前块没收全的流量
-        wait_bytes: 0                      # 还差多少字节收全当前块
+        wait_bytes: 0,                     # 还差多少字节收全当前块
+        lbuff: ''                          # 流量截断在长度前缀处
       }
 
       add_read( atun, :atun )
@@ -893,22 +930,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 ]
@@ -916,7 +975,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
@@ -990,8 +1049,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
@@ -1007,6 +1075,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 => {}
@@ -298,7 +297,12 @@ module Girl
       return if atun.closed?
       # puts "debug close atun"
       close_sock( atun )
-      @atun_infos.delete( atun )
+      atun_info = @atun_infos.delete( atun )
+      src = atun_info[ :src ]
+
+      if src then
+        @paused_srcs.delete( src )
+      end
     end
 
     ##
@@ -308,9 +312,7 @@ module Girl
       return if btun.closed?
       # puts "debug close btun"
       close_sock( btun )
-      @btun_infos.delete( btun )
-      @paused_btuns.delete( btun )
-      @resume_btuns.delete( btun )
+      del_btun_info( btun )
     end
 
     ##
@@ -392,11 +394,13 @@ module Girl
         btun = src_info[ :btun ]
 
         if atun then
-          close_atun( atun )
+          close_sock( atun )
+          @atun_infos.delete( atun )
         end
 
         if btun then
-          close_btun( btun )
+          close_sock( btun )
+          del_btun_info( btun )
         end
       end
     end
@@ -440,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
@@ -459,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
@@ -468,12 +470,20 @@ 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
     end
 
+    ##
+    # del btun info
+    #
+    def del_btun_info( btun )
+      @btun_infos.delete( btun )
+      @paused_btuns.delete( btun )
+      @resume_btuns.delete( btun )
+    end
+
     ##
     # del dst info
     #
@@ -527,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 )
 
@@ -555,19 +580,24 @@ module Girl
             dst = src_info[ :dst ]
 
             if dst then
-              dst_info = @dst_infos[ dst ]
+              if !dst.closed? then
+                dst_info = @dst_infos[ dst ]
 
-              if dst_info[ :wbuff ].size < RESUME_BELOW then
-                puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
-                add_resume_src( src )
+                if dst_info[ :wbuff ].size < RESUME_BELOW then
+                  puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
+                  add_resume_src( src )
+                end
               end
             else
-              btun = src_info[ :btun ]
-              btun_info = @btun_infos[ btun ]
+              atun = src_info[ :atun ]
 
-              if btun_info[ :wbuff ].size < RESUME_BELOW then
-                puts "p#{ Process.pid } #{ Time.new } resume tunnel src #{ src_info[ :destination_domain ] }"
-                add_resume_src( src )
+              if atun && !atun.closed? then
+                atun_info = @atun_infos[ atun ]
+
+                if atun_info[ :wbuff ].size < RESUME_BELOW then
+                  puts "p#{ Process.pid } #{ Time.new } resume tunnel src #{ src_info[ :destination_domain ] }"
+                  add_resume_src( src )
+                end
               end
             end
           end
@@ -575,22 +605,28 @@ module Girl
           @paused_dsts.each do | dst |
             dst_info = @dst_infos[ dst ]
             src = dst_info[ :src ]
-            src_info = @src_infos[ src ]
 
-            if src_info[ :wbuff ].size < RESUME_BELOW then
-              puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain ] }"
-              add_resume_dst( dst )
+            if src && !src.closed? then
+              src_info = @src_infos[ src ]
+
+              if src_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain ] }"
+                add_resume_dst( dst )
+              end
             end
           end
 
           @paused_btuns.each do | btun |
             btun_info = @btun_infos[ btun ]
             src = btun_info[ :src ]
-            src_info = @src_infos[ src ]
 
-            if src_info[ :wbuff ].size < RESUME_BELOW then
-              puts "p#{ Process.pid } #{ Time.new } resume btun #{ btun_info[ :domain ] }"
-              add_resume_btun( btun )
+            if src && !src.closed? then
+              src_info = @src_infos[ src ]
+
+              if src_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } resume btun #{ btun_info[ :domain ] }"
+                add_resume_btun( btun )
+              end
             end
           end
         end
@@ -653,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
 
     ##
@@ -729,7 +767,7 @@ 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
@@ -749,6 +787,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,7 +820,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 )
@@ -802,7 +841,8 @@ module Girl
         domain: domain,    # 目的地
         wbuff: btun_wbuff, # 写前
         rbuff: '',         # 暂存当前块没收全的流量
-        wait_bytes: 0      # 还差多少字节收全当前块
+        wait_bytes: 0,     # 还差多少字节收全当前块
+        lbuff: ''          # 流量截断在长度前缀处
       }
 
       src_info[ :dst_id ] = dst_id
@@ -835,6 +875,7 @@ module Girl
     #
     def send_ctlmsg( data )
       return if @ctl.nil? || @ctl.closed?
+      data = @custom.encode( data )
 
       begin
         @ctl.sendmsg( data, 0, @proxyd_addr )
@@ -863,9 +904,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
@@ -908,30 +947,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' ) )
@@ -993,7 +1013,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 ]
@@ -1036,6 +1056,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
@@ -1068,6 +1090,7 @@ module Girl
         return
       end
 
+      data = @custom.decode( data )
       ctl_num = data[ 0 ].unpack( 'C' ).first
 
       case ctl_num
@@ -1086,7 +1109,7 @@ 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.size != 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>' ) )
@@ -1110,7 +1133,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
@@ -1172,7 +1195,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
@@ -1213,22 +1236,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 ] }"
 
-          len = data[ 0, 2 ].unpack( 'n' ).first
-          # puts "debug read len #{ len }"
-          data = data[ 2..-1 ]
+            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 ]
@@ -1236,7 +1281,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 ] = ''
@@ -1315,6 +1360,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 ]
 
       # 写前为空，处理关闭写
@@ -1345,7 +1396,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