girl 0.94.0 → 0.99.0

data/lib/girl/proxyd_worker.rb

@@ -9,6 +9,13 @@ module Girl
       @mutex = Mutex.new
       @reads = []
       @writes = []
+      @closing_tunds = []
+      @closing_dsts = []
+      @closing_streamds = []
+      @paused_dsts = []
+      @paused_streamds = []
+      @resume_dsts = []
+      @resume_streamds = []
       @roles = {}           # sock => :dotr / :proxyd / :infod / :dst / :tund / :tcpd / :streamd
       @tund_infos = {}      # tund => {}
       @tcpd_infos = {}      # tcpd => {}
@@ -39,7 +46,6 @@ module Girl
         rs, ws = IO.select( @reads, @writes )
 
         @mutex.synchronize do
-          # 先读，再写，避免打上关闭标记后读到
           rs.each do | sock |
             case @roles[ sock ]
             when :dotr then
@@ -98,12 +104,30 @@ module Girl
     private
 
     ##
-    # add proxyd ctlmsg
+    # add closing dst
     #
-    def add_proxyd_ctlmsg_tund_port( tund_info )
-      data = [ 0, TUND_PORT, tund_info[ :port ], tund_info[ :tcpd_port ] ].pack( 'Q>Cnn' )
-      @proxyd_info[ :ctlmsgs ] << [ data, tund_info[ :tun_addr ] ]
-      add_write( @proxyd )
+    def add_closing_dst( dst )
+      return if dst.closed? || @closing_dsts.include?( dst )
+      @closing_dsts << dst
+      next_tick
+    end
+
+    ##
+    # add closing streamd
+    #
+    def add_closing_streamd( streamd )
+      return if streamd.closed? || @closing_streamds.include?( streamd )
+      @closing_streamds << streamd
+      next_tick
+    end
+
+    ##
+    # add closing tund
+    #
+    def add_closing_tund( tund )
+      return if tund.closed? || @closing_tunds.include?( tund )
+      @closing_tunds << tund
+      next_tick
     end
 
     ##
@@ -115,11 +139,68 @@ module Girl
       add_write( tund )
     end
 
+    ##
+    # add dst rbuff
+    #
+    def add_dst_rbuff( dst, data )
+      dst_info = @dst_infos[ dst ]
+      dst_info[ :rbuff ] << data
+
+      if dst_info[ :rbuff ].bytesize >= WBUFF_LIMIT then
+        # puts "debug1 dst.rbuff full"
+        add_closing_dst( dst )
+      end
+    end
+
+    ##
+    # add dst wbuff
+    #
+    def add_dst_wbuff( dst, data )
+      return if dst.closed? || @closing_dsts.include?( dst )
+
+      dst_info = @dst_infos[ dst ]
+      dst_info[ :wbuff ] << data
+      dst_info[ :last_recv_at ] = Time.new
+      add_write( dst )
+
+      if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        puts "p#{ Process.pid } #{ Time.new } pause streamd #{ dst_info[ :domain_port ] }"
+        add_paused_streamd( dst_info[ :streamd ] )
+      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 streamd
+    #
+    def add_paused_streamd( streamd )
+      return if streamd.closed? || @paused_streamds.include?( streamd )
+      @reads.delete( streamd )
+      @paused_streamds << streamd
+    end
+
+    ##
+    # add proxyd ctlmsg
+    #
+    def add_proxyd_ctlmsg_tund_port( tund_info )
+      data = [ 0, TUND_PORT, tund_info[ :port ], tund_info[ :tcpd_port ] ].pack( 'Q>Cnn' )
+      @proxyd_info[ :ctlmsgs ] << [ data, tund_info[ :tun_addr ] ]
+      add_write( @proxyd )
+    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
@@ -128,11 +209,44 @@ 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 streamd
+    #
+    def add_resume_streamd( streamd )
+      return if @resume_streamds.include?( streamd )
+      @resume_streamds << streamd
+      next_tick
+    end
+
+    ##
+    # add streamd wbuff
+    #
+    def add_streamd_wbuff( streamd, data )
+      return if streamd.closed? || @closing_streamds.include?( streamd )
+      streamd_info = @streamd_infos[ streamd ]
+      streamd_info[ :wbuff ] << data
+      add_write( streamd )
+
+      if streamd_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        puts "p#{ Process.pid } #{ Time.new } pause dst #{ streamd_info[ :domain_port ] }"
+        add_paused_dst( streamd_info[ :dst ] )
+      end
+    end
+
     ##
     # add write
     #
     def add_write( sock )
-      unless @writes.include?( sock ) then
+      if !sock.closed? && !@writes.include?( sock ) then
         @writes << sock
       end
     end
