girl 0.94.0 → 0.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fbf6e091f1c0c19865e86a349ed046284ca1f807a171cd8f91b19066de3e28
-  data.tar.gz: cb9077f3870ba5cfc2ed17bf66f9c97767d94d882836acf757d5b6addcc4860a
+  metadata.gz: a9256dd41425122dd6c8f579d7821c70213b042090c2ce3320b20931c6aa9f8e
+  data.tar.gz: 7af6d01468ee207a768d52ecaf96b3baadb89bb81130f37850776b4ed6bf0393
 SHA512:
-  metadata.gz: 4bcb135b88eb5fd4d06f7b7cbeb063553a380efa8c3359c0420b69c2b5481a873ea5632333c8dd56899112d86fb1a11697fa8befc734a168cb2d03ef9eb5b2b2
-  data.tar.gz: '07935ef257d9301b18a9e1b4ed943ac0499ca4b502434b27aebebcfb8fcbe3f7a576fc9e5e7a16e9ed37ab9cf75eb490b1802dcad7024dd33f7db1a32ae11d37'
+  metadata.gz: ff1e09096efc25f66473d85e34652b76841ffa533a538c75f63562c3593afd48089d40398f74abebd40338f4af12bfc2277669ec9550f0b599b30437b681ed51
+  data.tar.gz: 95c954a9651bc636c20298a94a39a1ec334867283bd24d0b53423528d0047a82e0a89ea6764015d6d0cfc1598210aba586ef9fdf7e75ceea4a50e3797f85f356

data/lib/girl/proxy_worker.rb

@@ -13,6 +13,13 @@ module Girl
       @mutex = Mutex.new
       @reads = []
       @writes = []
+      @closing_srcs = []
+      @paused_srcs = []
+      @paused_dsts = []
+      @paused_streams = []
+      @resume_srcs = []
+      @resume_dsts = []
+      @resume_streams = []
       @roles = {}         # sock => :dotr / :proxy / :src / :dst / :tun / :stream
       @src_infos = {}     # src => {}
       @dst_infos = {}     # dst => {}
@@ -37,7 +44,6 @@ module Girl
         rs, ws = IO.select( @reads, @writes )
 
         @mutex.synchronize do
-          # 先读，再写，避免打上关闭标记后读到
           rs.each do | sock |
             case @roles[ sock ]
             when :dotr then
@@ -90,6 +96,15 @@ module Girl
 
     private
 
+    ##
+    # add closing src
+    #
+    def add_closing_src( src )
+      return if src.closed? || @closing_srcs.include?( src )
+      @closing_srcs << src
+      next_tick
+    end
+
     ##
     # add ctlmsg
     #
@@ -101,14 +116,42 @@ module Girl
       if to_addr then
         @tun_info[ :ctlmsgs ] << [ data, to_addr ]
         add_write( @tun )
+        next_tick
       end
     end
 
+    ##
+    # add paused src
+    #
+    def add_paused_src( src )
+      return if src.closed? || @paused_srcs.include?( src )
+      @reads.delete( src )
+      @paused_srcs << src
+    end
+
+    ##
+    # add paused dst
+    #
+    def add_paused_dst( dst )
+      return if dst.closed? || @paused_dsts.include?( dst )
+      @reads.delete( dst )
+      @paused_dsts << dst
+    end
+
+    ##
+    # add paused stream
+    #
+    def add_paused_stream( stream )
+      return if stream.closed? || @paused_streams.include?( stream )
+      @reads.delete( stream )
+      @paused_streams << stream
+    end
+
     ##
     # add read
     #
     def add_read( sock, role = nil )
-      unless @reads.include?( sock ) then
+      if !sock.closed? && !@reads.include?( sock ) then
         @reads << sock
 
         if role then
@@ -117,11 +160,65 @@ module Girl
       end
     end
 
