girl 0.97.0 → 0.98.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1488058f7502fb83ee815a38ba4b11276a2bd5732bfadf596f5f42fbbb6bae53
-  data.tar.gz: 1ac6377572a1ff976f4626127e78f76e7c949683b035c2df7426acac70b3ac86
+  metadata.gz: a0201dd1519345fc7a831c89a0a8ab139d2fa96d66da2545fcfd1de9102bbe23
+  data.tar.gz: e529faf1d41f6d80074eed26519c0fef85a092058dc74a936e17c067ce3a6f1b
 SHA512:
-  metadata.gz: 27bc728548949021b2f477ede35b85ff3888ba3371824d32458a390fe9040a10ac0fd11483f25426cda27b95784a2f71b3837fed6b264583ced0378ef6c1b2ee
-  data.tar.gz: d07a0a982e4ecbaf4c798163027bbdd68c7cd3510280e5f904a079aa6796aa57f5b0c96067c86ee71630409e92eb923050b132974496bfdbfed71154e61e2a60
+  metadata.gz: eec9fbcfa84d537bf1c9a301f2974ac5d2b3b3a0b6a4614d071b39c329faf8800e168afa618851a083a3bfc1df0770bb8da7252457394b6f3a1b02778fdae293
+  data.tar.gz: 37dc3789f90c73e6116a15cce0b37b1532f6c2b250996e8db0b0b1ad21ffb8d9a7909b6d06218c20574026f3730b134a0383dc348cad12c5ff56fe5897df420a

data/lib/girl/proxy_worker.rb

@@ -13,6 +13,7 @@ module Girl
       @mutex = Mutex.new
       @reads = []
       @writes = []
+      @closing_srcs = []
       @roles = {}         # sock => :dotr / :proxy / :src / :dst / :tun / :stream
       @src_infos = {}     # src => {}
       @dst_infos = {}     # dst => {}
@@ -120,7 +121,7 @@ module Girl
     # 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
@@ -166,7 +167,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
@@ -294,7 +295,6 @@ module Girl
     def close_tun( tun )
       # puts "debug1 close tun"
       close_sock( tun )
-      @tun_info[ :srcs ].each{ | _, src | set_src_closing( src ) }
     end
 
     ##
@@ -314,7 +314,6 @@ module Girl
         src_info = @src_infos[ src ]
       end
 
-      src_info[ :closed_write ] = true
       src_info
     end
 
@@ -335,7 +334,6 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
-      dst_info[ :closed_write ] = true
       dst_info
     end
 
@@ -356,7 +354,6 @@ module Girl
         stream_info = @stream_infos[ stream ]
       end
 
-      stream_info[ :closed_write ] = true
       stream_info
     end
 
@@ -402,7 +399,7 @@ module Girl
             trigger = false
             now = Time.new
 
-            if @tun && !@tun.closed? then
+            if @tun && !@tun.closed? && !@tun_info[ :closing ] then
               last_recv_at = @tun_info[ :last_recv_at ] || @tun_info[ :created_at ]
 
               if @tun_info[ :srcs ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) then
@@ -512,7 +509,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
@@ -554,13 +551,11 @@ module Girl
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
       dst_info = {
-        src: src,               # 对应src
-        domain: domain,         # 目的地
-        wbuff: '',              # 写前，从src读到的流量
-        paused: false,          # 是否已暂停读
-        closing: false,         # 准备关闭
-        closing_write: false,   # 准备关闭写
-        closed_write: false     # 已关闭写
+        src: src,            # 对应src
+        domain: domain,      # 目的地
+        wbuff: '',           # 写前，从src读到的流量
+        paused: false,       # 是否已暂停读
+        closing_write: false # 准备关闭写
       }
 
       @dst_infos[ dst ] = dst_info
@@ -623,9 +618,7 @@ module Girl
         domain: domain,       # 目的地
         wbuff: data,          # 写前，写往远端streamd
         paused: false,        # 是否已暂停读
-        closing: false,       # 准备关闭
-        closing_write: false, # 准备关闭写
-        closed_write: false   # 已关闭写
+        closing_write: false  # 准备关闭写
       }
 
       src_info[ :dst_id ] = dst_id
@@ -689,7 +682,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
@@ -776,22 +769,6 @@ module Girl
       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_dst( dst )
-      else
-        dst_info[ :closing ] = true
-        @reads.delete( dst )
-        add_write( dst )
-      end
-    end
-
     ##
     # set dst closing write
     #
@@ -799,7 +776,7 @@ 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 )
@@ -809,26 +786,21 @@ module Girl
     # 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_src( src )
-      else
-        src_info[ :closing ] = true
-        @reads.delete( src )
-        add_write( src )
-      end
+      return if src.closed? || @closing_srcs.include?( src )
+      @reads.delete( src )
+      @writes.delete( src )
+      @closing_srcs << src
+      add_write( @tun ) if @tun
     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 )
@@ -857,7 +829,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 )
@@ -867,10 +839,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 )
+      @tun_info[ :srcs ].each{ | _, src | set_src_closing( src ) }
     end
 
     ##
@@ -929,9 +902,7 @@ module Girl
         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 )
@@ -1258,6 +1229,11 @@ module Girl
     #
     def write_tun( tun )
       # 处理关闭
+      if @closing_srcs.any? then
+        @closing_srcs.each{ | src | close_src( src ) }
+        @closing_srcs.clear
+      end
+
       if @tun_info[ :closing ] then
         close_tun( tun )
         return