@@ -141,6 +255,7 @@ module Girl
     # close dst
     #
     def close_dst( dst )
+      return if dst.closed?
       # puts "debug1 close dst"
       close_sock( dst )
       dst_info = del_dst_info( dst )
@@ -169,7 +284,6 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
-      dst_info[ :paused ] = false
       dst_info
     end
 
@@ -207,11 +321,12 @@ module Girl
     # close streamd
     #
     def close_streamd( streamd )
+      return if streamd.closed?
       # puts "debug1 close streamd"
       close_sock( streamd )
       streamd_info = @streamd_infos.delete( streamd )
       dst = streamd_info[ :dst ]
-      
+
       if dst then
         close_read_dst( dst )
         set_dst_closing_write( dst )
@@ -228,8 +343,8 @@ module Girl
       tcpd = tund_info[ :tcpd ]
       close_sock( tcpd )
       @tcpd_infos.delete( tcpd )
-      tund_info[ :dsts ].each{ | _, dst | set_dst_closing( dst ) }
       @tunneling_tunds.delete( tund_info[ :tun_addr ] )
+      tund_info[ :dsts ].each{ | _, dst | close_dst( dst ) }
     end
 
     ##
@@ -249,7 +364,6 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
-      dst_info[ :closed_write ] = true
       dst_info
     end
 
@@ -270,7 +384,6 @@ module Girl
         streamd_info = @streamd_infos[ streamd ]
       end
 
-      streamd_info[ :closed_write ] = true
       streamd_info
     end
 
@@ -304,10 +417,7 @@ module Girl
         created_at: Time.new,     # 创建时间
         last_recv_at: nil,        # 上一次收到新流量（由streamd收到）的时间
         last_sent_at: nil,        # 上一次发出流量（由streamd发出）的时间
-        paused: false,            # 是否已暂停读
-        closing: false,           # 准备关闭
-        closing_write: false,     # 准备关闭写
-        closed_write: false       # 已关闭写
+        closing_write: false      # 准备关闭写
       }
 
       add_read( dst, :dst )
@@ -327,13 +437,13 @@ module Girl
     def del_dst_info( dst )
       dst_info = @dst_infos.delete( dst )
       tund = dst_info[ :tund ]
+      tund_info = @tund_infos[ tund ]
 
-      unless tund.closed? then
-        tund_info = @tund_infos[ tund ]
+      if tund_info then
         tund_info[ :dsts ].delete( dst_info[ :id ] )
         tund_info[ :dst_ids ].delete( dst_info[ :src_id ] )
       end
-
+      
       dst_info
     end
 
@@ -346,7 +456,6 @@ module Girl
           sleep CHECK_EXPIRE_INTERVAL
 
           @mutex.synchronize do
-            trigger = false
             now = Time.new
 
             @tund_infos.each do | tund, tund_info |
@@ -354,8 +463,7 @@ module Girl
 
               if tund_info[ :dsts ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) then
                 puts "p#{ Process.pid } #{ Time.new } expire tund #{ tund_info[ :port ] }"
-                set_tund_closing( tund )
-                trigger = true
+                add_closing_tund( tund )
               end
             end
 
@@ -365,12 +473,9 @@ module Girl
 
               if ( now - last_recv_at >= EXPIRE_AFTER ) && ( now - last_sent_at >= EXPIRE_AFTER ) then
                 puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain_port ] }"
-                set_dst_closing( dst )
-                trigger = true
+                add_closing_dst( dst )
               end
             end
-
-            next_tick if trigger
           end
         end
       end
@@ -385,33 +490,35 @@ module Girl
           sleep CHECK_RESUME_INTERVAL
 
           @mutex.synchronize do
-            trigger = false
-
-            @dst_infos.select{ | _, dst_info | dst_info[ :paused ] }.each do | dst, dst_info |
-              streamd = dst_info[ :streamd ]
-              streamd_info = @streamd_infos[ streamd ]
-
-              if streamd_info[ :wbuff ].size < RESUME_BELOW then
-                puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain_port ] }"
-                dst_info[ :paused ] = false
-                add_read( dst )
-                trigger = true
+            @paused_dsts.each do | dst |
+              if dst.closed? then
+                add_resume_dst( dst )
+              else
+                dst_info = @dst_infos[ dst ]
+                streamd = dst_info[ :streamd ]
+                streamd_info = @streamd_infos[ streamd ]
+
+                if streamd_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
 