+    ##
+    # add resume src
+    #
+    def add_resume_src( src )
+      return if @resume_srcs.include?( src )
+      @resume_srcs << src
+      next_tick
+    end
+
+    ##
+    # add resume dst
+    #
+    def add_resume_dst( dst )
+      return if @resume_dsts.include?( dst )
+      @resume_dsts << dst
+      next_tick
+    end
+
+    ##
+    # add resume stream
+    #
+    def add_resume_stream( stream )
+      return if @resume_streams.include?( stream )
+      @resume_streams << stream
+      next_tick
+    end
+
+    ##
+    # add dst wbuff
+    #
+    def add_dst_wbuff( dst, data )
+      dst_info = @dst_infos[ dst ]
+      dst_info[ :wbuff ] << data
+      add_write( dst )
+
+      if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        puts "p#{ Process.pid } #{ Time.new } pause direct src #{ dst_info[ :domain ] }"
+        add_paused_src( dst_info[ :src ] )
+      end
+    end
+
+    ##
+    # add src rbuff
+    #
+    def add_src_rbuff( src, data )
+      src_info = @src_infos[ src ]
+      src_info[ :rbuff ] << data
+
+      if src_info[ :rbuff ].bytesize >= WBUFF_LIMIT then
+        # puts "debug1 src.rbuff full"
+        add_closing_src( src )
+      end
+    end
+
     ##
     # add src wbuff
     #
     def add_src_wbuff( src, data )
-      return if src.closed?
+      return if src.closed? || @closing_srcs.include?( src )
       src_info = @src_infos[ src ]
       src_info[ :wbuff ] << data
       src_info[ :last_recv_at ] = Time.new
@@ -131,23 +228,33 @@ module Girl
         dst = src_info[ :dst ]
 
         if dst then
-          dst_info = @dst_infos[ dst ]
-          puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :domain ] }"
-          dst_info[ :paused ] = true
-          @reads.delete( dst )
+          puts "p#{ Process.pid } #{ Time.new } pause dst #{ src_info[ :destination_domain ] }"
+          add_paused_dst( dst )
         else
           stream = src_info[ :stream ]
 
           if stream then
-            stream_info = @stream_infos[ stream ]
-            puts "p#{ Process.pid } #{ Time.new } pause stream #{ stream_info[ :domain ] }"
-            stream_info[ :paused ] = true
-            @reads.delete( stream )
+            puts "p#{ Process.pid } #{ Time.new } pause stream #{ src_info[ :destination_domain ] }"
+            add_paused_stream( stream )
           end
         end
       end
     end
 
+    ##
+    # add stream wbuff
+    #
+    def add_stream_wbuff( stream, data )
+      stream_info = @stream_infos[ stream ]
+      stream_info[ :wbuff ] << data
+      add_write( stream )
+
+      if stream_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        puts "p#{ Process.pid } #{ Time.new } pause tunnel src #{ stream_info[ :domain ] }"
+        add_paused_src( stream_info[ :src ] )
+      end
+    end
+
     ##
     # add src wbuff socks5 conn reply
     #
@@ -167,7 +274,7 @@ module Girl
     # add write
     #
     def add_write( sock )
-      unless @writes.include?( sock ) then
+      if !sock.closed? && !@writes.include?( sock ) then
         @writes << sock
       end
     end
@@ -182,18 +289,6 @@ module Girl
       @roles.delete( sock )
     end
 
-    ##
-    # close dst
-    #
-    def close_dst( dst )
-      # puts "debug1 close dst"
-      close_sock( dst )
-      dst_info = @dst_infos.delete( dst )
-      src = dst_info[ :src ]
-      close_read_src( src )
-      set_src_closing_write( src )
-    end
-
     ##
     # close read src
     #
@@ -211,7 +306,6 @@ module Girl
         src_info = @src_infos[ src ]
       end
 
-      src_info[ :paused ] = false
       src_info
     end
 
@@ -259,6 +353,7 @@ module Girl
     # close src
     #
     def close_src( src )
+      return if src.closed?
       # puts "debug1 close src"
       close_sock( src )
       src_info = del_src_info( src )
@@ -277,25 +372,14 @@ module Girl
       end
     end
 
-    ##
-    # close stream
-    #
-    def close_stream( stream )
-      # puts "debug1 close stream"
-      close_sock( stream )
-      stream_info = @stream_infos.delete( stream )
-      src = stream_info[ :src ]
-      close_read_src( src )
-      set_src_closing_write( src )
-    end
-
     ##
     # close tun
     #
     def close_tun( tun )
       # puts "debug1 close tun"
       close_sock( tun )
-      @tun_info[ :srcs ].each{ | _, src | set_src_closing( src ) }
+      @tun_info[ :ctlmsgs ].clear
+      @tun_info[ :srcs ].each{ | _, src | close_src( src ) }
     end
 
     ##