@@ -1293,14 +1269,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 ]
 
       # 写前为空，处理关闭写
@@ -1346,13 +1314,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 ]
 
       # 写前为空，处理关闭写
@@ -1395,13 +1356,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 ]
 
       # 写前为空，处理关闭写

data/lib/girl/proxyd_worker.rb

@@ -9,6 +9,8 @@ module Girl
       @mutex = Mutex.new
       @reads = []
       @writes = []
+      @closing_dsts = []
+      @closing_streamds = []
       @roles = {}           # sock => :dotr / :proxyd / :infod / :dst / :tund / :tcpd / :streamd
       @tund_infos = {}      # tund => {}
       @tcpd_infos = {}      # tcpd => {}
@@ -131,7 +133,7 @@ module Girl
     # add streamd wbuff
     #
     def add_streamd_wbuff( streamd, data )
-      return if streamd.closed?
+      return if streamd.closed? || @closing_streamds.include?( streamd )
       streamd_info = @streamd_infos[ streamd ]
       streamd_info[ :wbuff ] << data
       add_write( streamd )
@@ -152,7 +154,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
@@ -248,7 +250,6 @@ 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 ] )
     end
 
@@ -269,7 +270,6 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
-      dst_info[ :closed_write ] = true
       dst_info
     end
 
@@ -290,7 +290,6 @@ module Girl
         streamd_info = @streamd_infos[ streamd ]
       end
 
-      streamd_info[ :closed_write ] = true
       streamd_info
     end
 
@@ -325,9 +324,7 @@ module Girl
         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 )
@@ -370,12 +367,14 @@ module Girl
             now = Time.new
 
             @tund_infos.each do | tund, tund_info |
-              last_recv_at = tund_info[ :last_recv_at ] || tund_info[ :created_at ]
-
-              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
+              unless tund_info[ :closing ] then
+                last_recv_at = tund_info[ :last_recv_at ] || tund_info[ :created_at ]
+
+                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
+                end
               end
             end
 
@@ -562,26 +561,22 @@ module Girl
     # set dst closing
     #
     def set_dst_closing( dst )
-      return if dst.closed?
+      return if dst.closed? || @closing_dsts.include?( dst )
+      @reads.delete( dst )
+      @writes.delete( dst )
+      @closing_dsts << dst
       dst_info = @dst_infos[ dst ]
-
-      if dst_info[ :closed_write ] then
-        close_dst( dst )
-      else
-        dst_info[ :closing ] = true
-        @reads.delete( dst )
-        add_write( dst )
-      end
+      add_write( dst_info[ :tund ] )
     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 )
@@ -591,26 +586,22 @@ module Girl
     # set streamd closing
     #
     def set_streamd_closing( streamd )
-      return if streamd.closed?
+      return if streamd.closed? || @closing_streamds.include?( streamd )
+      @reads.delete( streamd )
+      @writes.delete( streamd )
+      @closing_streamds << streamd
       streamd_info = @streamd_infos[ streamd ]
-
-      if streamd_info[ :closed_write ] then
-        close_streamd( streamd )
-      else
-        streamd_info[ :closing ] = true
-        @reads.delete( streamd )
-        add_write( streamd )
-      end
+      add_write( streamd_info[ :tund ] )
     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 )
@@ -621,10 +612,14 @@ module Girl
     #
     def set_tund_closing( tund )
       return if tund.closed?
+
       tund_info = @tund_infos[ tund ]
+      return if tund_info[ :closing ]
+
       tund_info[ :closing ] = true
       @reads.delete( tund )
       add_write( tund )
+      tund_info[ :dsts ].each{ | _, dst | set_dst_closing( dst ) }
     end
 
     ##
@@ -783,6 +778,8 @@ module Girl
     # read tcpd
     #
     def read_tcpd( tcpd )
+      return if tcpd.closed?
+
       begin
         streamd, addrinfo = tcpd.accept_nonblock
       rescue IO::WaitReadable, Errno::EINTR
@@ -802,9 +799,7 @@ module Girl
         domain_port: nil,     # dst的目的地和端口
         wbuff: '',            # 写前，写往近端stream
         paused: false,        # 是否已暂停读
-        closing: false,       # 准备关闭
-        closing_write: false, # 准备关闭写
-        closed_write: false   # 已关闭写
+        closing_write: false  # 准备关闭写
       }
 
       add_read( streamd, :streamd )
@@ -907,7 +902,7 @@ module Girl
         return if data.empty?
       end
 
-      unless dst.closed? then
+      if !dst.closed? && !@closing_dsts.include?( dst ) then
         dst_info = @dst_infos[ dst ]
         data = @custom.decode( data )
         # puts "debug2 add dst.wbuff decoded #{ data.bytesize }"
@@ -950,6 +945,16 @@ module Girl
       tund_info = @tund_infos[ tund ]
 
       # 处理关闭
+      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 tund_info[ :closing ] then
         if tund_info[ :changed_tun_addr ] then
           data = [ 0, IP_CHANGED ].pack( 'Q>C' )
@@ -988,13 +993,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 ]
 
       # 写前为空，处理关闭写
@@ -1034,13 +1032,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 ]
 
       # 写前为空，处理关闭写

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.97.0'.freeze
+  VERSION = '0.98.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.97.0
+  version: 0.98.0
 platform: ruby
 authors:
 - takafan