-            @streamd_infos.select{ | _, streamd_info | streamd_info[ :paused ] }.each do | streamd, streamd_info |
-              dst = streamd_info[ :dst ]
-              dst_info = @dst_infos[ dst ]
-
-              if dst_info[ :wbuff ].size < RESUME_BELOW then
-                puts "p#{ Process.pid } #{ Time.new } resume streamd #{ streamd_info[ :domain_port ] }"
-                streamd_info[ :paused ] = false
-                add_read( streamd )
-                trigger = true
+            @paused_streamds.each do | streamd |
+              if streamd.closed? then
+                add_resume_streamd( streamd )
+              else
+                streamd_info = @streamd_infos[ streamd ]
+                dst = streamd_info[ :dst ]
+                dst_info = @dst_infos[ dst ]
+
+                if dst_info[ :wbuff ].size < RESUME_BELOW then
+                  puts "p#{ Process.pid } #{ Time.new } resume streamd #{ streamd_info[ :domain_port ] }"
+                  add_resume_streamd( streamd )
+                end
               end
             end
-
-            next_tick if trigger
           end
         end
       end
@@ -538,81 +645,83 @@ module Girl
       written
     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
     #
     def set_dst_closing_write( dst )
-      return if dst.closed?
+      return if dst.closed? || @closing_dsts.include?( dst )
 
       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 streamd closing
-    #
-    def set_streamd_closing( streamd )
-      return if streamd.closed?
-      streamd_info = @streamd_infos[ streamd ]
-
-      if streamd_info[ :closed_write ] then
-        close_read_streamd( streamd )
-      else
-        streamd_info[ :closing ] = true
-        @reads.delete( streamd )
-        add_write( streamd )
-      end
-    end
-
     ##
     # set streamd closing write
     #
     def set_streamd_closing_write( streamd )
-      return if streamd.closed?
+      return if streamd.closed? || @closing_streamds.include?( streamd )
 
       streamd_info = @streamd_infos[ streamd ]
-      return if streamd_info[ :closed_write ]
+      return if streamd_info[ :closing_write ]
 
       streamd_info[ :closing_write ] = true
       add_write( streamd )
     end
 
-    ##
-    # set tund is closing
-    #
-    def set_tund_closing( tund )
-      return if tund.closed?
-      tund_info = @tund_infos[ tund ]
-      tund_info[ :closing ] = true
-      @reads.delete( tund )
-      add_write( tund )
-    end
-
     ##
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read( 1 )
+      dotr.read_nonblock( READ_SIZE )
+
+      # 处理关闭
+      if @closing_tunds.any? then
+        @closing_tunds.each do | tund |
+          unless tund.closed? then
+            tund_info = @tund_infos[ tund ]
+
+            if tund_info[ :changed_tun_addr ] then
+              data = [ 0, IP_CHANGED ].pack( 'Q>C' )
+              send_data( tund, data, tund_info[ :changed_tun_addr ] )
+            end
+
+            close_tund( tund )
+          end
+        end
+
+        @closing_tunds.clear
+      end
+
+      if @closing_dsts.any? then
+        @closing_dsts.each{ | dst | close_dst( dst ) }
+        @closing_dsts.clear
+      end
+
+      if @closing_streamds.any? then
+        @closing_streamds.each{ | streamd | close_streamd( streamd ) }
+        @closing_streamds.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_streamds.any? then
+        @resume_streamds.each do | streamd |
+          add_read( streamd )
+          @paused_streamds.delete( streamd )
+        end
+
+        @resume_streamds.clear
+      end
     end
 
     ##
@@ -667,7 +776,6 @@ module Girl
         dst_ids: {},          # src_id => dst_id
         created_at: Time.new, # 创建时间
         last_recv_at: nil,    # 上一次收到流量的时间
-        closing: false,       # 准备关闭
         changed_tun_addr: nil # 记录到和tun addr不符的来源地址
       }
 
@@ -707,6 +815,8 @@ module Girl
     # read tund
     #
     def read_tund( tund )
+      return if tund.closed?
+
       begin
         data, addrinfo, rflags, *controls = tund.recvmsg_nonblock
       rescue IO::WaitReadable, Errno::EINTR
@@ -721,7 +831,7 @@ module Girl
         # 通常是光猫刷新ip和端口，但万一不是，为了避免脏数据注入，关闭tund
         puts "p#{ Process.pid } #{ Time.new } from #{ addrinfo.inspect } not match tun addr #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
         tund_info[ :changed_tun_addr ] = from_addr
-        set_tund_closing( tund )
+        add_closing_tund( tund )
         return
       end
 
@@ -756,7 +866,7 @@ module Girl
         resolve_domain( tund, src_id, domain_port )
       when TUN_FIN then
         puts "p#{ Process.pid } #{ Time.new } recv tun fin"
-        set_tund_closing( tund )
+        add_closing_tund( tund )
       end
     end
 
