girl 4.1.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 836b54e1549dfed638c775a99d128c18ce079d91bc508933635a8a8cbdfb3c2e
-  data.tar.gz: 7c1f1bab96cab7395e49b2dd71ec5dfc1073b57ffa6611bff7abeb1a3ef8162b
+  metadata.gz: 8d3b294765df9759f671cd5916a4315aa5872a85e42ea9739d8e2bd409f55f49
+  data.tar.gz: 8405a9e93e8c038e757c3a191c40c3801ff34e9ce593be0b0187ee728cb70fa7
 SHA512:
-  metadata.gz: 61a0a02a8a480343cd27f295d82dda48ab93e0d0c486a0d2cb82e8961477bffcc20e219238d794db8056ec00cb175955eb7c1a111b35d4fd189edec069a7390d
-  data.tar.gz: 694ea8625f406e0e2293c20b7144398ac2a09978f510d91387e3caa76d967c72dfc712334d0d1994bf8ac2822ed0b27552d7c88924b449c1fad9ff965e4293be
+  metadata.gz: 8b09b4c9b12257b9fc8672eace67cd89bfac89b5032ffb6ccf2a6810342a3c09e45ba0b6658b86cafd7d671fdeaf0235de794a3f0b356c2835a3c5248de9743b
+  data.tar.gz: 5e16e91e812c7c53d3fbb47e4c16fc90f7f922a011d4983b6ee955306fd88496b7965e0f02c7ab78b9db80e25a4468c483dffab634d009d1f459d1a16c589a8f

data/girl.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
 girl.gemspec
 lib/girl.rb
 lib/girl/concurrent_hash.rb
-lib/girl/custom_dns_query.rb
 lib/girl/custom.rb
 lib/girl/head.rb
 lib/girl/proxy_custom.rb

data/lib/girl/concurrent_hash.rb

@@ -1,26 +1,26 @@
-class ConcurrentHash < Hash
-  def initialize
-    super
-    @mutex = Mutex.new
-  end
-
-  def []( *args )
-    @mutex.synchronize { super }
-  end
-
-  def []=( *args )
-    @mutex.synchronize { super }
-  end
-
-  def delete( *args )
-    @mutex.synchronize { super }
-  end
-
-  def each( *args )
-    @mutex.synchronize { super }
-  end
-
-  def clear( *args )
-    @mutex.synchronize { super }
-  end
-end
+class ConcurrentHash < Hash
+  def initialize
+    super
+    @mutex = Mutex.new
+  end
+
+  def []( *args )
+    @mutex.synchronize { super }
+  end
+
+  def []=( *args )
+    @mutex.synchronize { super }
+  end
+
+  def delete( *args )
+    @mutex.synchronize { super }
+  end
+
+  def each( *args )
+    @mutex.synchronize { super }
+  end
+
+  def clear( *args )
+    @mutex.synchronize { super }
+  end
+end

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.rb

@@ -14,8 +14,8 @@ require 'socket'
 #
 =begin
 C:  1 hello            -> hello
-    2 tund port        -> n: tund port
-    3 a new source     -> Q>: src id -> encoded destination address
+    2 tund port        -> n: atund port -> n: btund port
+    3 a new source     -> Q>: src id -> destination
     4 paired           -> Q>: src id -> n: dst id
     5 dest status      NOT USE
     6 source status    NOT USE
@@ -32,13 +32,11 @@ C:  1 hello            -> hello
    17 continue         NOT USE
    18 is resend ready  NOT USE
    19 resend ready     NOT USE
-   20 resolv           -> Q>: src id -> encoded domain
-   21 resolved         -> Q>: src id -> encoded ip
+   20 resolv           NOT USE
+   21 resolved         NOT USE
    22 heartbeat        NOT USE
    23 unknown ctl addr
    24 ctl fin
-   25 source eof       -> Q>: dst id
-   26 dest eof         -> Q>: src id
   101 traff infos
   101 traff infos      -> [ C: im len -> im -> Q>: traff in ->  Q>: traff out ]
 =end

data/lib/girl/proxy_custom.rb

@@ -1,16 +1,16 @@
-require 'girl/custom'
-
-module Girl
-  class ProxyCustom
-    include Custom
-
-    def initialize( im )
-      @im = im
-    end
-
-    def hello
-      @im
-    end
-
-  end
-end
+require 'girl/custom'
+
+module Girl
+  class ProxyCustom
+    include Custom
+
+    def initialize( im )
+      @im = im
+    end
+
+    def hello
+      @im
+    end
+
+  end
+end

data/lib/girl/proxy_worker.rb

@@ -6,6 +6,7 @@ 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
@@ -19,7 +20,7 @@ module Girl
       @resume_srcs = []
       @resume_dsts = []
       @resume_btuns = []
-      @pending_srcs = []                     # 还没配到tund，暂存的src
+      @pending_srcs = []                     # 还没得到atund和btund地址，暂存的src
       @roles = ConcurrentHash.new            # sock => :dotr / :redir / :ctl / :src / :dst / :atun / :btun
       @src_infos = ConcurrentHash.new        # src => {}
       @dst_infos = ConcurrentHash.new        # dst => {}
@@ -296,7 +297,7 @@ module Girl
       close_sock( atun )
       atun_info = @atun_infos.delete( atun )
       src = atun_info[ :src ]