@@ -315,7 +399,6 @@ module Girl
         src_info = @src_infos[ src ]
       end
 
-      src_info[ :closed_write ] = true
       src_info
     end
 
@@ -336,7 +419,6 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
-      dst_info[ :closed_write ] = true
       dst_info
     end
 
@@ -357,7 +439,6 @@ module Girl
         stream_info = @stream_infos[ stream ]
       end
 
-      stream_info[ :closed_write ] = true
       stream_info
     end
 
@@ -384,7 +465,7 @@ module Girl
     def del_src_info( src )
       src_info = @src_infos.delete( src )
 
-      if ( src_info[ :proxy_type ] == :tunnel ) && @tun && !@tun.closed? then
+      if ( src_info[ :proxy_type ] == :tunnel ) && @tun then
         @tun_info[ :srcs ].delete( src_info[ :id ] )
       end
 
@@ -400,7 +481,6 @@ module Girl
           sleep CHECK_EXPIRE_INTERVAL
 
           @mutex.synchronize do
-            trigger = false
             now = Time.new
 
             if @tun && !@tun.closed? then
@@ -414,8 +494,6 @@ module Girl
                 data = [ 0, HEARTBEAT ].pack( 'Q>C' )
                 add_ctlmsg( data )
               end
-
-              trigger = true
             end
 
             @src_infos.each do | src, src_info |
@@ -424,12 +502,9 @@ module Girl
 
               if ( now - last_recv_at >= EXPIRE_AFTER ) && ( now - last_sent_at >= EXPIRE_AFTER ) then
                 puts "p#{ Process.pid } #{ Time.new } expire src #{ src_info[ :destination_domain ] }"
-                set_src_closing( src )
-                trigger = true
+                add_closing_src( src )
               end
             end
-
-            next_tick if trigger
           end
         end
       end
@@ -444,56 +519,61 @@ module Girl
           sleep CHECK_RESUME_INTERVAL
 
           @mutex.synchronize do
-            trigger = false
-
-            @src_infos.select{ | _, src_info | src_info[ :paused ] }.each do | src, src_info |
-              dst = src_info[ :dst ]
-
-              if dst then
-                dst_info = @dst_infos[ dst ]
-
-                if dst_info[ :wbuff ].size < RESUME_BELOW then
-                  puts "p#{ Process.pid } #{ Time.new } dst.wbuff below #{ RESUME_BELOW }, resume src #{ src_info[ :destination_domain ] }"
-                  resume_src( src )
-                  trigger = true
-                end
+            @paused_srcs.each do | src |
+              if src.closed? then
+                add_resume_src( src )
               else
-                stream = src_info[ :stream ]
-                stream_info = @stream_infos[ stream ]
-
-                if stream_info[ :wbuff ].size < RESUME_BELOW then
-                  puts "p#{ Process.pid } #{ Time.new } stream.wbuff below #{ RESUME_BELOW }, resume src #{ src_info[ :destination_domain ] }"
-                  resume_src( src )
-                  trigger = true
+                src_info = @src_infos[ src ]
+                dst = src_info[ :dst ]
+
+                if dst 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 )
+                  end
+                else
+                  stream = src_info[ :stream ]
+                  stream_info = @stream_infos[ stream ]
+
+                  if stream_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
 
-            @dst_infos.select{ | _, dst_info | dst_info[ :paused ] }.each do | dst, dst_info |
-              src = dst_info[ :src ]
-              src_info = @src_infos[ src ]
+            @paused_dsts.each do | dst |
+              if dst.closed? then
+                add_resume_dst( dst )
+              else
+                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 } src.wbuff below #{ RESUME_BELOW }, resume dst #{ dst_info[ :domain ] }"
-                dst_info[ :paused ] = false
-                add_read( dst )
-                trigger = true
+                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
 
-            @stream_infos.select{ | _, stream_info | stream_info[ :paused ] }.each do | stream, stream_info |
-              src = stream_info[ :src ]
-              src_info = @src_infos[ src ]
+            @paused_streams.each do | stream |
+              if stream.closed? then
+                add_resume_stream( stream )
+              else
+                stream_info = @stream_infos[ stream ]
+                src = stream_info[ :src ]
+                src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
-                puts "p#{ Process.pid } #{ Time.new } src.wbuff below #{ RESUME_BELOW }, resume stream #{ stream_info[ :domain ] }"
-                stream_info[ :paused ] = false
-                add_read( stream )
-                trigger = true
+                if src_info[ :wbuff ].size < RESUME_BELOW then
+                  puts "p#{ Process.pid } #{ Time.new } resume stream #{ stream_info[ :domain ] }"
+                  add_resume_stream( stream )
+                end
               end
             end
-
-            next_tick if trigger
           end
         end
       end
@@ -513,7 +593,7 @@ module Girl
 
         Thread.new do
           SEND_HELLO_COUNT.times do | i |
-            if @tun.nil? || @tun.closed? || src.closed? || src_info[ :stream ] then
+            if @tun.nil? || @tun.closed? || @tun_info[ :closing ] || src.closed? || src_info[ :stream ] then
               # puts "debug1 break loop send a new source #{ src_info[ :dst_port ] }"
               break
             end
@@ -524,7 +604,6 @@ module Girl
               end
 
               add_ctlmsg( data )
-              next_tick
             end
 
             sleep SEND_HELLO_INTERVAL
@@ -549,21 +628,16 @@ module Girl
         # 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"
-        set_src_closing( src )
+        add_closing_src( src )
         return
       end
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
-      local_port = dst.local_address.ip_port
       dst_info = {
-        local_port: local_port, # 本地端口
-        src: src,               # 对应src
-        domain: domain,         # 目的地
-        wbuff: '',              # 写前，从src读到的流量
-        paused: false,          # 是否已暂停读
-        closing: false,         # 准备关闭
-        closing_write: false,   # 准备关闭写
-        closed_write: false     # 已关闭写
+        src: src,            # 对应src
+        domain: domain,      # 目的地
+        wbuff: '',           # 写前，从src读到的流量
+        closing_write: false # 准备关闭写
       }
 
       @dst_infos[ dst ] = dst_info
@@ -597,7 +671,7 @@ module Girl
 
       if dst_id == 0 then
         puts "p#{ Process.pid } #{ Time.new } remote dst already closed"
-        set_src_closing( src )
+        add_closing_src( src )
         return
       end
 
@@ -625,10 +699,7 @@ module Girl
         src: src,             # 对应src
         domain: domain,       # 目的地
         wbuff: data,          # 写前，写往远端streamd
-        paused: false,        # 是否已暂停读
-        closing: false,       # 准备关闭
-        closing_write: false, # 准备关闭写
-        closed_write: false   # 已关闭写
+        closing_write: false  # 准备关闭写
       }
 
       src_info[ :dst_id ] = dst_id
@@ -692,7 +763,7 @@ module Girl
 
       Thread.new do
         SEND_HELLO_COUNT.times do | i |
-          if @tun.nil? || @tun.closed? || @tun_info[ :tund_addr ] then
+          if @tun.nil? || @tun.closed? || @tun_info[ :closing ] || @tun_info[ :tund_addr ] then
             # puts "debug1 break loop send hello"
             break
           end
@@ -703,7 +774,6 @@ module Girl
             # puts "debug1 #{ data.inspect }"
 
             add_ctlmsg( data, @proxyd_addr )
-            next_tick
           end
 
           sleep SEND_HELLO_INTERVAL
@@ -760,41 +830,15 @@ module Girl
             unless src.closed? then
               puts "p#{ Process.pid } #{ Time.new } resolved #{ domain } #{ ip_info.ip_address }"
               deal_with_destination_ip( src, ip_info )
+              next_tick
             end
           else
-            set_src_closing( src )
+            add_closing_src( src )
           end
-
-          next_tick
         end
       end
     end
 
-    ##
-    # resume src
-    #
-    def resume_src( src )
-      src_info = @src_infos[ src ]
-      src_info[ :paused ] = false
-      add_read( src )
-    end
-
-    ##
-    # set dst closing
-    #
-    def set_dst_closing( dst )
-      return if dst.closed?
-      dst_info = @dst_infos[ dst ]
-
-      if dst_info[ :closed_write ] then
-        close_read_dst( dst )
-      else
-        dst_info[ :closing ] = true
-        @reads.delete( dst )
-        add_write( dst )
-      end
-    end
-
     ##
     # set dst closing write
     #
@@ -802,37 +846,20 @@ module Girl
       return if dst.closed?
 
       dst_info = @dst_infos[ dst ]
-      return if dst_info[ :closed_write ]
+      return if dst_info[ :closing_write ]
 
       dst_info[ :closing_write ] = true
       add_write( dst )
     end
 
-    ##
-    # set src is closing
-    #
-    def set_src_closing( src )
-      return if src.closed?
-
-      src_info = @src_infos[ src ]
-
-      if src_info[ :closed_write ] then
-        close_read_src( src )
-      else
-        @reads.delete( src )
-        src_info[ :closing ] = true
-        add_write( src )
-      end
-    end
-
     ##
     # set src closing write
     #
     def set_src_closing_write( src )
-      return if src.closed?
+      return if src.closed? || @closing_srcs.include?( src )
 
       src_info = @src_infos[ src ]
-      return if src_info[ :closed_write ]
+      return if src_info[ :closing_write ]
 
       src_info[ :closing_write ] = true
       add_write( src )
@@ -842,10 +869,6 @@ module Girl
     # set src proxy type tunnel
     #
     def set_src_proxy_type_tunnel( src )
-      if @tun.nil? || @tun.closed? then
-        new_a_tun
-      end
-
       src_info = @src_infos[ src ]
       src_info[ :proxy_type ] = :tunnel
       src_id = src_info[ :id ]
@@ -865,7 +888,7 @@ module Girl
       return if stream.closed?
 
       stream_info = @stream_infos[ stream ]
-      return if stream_info[ :closed_write ]
+      return if stream_info[ :closing_write ]
 
       stream_info[ :closing_write ] = true
       add_write( stream )
@@ -875,10 +898,11 @@ module Girl
     # set tun is closing
     #
     def set_tun_closing
-      return if @tun.closed?
+      return if @tun.closed? || @tun_info[ :closing ]
       @tun_info[ :closing ] = true
       @reads.delete( @tun )
-      add_write( @tun )
+      @writes.delete( @tun )
+      next_tick
     end
 
     ##
@@ -904,7 +928,43 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read( 1 )
+      dotr.read_nonblock( READ_SIZE )
+
+      if @tun && !@tun.closed? && @tun_info[ :closing ] then
+        close_tun( @tun )
+      end
+
+      if @closing_srcs.any? then
+        @closing_srcs.each{ | src | close_src( src ) }
+        @closing_srcs.clear
+      end
+
+      if @resume_srcs.any? then
+        @resume_srcs.each do | src |
+          add_read( src )
+          @paused_srcs.delete( src )
+        end
+
+        @resume_srcs.clear
+      end
+
+      if @resume_dsts.any? then
+        @resume_dsts.each do | dst |
+          add_read( dst )
+          @paused_dsts.delete( dst )
+        end
+
+        @resume_dsts.clear
+      end
+
+      if @resume_streams.any? then
+        @resume_streams.each do | stream |
+          add_read( stream )
+          @paused_streams.delete( stream )
+        end
+
+        @resume_streams.clear
+      end
     end
 
     ##
@@ -936,19 +996,23 @@ module Girl
         created_at: Time.new,    # 创建时间
         last_recv_at: nil,       # 上一次收到新流量（由dst收到，或者由stream收到）的时间
         last_sent_at: nil,       # 上一次发出流量（由dst发出，或者由stream发出）的时间
-        paused: false,           # 是否已暂停读
-        closing: false,          # 准备关闭
-        closing_write: false,    # 准备关闭写
-        closed_write: false      # 已关闭写
+        closing_write: false     # 准备关闭写
       }
 
       add_read( src, :src )
+
+      # 用到tun，是在解析目的地域名得出是国外ip之后。但解析域名是额外的线程，为避免多线程重复建tun，在accept到src时就建。
+      if @tun.nil? || @tun.closed? then
+        new_a_tun
+      end
     end
 
     ##
     # read tun
     #
     def read_tun( tun )
+      return if tun.closed?
+      
       begin
         data, addrinfo, rflags, *controls = tun.recvmsg_nonblock
       rescue IO::WaitReadable, Errno::EINTR
@@ -1039,7 +1103,7 @@ module Girl
 
           unless domain_port then
             puts "p#{ Process.pid } #{ Time.new } CONNECT miss domain"
-            set_src_closing( src )
+            add_closing_src( src )
             return
           end
         elsif data[ 0 ].unpack( 'C' ).first == 5 then
@@ -1057,7 +1121,7 @@ module Girl
 
           unless methods.include?( 0 ) then
             puts "p#{ Process.pid } #{ Time.new } miss method 00"
-            set_src_closing( src )
+            add_closing_src( src )
             return
           end
 
@@ -1077,7 +1141,7 @@ module Girl
 
           unless host_line then
             # puts "debug1 not found host line"
-            set_src_closing( src )
+            add_closing_src( src )
             return
           end
 
@@ -1089,7 +1153,7 @@ module Girl
 
             unless domain_port then
               puts "p#{ Process.pid } #{ Time.new } Host line miss domain"
-              set_src_closing( src )
+              add_closing_src( src )
               return
             end
           end
@@ -1154,26 +1218,13 @@ module Girl
               data, _ = sub_http_request( data )
             end
 
-            stream_info = @stream_infos[ stream ]
             data = @custom.encode( data )
             # puts "debug2 add stream.wbuff encoded #{ data.bytesize }"
-            stream_info[ :wbuff ] << data
-            add_write( stream )
-
-            if stream_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-              puts "p#{ Process.pid } #{ Time.new } pause tunnel src #{ src_info[ :destination_domain ] }"
-              src_info[ :paused ] = true
-              @reads.delete( src )
-            end
+            add_stream_wbuff( stream, data )
           end
         else
           # puts "debug1 stream not ready, save data to src.rbuff"
-          src_info[ :rbuff ] << data
-
-          if src_info[ :rbuff ].bytesize >= WBUFF_LIMIT then
-            # puts "debug1 tunnel src.rbuff full"
-            set_src_closing( src )
-          end
+          add_src_rbuff( src, data )
         end
       when :direct then
         dst = src_info[ :dst ]
@@ -1184,25 +1235,12 @@ module Girl
               data, _ = sub_http_request( data )
             end
 
-            dst_info = @dst_infos[ dst ]
             # puts "debug2 add dst.wbuff #{ data.bytesize }"
-            dst_info[ :wbuff ] << data
-            add_write( dst )
-
-            if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-              puts "p#{ Process.pid } #{ Time.new } pause direct src #{ src_info[ :destination_domain ] }"
-              src_info[ :paused ] = true
-              @reads.delete( src )
-            end
+            add_dst_wbuff( dst, data )
           end
         else
           # puts "debug1 dst not ready, save data to src.rbuff"
-          src_info[ :rbuff ] << data
-
-          if src_info[ :rbuff ].bytesize >= WBUFF_LIMIT then
-            # puts "debug1 direct src.rbuff full"
-            set_src_closing( src )
-          end
+          add_src_rbuff( src, data )
         end
       end
     end
@@ -1261,13 +1299,7 @@ module Girl
     # write tun
     #
     def write_tun( tun )
-      # 处理关闭
-      if @tun_info[ :closing ] then
-        close_tun( tun )
-        return
-      end
-
-      now = Time.new
+      return if tun.closed?
 
       # 发ctlmsg
       while @tun_info[ :ctlmsgs ].any? do
@@ -1279,8 +1311,8 @@ module Girl
           puts "p#{ Process.pid } #{ Time.new } wait send ctlmsg, left #{ @tun_info[ :ctlmsgs ].size }"
           return
         rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
-          puts "p#{ Process.pid } #{ Time.new } sendmsg #{ e.class }, close tun"
-          close_tun( tun )
+          puts "p#{ Process.pid } #{ Time.new } sendmsg #{ e.class }, set tun closing"
+          set_tun_closing
           return
         end
 
@@ -1297,14 +1329,6 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
       dst = src_info[ :dst ]
-
-      # 处理关闭
-      if src_info[ :closing ] then
-        close_src( src )
-        return
-      end
-
-      # 处理wbuff
       data = src_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -1350,13 +1374,6 @@ module Girl
       return if dst.closed?
       dst_info = @dst_infos[ dst ]
       src = dst_info[ :src ]
-
-      # 处理关闭
-      if dst_info[ :closing ] then
-        close_dst( dst )
-        return
-      end
-
       data = dst_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -1399,13 +1416,6 @@ module Girl
       return if stream.closed?
       stream_info = @stream_infos[ stream ]
       src = stream_info[ :src ]
-
-      # 处理关闭
-      if stream_info[ :closing ] then
-        close_stream( stream )
-        return
-      end
-
       data = stream_info[ :wbuff ]
 
       # 写前为空，处理关闭写