@@ -764,6 +874,8 @@ module Girl
     # read tcpd
     #
     def read_tcpd( tcpd )
+      return if tcpd.closed?
+
       begin
         streamd, addrinfo = tcpd.accept_nonblock
       rescue IO::WaitReadable, Errno::EINTR
@@ -782,10 +894,7 @@ module Girl
         dst: nil,             # 对应dst
         domain_port: nil,     # dst的目的地和端口
         wbuff: '',            # 写前，写往近端stream
-        paused: false,        # 是否已暂停读
-        closing: false,       # 准备关闭
-        closing_write: false, # 准备关闭写
-        closed_write: false   # 已关闭写
+        closing_write: false  # 准备关闭写
       }
 
       add_read( streamd, :streamd )
@@ -819,22 +928,10 @@ module Girl
           streamd_info = @streamd_infos[ streamd ]
           data = @custom.encode( data )
           # puts "debug2 add streamd.wbuff encoded #{ data.bytesize }"
-          streamd_info[ :wbuff ] << data
-          add_write( streamd )
-
-          if streamd_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-            puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :domain_port ] }"
-            dst_info[ :paused ] = true
-            @reads.delete( dst )
-          end
+          add_streamd_wbuff( streamd, data )
         end
       else
-        dst_info[ :rbuff ] << data
-
-        if dst_info[ :rbuff ].bytesize >= WBUFF_LIMIT then
-          # puts "debug1 dst.rbuff full"
-          set_dst_closing( dst )
-        end
+        add_dst_rbuff( dst, data )
       end
     end
 
@@ -866,7 +963,7 @@ module Girl
         tund = streamd_info[ :tund ]
 
         if tund.closed? then
-          set_streamd_closing( streamd )
+          add_closing_streamd( streamd )
           return
         end
 
@@ -874,7 +971,7 @@ module Girl
         dst = tund_info[ :dsts ][ dst_id ]
 
         unless dst then
-          set_streamd_closing( streamd )
+          add_closing_streamd( streamd )
           return
         end
 
@@ -885,7 +982,8 @@ module Girl
 
         unless dst_info[ :rbuff ].empty? then
           # puts "debug1 encode and move dst.rbuff to streamd.wbuff"
-          streamd_info[ :wbuff ] << @custom.encode( dst_info[ :rbuff ] )
+          data2 = @custom.encode( dst_info[ :rbuff ] )
+          add_streamd_wbuff( streamd, data2 )
         end
 
         dst_info[ :streamd ] = streamd
@@ -894,20 +992,9 @@ module Girl
         return if data.empty?
       end
 
-      unless dst.closed? then
-        dst_info = @dst_infos[ dst ]
-        data = @custom.decode( data )
-        # puts "debug2 add dst.wbuff decoded #{ data.bytesize }"
-        dst_info[ :wbuff ] << data
-        dst_info[ :last_recv_at ] = Time.new
-        add_write( dst )
-
-        if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-          puts "p#{ Process.pid } #{ Time.new } pause streamd #{ streamd_info[ :domain_port ] }"
-          streamd_info[ :paused ] = true
-          @reads.delete( streamd )
-        end
-      end
+      data = @custom.decode( data )
+      # puts "debug2 add dst.wbuff decoded #{ data.bytesize }"
+      add_dst_wbuff( dst, data )
     end
 
     ##
@@ -934,21 +1021,9 @@ module Girl
     # write tund
     #
     def write_tund( tund )
+      return if tund.closed?
       tund_info = @tund_infos[ tund ]
 
-      # 处理关闭
-      if tund_info[ :closing ] then
-        if tund_info[ :changed_tun_addr ] then
-          data = [ 0, IP_CHANGED ].pack( 'Q>C' )
-          send_data( tund, data, tund_info[ :changed_tun_addr ] )
-        end
-
-        close_tund( tund )
-        return
-      end
-
-      now = Time.new
-
       # 发ctlmsg
       while tund_info[ :ctlmsgs ].any? do
         data = tund_info[ :ctlmsgs ].first
@@ -975,13 +1050,6 @@ module Girl
       return if dst.closed?
       dst_info = @dst_infos[ dst ]
       streamd = dst_info[ :streamd ]
-
-      # 处理关闭
-      if dst_info[ :closing ] then
-        close_dst( dst )
-        return
-      end
-
       data = dst_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -1021,13 +1089,6 @@ module Girl
       return if streamd.closed?
       streamd_info = @streamd_infos[ streamd ]
       dst = streamd_info[ :dst ]
-
-      # 处理关闭
-      if streamd_info[ :closing ] then
-        close_streamd( streamd )
-        return
-      end
-
       data = streamd_info[ :wbuff ]
 
       # 写前为空，处理关闭写