-      
+
       if src then
         @paused_srcs.delete( src )
       end
@@ -430,9 +431,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
@@ -449,7 +449,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
@@ -458,7 +457,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
@@ -509,8 +507,8 @@ module Girl
           if @ctl && !@ctl.closed? then
             last_recv_at = @ctl_info[ :last_recv_at ] || @ctl_info[ :created_at ]
 
-            if now - last_recv_at >= EXPIRE_AFTER then
-               puts "p#{ Process.pid } #{ Time.new } expire ctl"
+            if now - last_recv_at >= EXPIRE_CTL then
+               puts "p#{ Process.pid } #{ Time.new } expire ctl #{ EXPIRE_CTL }"
                @ctl_info[ :closing ] = true
                next_tick
             end
@@ -519,9 +517,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[ :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 )
 
@@ -550,7 +563,7 @@ module Girl
               if !dst.closed? then
                 dst_info = @dst_infos[ dst ]
 
-                if dst_info[ :wbuff ].size < RESUME_BELOW then
+                if dst_info[ :wbuff ].bytesize < RESUME_BELOW then
                   puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
                   add_resume_src( src )
                 end
@@ -561,7 +574,7 @@ module Girl
               if atun && !atun.closed? then
                 atun_info = @atun_infos[ atun ]
 
-                if atun_info[ :wbuff ].size < RESUME_BELOW then
+                if atun_info[ :wbuff ].bytesize < RESUME_BELOW then
                   puts "p#{ Process.pid } #{ Time.new } resume tunnel src #{ src_info[ :destination_domain ] }"
                   add_resume_src( src )
                 end
@@ -576,7 +589,7 @@ module Girl
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain ] }"
                 add_resume_dst( dst )
               end
@@ -590,7 +603,7 @@ module Girl
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume btun #{ btun_info[ :domain ] }"
                 add_resume_btun( btun )
               end
@@ -634,13 +647,14 @@ module Girl
       domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
+      dst.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         dst.connect_nonblock( destination_addr )
       rescue IO::WaitWritable
         # connect nonblock 必抛 wait writable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }, close src"
+        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }"
         dst.close
         add_closing_src( src )
         return
@@ -655,9 +669,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
@@ -666,11 +680,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
 
     ##
@@ -706,6 +722,7 @@ module Girl
     #
     def new_a_redir( redir_port )
       redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      redir.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
 
       if RUBY_PLATFORM.include?( 'linux' ) then
@@ -724,6 +741,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 ]
@@ -731,23 +749,25 @@ module Girl
 
       # puts "debug new atun and btun"
       atun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      atun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         atun.connect_nonblock( @ctl_info[ :atund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }, close atun"
+        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }"
         atun.close
         return
       end
 
       btun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      btun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         btun.connect_nonblock( @ctl_info[ :btund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }, close btun"
+        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }"
         btun.close
         return
       end
@@ -756,7 +776,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 )
@@ -777,7 +797,8 @@ module Girl
         domain: domain,    # 目的地
         wbuff: btun_wbuff, # 写前
         rbuff: '',         # 暂存当前块没收全的流量
-        wait_bytes: 0      # 还差多少字节收全当前块
+        wait_bytes: 0,     # 还差多少字节收全当前块
+        lbuff: ''          # 流量截断在长度前缀处
       }
 
       src_info[ :dst_id ] = dst_id
@@ -809,7 +830,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
@@ -864,6 +884,7 @@ module Girl
     #
     def send_ctlmsg( data )
       return if @ctl.nil? || @ctl.closed?
+      data = @custom.encode( data )
 
       begin
         @ctl.sendmsg( data, 0, @proxyd_addr )
@@ -925,30 +946,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' ) )
@@ -1012,6 +1014,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
@@ -1042,11 +1046,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' ) )
@@ -1060,14 +1065,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
@@ -1084,7 +1089,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
@@ -1159,7 +1164,16 @@ module Girl
             return
           end
 
-          data, domain_port = sub_http_request( data )
+          lines = data.split( "\r\n" )
+
+          unless lines.empty? then
+            method, url, proto = lines.first.split( ' ' )
+
+            if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://' then
+              domain_port = url.split( '/' )[ 2 ]
+              # puts "debug domain port #{ domain_port }"
+            end
+          end
 
           unless domain_port then
             # puts "debug not HTTP"
@@ -1226,10 +1240,6 @@ module Girl
       when :tunnel then
         atun = src_info[ :atun ]
 
-        if atun && !src_info[ :is_connect ] then
-          data, _ = sub_http_request( data )
-        end
-
         if atun then
           add_atun_wbuff( atun, pack_a_chunk( data ) )
         else
@@ -1240,10 +1250,6 @@ module Girl
         dst = src_info[ :dst ]
 
         if dst then
-          unless src_info[ :is_connect ] then
-            data, _ = sub_http_request( data )
-          end
-
           add_dst_wbuff( dst, data )
         else
           # puts "debug add src.rbuff #{ data.bytesize }"
@@ -1265,7 +1271,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
@@ -1306,22 +1312,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 ]
@@ -1329,7 +1357,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
@@ -1408,6 +1436,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 ]
 
       # 写前为空，处理关闭写
@@ -1438,7 +1472,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