girl 0.96.0 → 0.97.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 141ddfd9fd89d13f02f9ea69e9880d39620460ae1ff5155276c1b4bcb2b3ed83
-  data.tar.gz: f72985c0577b97927e73c6943f268df9ca92702eb2d84f5f5a4400e4bf93dee3
+  metadata.gz: 1488058f7502fb83ee815a38ba4b11276a2bd5732bfadf596f5f42fbbb6bae53
+  data.tar.gz: 1ac6377572a1ff976f4626127e78f76e7c949683b035c2df7426acac70b3ac86
 SHA512:
-  metadata.gz: 67dc320dc6ef439a146c7396f9a80d6031c5a6cad3d4f36fb23063898fd68c6c6f2a0789cbd51d553a2fcb856d52da826d37f6470f1b5ac83703147809d30341
-  data.tar.gz: 25189cbab69f1d2345a62efb8898f2410c7de3210a06d04547e2cb01decdc31afc3ff56e5ab98356fdb378d1d5afb95f40792fd96e02c05bf8ff0431ea32d18d
+  metadata.gz: 27bc728548949021b2f477ede35b85ff3888ba3371824d32458a390fe9040a10ac0fd11483f25426cda27b95784a2f71b3837fed6b264583ced0378ef6c1b2ee
+  data.tar.gz: d07a0a982e4ecbaf4c798163027bbdd68c7cd3510280e5f904a079aa6796aa57f5b0c96067c86ee71630409e92eb923050b132974496bfdbfed71154e61e2a60

data/lib/girl/proxy_worker.rb

@@ -107,7 +107,7 @@ module Girl
     # 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
@@ -757,12 +757,12 @@ 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 )
+            next_tick
           end
-
-          next_tick
         end
       end
     end
@@ -782,7 +782,7 @@ module Girl
     def set_dst_closing( dst )
       return if dst.closed?
       dst_info = @dst_infos[ dst ]
-      
+
       if dst_info[ :closed_write ] then
         close_dst( dst )
       else
@@ -838,10 +838,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 ]
@@ -939,6 +935,10 @@ module Girl
       }
 
       add_read( src, :src )
+
+      if @tun.nil? || @tun.closed? then
+        new_a_tun
+      end
     end
 
     ##
@@ -1025,13 +1025,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
@@ -1230,13 +1223,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

data/lib/girl/proxyd_worker.rb

@@ -118,7 +118,7 @@ module Girl
     # 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
@@ -127,6 +127,27 @@ module Girl
       end
     end
 
+    ##
+    # add streamd wbuff
+    #
+    def add_streamd_wbuff( streamd, data )
+      return if streamd.closed?
+      streamd_info = @streamd_infos[ streamd ]
+      streamd_info[ :wbuff ] << data
+      add_write( streamd )
+
+      if streamd_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        dst = streamd_info[ :dst ]
+        dst_info = @dst_infos[ dst ]
+
+        unless dst_info[ :paused ] then
+          puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :domain_port ] }"
+          dst_info[ :paused ] = true
+          @reads.delete( dst )
+        end
+      end
+    end
+
     ##
     # add write
     #
@@ -809,13 +830,6 @@ module Girl
       end
 
       dst_info = @dst_infos[ dst ]
-
-      # 处理关闭
-      if dst_info[ :closing ] then
-        close_dst( dst )
-        return
-      end
-
       @traff_ins[ dst_info[ :im ] ] += data.bytesize
       streamd = dst_info[ :streamd ]
 
@@ -824,14 +838,7 @@ 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
@@ -863,13 +870,6 @@ module Girl
       end
 
       streamd_info = @streamd_infos[ streamd ]
-
-      # 处理关闭
-      if streamd_info[ :closing ] then
-        close_streamd( streamd )
-        return
-      end
-
       @traff_ins[ streamd_info[ :im ] ] += data.bytesize
       dst = streamd_info[ :dst ]
 
@@ -897,7 +897,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

data/lib/girl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.96.0
+  version: 0.97.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email: