girl 0.95.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995e842429be7063ce5e29248927b336029f2e4dc864e4855979770d18ff7766
-  data.tar.gz: 83b4619a2b8cf5f99058282345478eee57a2b7638cefafa5a15d1d0170abfb96
+  metadata.gz: 0c0254d6f9509721f13f14148087071820ae5ad13a3a7a87884d5372e7d93035
+  data.tar.gz: 2e718e248d7b3967e350a0dd4b6266c2a396a7eb5193a2fcd419222606b9ac19
 SHA512:
-  metadata.gz: 349a7012c29fd90bae97816b1af481d25623f580969f3ec354c0b747c43aea805bba0b02f8ebb8e653427b12fa5af07584fc3566ddb67bd48fd04947b4386fcf
-  data.tar.gz: c078531bb08ed0568e28170336c2a10b8b22896b2138bfdc149d9f61758cae938816ea623f7b4e7bab89e48620c855c731c4c3fdb2485573f2706125e9602b7c
+  metadata.gz: f9546abfd9b420cf80fa128670ba0db60e95bf54ed88466e1309820bb247ced3e7aa552d6afb93db12388a35b3d432d6994dfe2ea9a5f80580c82dce8655ff66
+  data.tar.gz: 7e3b2c573cd03bb284cc5d51a44b0c4aa882f7c069759f63075216759cf5abdab44f80babe5f3dbe81c126a05d9e1449c9e65bab0d34e3a9f184a417e922d326

data/girl.gemspec

@@ -25,8 +25,6 @@ lib/girl/proxy.rb
 lib/girl/proxyd_custom.rb
 lib/girl/proxyd_worker.rb
 lib/girl/proxyd.rb
-lib/girl/udp.rb
-lib/girl/udpd.rb
 lib/girl/version.rb
   ]
 

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,56 @@ module Girl
       if to_addr then
         @tun_info[ :ctlmsgs ] << [ data, to_addr ]
         add_write( @tun )
+        next_tick
       end
     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 paused dst
+    #
+    def add_paused_dst( dst )
+      return if dst.closed? || @paused_dsts.include?( dst )
+      @reads.delete( dst )
+      @paused_dsts << dst
+    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 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 +174,51 @@ module Girl
       end
     end
 
+    ##
+    # add resume dst
+    #
+    def add_resume_dst( dst )
+      return if @resume_dsts.include?( dst )
+      @resume_dsts << dst
+      next_tick
+    end
+
+    ##
+    # add resume src
+    #
+    def add_resume_src( src )
+      return if @resume_srcs.include?( src )
+      @resume_srcs << src
+      next_tick
+    end
+
+    ##
+    # add resume stream
+    #
+    def add_resume_stream( stream )
+      return if @resume_streams.include?( stream )
+      @resume_streams << stream
+      next_tick
+    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,18 +228,14 @@ 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
@@ -164,34 +257,46 @@ module Girl
     end
 
     ##
-    # add write
+    # add stream wbuff
     #
-    def add_write( sock )
-      unless @writes.include?( sock ) then
-        @writes << sock
+    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
 
     ##
-    # close sock
+    # add write
     #
-    def close_sock( sock )
-      sock.close
-      @reads.delete( sock )
-      @writes.delete( sock )
-      @roles.delete( sock )
+    def add_write( sock )
+      if !sock.closed? && !@writes.include?( sock ) then
+        @writes << sock
+      end
     end
 
     ##
-    # close dst
+    # close read 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 )
+    def close_read_dst( dst )
+      return if dst.closed?
+      # puts "debug1 close read dst"
+      dst.close_read
+      @reads.delete( dst )
+
+      if dst.closed? then
+        # puts "debug1 delete dst info"
+        @roles.delete( dst )
+        dst_info = @dst_infos.delete( dst )
+      else
+        dst_info = @dst_infos[ dst ]
+      end
+
+      dst_info
     end
 
     ##
@@ -211,30 +316,9 @@ module Girl
         src_info = @src_infos[ src ]
       end
 
-      src_info[ :paused ] = false
       src_info
     end
 
-    ##
-    # close read dst
-    #
-    def close_read_dst( dst )
-      return if dst.closed?
-      # puts "debug1 close read dst"
-      dst.close_read
-      @reads.delete( dst )
-
-      if dst.closed? then
-        # puts "debug1 delete dst info"
-        @roles.delete( dst )
-        dst_info = @dst_infos.delete( dst )
-      else
-        dst_info = @dst_infos[ dst ]
-      end
-
-      dst_info
-    end
-
     ##
     # close read stream
     #
@@ -255,68 +339,47 @@ module Girl
       stream_info
     end
 
+    ##
+    # close sock
+    #
+    def close_sock( sock )
+      sock.close
+      @reads.delete( sock )
+      @writes.delete( sock )
+      @roles.delete( sock )
+    end
+
     ##
     # close src
     #
     def close_src( src )
+      return if src.closed?
       # puts "debug1 close src"
       close_sock( src )
       src_info = del_src_info( src )
       dst = src_info[ :dst ]
 
       if dst then
-        close_read_dst( dst )
-        set_dst_closing_write( dst )
+        close_sock( dst )
+        @dst_infos.delete( dst )
       else
         stream = src_info[ :stream ]
 
         if stream then
-          close_read_stream( stream )
-          set_stream_closing_write( stream )
+          close_sock( stream )
+          @stream_infos.delete( stream )
         end
       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 ) }
-    end
-
-    ##
-    # close write src
-    #
-    def close_write_src( src )
-      return if src.closed?
-      # puts "debug1 close write src"
-      src.close_write
-      @writes.delete( src )
-
-      if src.closed? then
-        # puts "debug1 delete src info"
-        @roles.delete( src )
-        src_info = del_src_info( src )
-      else
-        src_info = @src_infos[ src ]
-      end
-
-      src_info[ :closed_write ] = true
-      src_info
+      @tun_info[ :ctlmsgs ].clear
+      @tun_info[ :srcs ].each{ | _, src | close_src( src ) }
     end
 
     ##
@@ -336,10 +399,29 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
-      dst_info[ :closed_write ] = true
       dst_info
     end
 
+    ##
+    # close write src
+    #
+    def close_write_src( src )
+      return if src.closed?
+      # puts "debug1 close write src"
+      src.close_write
+      @writes.delete( src )
+
+      if src.closed? then
+        # puts "debug1 delete src info"
+        @roles.delete( src )
+        src_info = del_src_info( src )
+      else
+        src_info = @src_infos[ src ]
+      end
+
+      src_info
+    end
+
     ##
     # close write stream
     #
@@ -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,17 @@ 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 )
+        dst.close
+        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
@@ -585,6 +660,25 @@ module Girl
       end
     end
 
+    ##
+    # new a proxy
+    #
+    def new_a_proxy( proxy_port )
+      proxy = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+
+      if RUBY_PLATFORM.include?( 'linux' ) then
+        proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      end
+
+      proxy.bind( Socket.sockaddr_in( proxy_port, '0.0.0.0' ) )
+      proxy.listen( 127 )
+      puts "p#{ Process.pid } #{ Time.new } proxy listen on #{ proxy_port }"
+      add_read( proxy, :proxy )
+      @proxy_local_address = proxy.local_address
+    end
+
     ##
     # new a stream
     #
@@ -597,7 +691,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
 
@@ -609,6 +703,7 @@ module Girl
       rescue IO::WaitWritable
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } connect tcpd #{ e.class }"
+        stream.close
         return
       end
 
@@ -625,10 +720,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
@@ -646,25 +738,6 @@ module Girl
       end
     end
 
-    ##
-    # new a proxy
-    #
-    def new_a_proxy( proxy_port )
-      proxy = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-
-      if RUBY_PLATFORM.include?( 'linux' ) then
-        proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-        proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      end
-
-      proxy.bind( Socket.sockaddr_in( proxy_port, '0.0.0.0' ) )
-      proxy.listen( 127 )
-      puts "p#{ Process.pid } #{ Time.new } proxy listen on #{ proxy_port }"
-      add_read( proxy, :proxy )
-      @proxy_local_address = proxy.local_address
-    end
-
     ##
     # new a tun
     #
@@ -692,7 +765,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 +776,6 @@ module Girl
             # puts "debug1 #{ data.inspect }"
 
             add_ctlmsg( data, @proxyd_addr )
-            next_tick
           end
 
           sleep SEND_HELLO_INTERVAL
@@ -723,7 +795,7 @@ module Girl
     #
     def resolve_domain( src, domain )
       if @remotes.any? { | remote | ( domain.size >= remote.size ) && ( domain[ ( remote.size * -1 )..-1 ] == remote ) } then
-        # puts "debug1 #{ domain } hit remotes"
+        puts "p#{ Process.pid } #{ Time.new } #{ domain } hit remotes"
         set_src_proxy_type_tunnel( src )
         return
       end
@@ -760,41 +832,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 ]
-      dst_info[ :closing ] = true
-
-      if dst_info[ :closed_write ] then
-        add_read( dst )
-      else
-        @reads.delete( dst )
-        add_write( dst )
-      end
-    end
-
     ##
     # set dst closing write
     #
@@ -802,36 +848,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 ]
-      src_info[ :closing ] = true
-
-      if src_info[ :closed_write ] then
-        add_read( src )
-      else
-        @reads.delete( src )
-        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 )
@@ -841,10 +871,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 ]
@@ -864,7 +890,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 )
@@ -874,10 +900,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
 
     ##
@@ -903,7 +930,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
 
     ##
@@ -935,19 +998,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
@@ -1028,13 +1095,6 @@ module Girl
       end
 
       src_info = @src_infos[ src ]
-
-      # 处理关闭
-      if src_info[ :closing ] then
-        close_src( src )
-        return
-      end
-
       proxy_type = src_info[ :proxy_type ]
 
       case proxy_type
@@ -1045,7 +1105,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
@@ -1063,7 +1123,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
 
@@ -1083,7 +1143,7 @@ module Girl
 
           unless host_line then
             # puts "debug1 not found host line"
-            set_src_closing( src )
+            add_closing_src( src )
             return
           end
 
@@ -1095,7 +1155,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
@@ -1160,26 +1220,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 ]
@@ -1190,25 +1237,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
@@ -1233,13 +1267,6 @@ module Girl
       end
 
       dst_info = @dst_infos[ dst ]
-
-      # 处理关闭
-      if dst_info[ :closing ] then
-        close_dst( dst )
-        return
-      end
-
       src = dst_info[ :src ]
       add_src_wbuff( src, data )
     end
@@ -1274,13 +1301,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
@@ -1292,8 +1313,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
 
@@ -1310,14 +1331,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 ]
 
       # 写前为空，处理关闭写
@@ -1363,13 +1376,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 ]
 
       # 写前为空，处理关闭写
@@ -1412,13 +1418,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 ]
 
       # 写前为空，处理关闭写