girl 0.87.1 → 0.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff8fb468e18a12b716f36ad839823c2725a590cc162f896ed43b199297262c01
-  data.tar.gz: 657e28910c1e4303896b7f728760bedf2ba4d23dd1ed021b325cc6545b0050ac
+  metadata.gz: b93e96a7869493e3817af21b5a482605adbe9be7a4d4156b14eed2a6b40c25d5
+  data.tar.gz: 4adea82e1e09ce9cb2b1da33f05618d8bd3837bd50bd452b8d99631e523a040b
 SHA512:
-  metadata.gz: 1c29c0ee44eacc07c1deea70df4433083c45fde0f932c540831a52c0c39e539401b79cd3249190563db3dfc4f33a8b7ac336f95420038ed612abdbe5e3d8a42d
-  data.tar.gz: 72c4374a80e9eb93139cff701436536e99d8843c80a866494d42aee10ff64619b82e4d19b8a0660f44bd1a3b516657221e60d72227a005f96c8410a729eb919e
+  metadata.gz: 38d15c8e1104feb3079c6ee14af795adb319808c9899c6013b28cf3cf4d082b9c1feca3160d95cbf67beb88343a202a823b2e1b823591fcbc3abb7b040a19839
+  data.tar.gz: 8e1f3255a7c297e33dd0ee6931483584760198ba0559936ac213b62a900451a8658749ded5dc1ebb490ab45958a4e8c7a0bfea6756047955d358b4c4cafa6d6d

data/lib/girl/proxy_worker.rb

@@ -95,7 +95,7 @@ module Girl
           sleep CHECK_EXPIRE_INTERVAL
 
           @mutex.synchronize do
-            need_trigger = false
+            trigger = false
             now = Time.new
 
             if @tun && !@tun.closed?
@@ -104,7 +104,7 @@ module Girl
               if is_expired
                 puts "p#{ Process.pid } #{ Time.new } expire tun"
                 set_is_closing( @tun )
-                need_trigger = true
+                trigger = true
               else
                 data = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
                 # puts "debug1 #{ Time.new } heartbeat"
@@ -117,7 +117,7 @@ module Girl
 
                     if src_info && ( now - src_info[ :last_continue_at ] > EXPIRE_AFTER )
                       puts "p#{ Process.pid } #{ Time.new } expire src ext #{ src_info[ :destination_domain ] }"
-                      @tun_info[ :wmems ].delete_if { | src_id_and_pack_id, _ | src_id_and_pack_id.first == src_id }
+                      @tun_info[ :wmems ].delete_if { | src_id_pack_id, _ | src_id_pack_id.first == src_id }
                       @tun_info[ :src_ids ].delete( src_info[ :dst_id ] )
                       @src_infos.delete( src )
                       del_src_ids << src_id
@@ -135,7 +135,7 @@ module Girl
               if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
                 puts "p#{ Process.pid } #{ Time.new } expire src #{ src_info[ :destination_domain ] }"
                 set_is_closing( src )
-                need_trigger = true
+                trigger = true
               end
             end
 
@@ -143,11 +143,11 @@ module Girl
               if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
                 puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain ] }"
                 set_is_closing( dst )
-                need_trigger = true
+                trigger = true
               end
             end
 
-            if need_trigger
+            if trigger
               next_tick
             end
           end
@@ -179,17 +179,23 @@ module Girl
               end
 
               if @pause_srcs.any? && ( @tun_info[ :wmems ].size < RESUME_BELOW )
+                trigger = false
+
                 @pause_srcs.each do | src |
                   src_info = @src_infos[ src ]
 
                   if src_info
                     puts "p#{ Process.pid } #{ Time.new } resume src #{ src_info[ :destination_domain ] }"
                     add_read( src )
+                    trigger = true
                   end
                 end
 
                 @pause_srcs.clear
-                next_tick
+
+                if trigger
+                  next_tick
+                end
               end
             end
           end
@@ -229,7 +235,7 @@ module Girl
     def loop_send_a_new_source( src )
       src_info = @src_infos[ src ]
 
-      if src_info && @tun_info[ :tund_addr ]
+      if src_info
         destination_domain = src_info[ :destination_domain ]
         destination_port = src_info[ :destination_port ]
         domain_port = [ destination_domain, destination_port ].join( ':' )
@@ -237,7 +243,7 @@ module Girl
 
         Thread.new do
           EXPIRE_NEW.times do | i |
-            if src.closed? || src_info[ :dst_id ]
+            if @tun.nil? || @tun.closed? || src.closed? || src_info[ :dst_id ]
               # puts "debug1 break loop send a new source #{ src_info[ :dst_port ] }"
               break
             end
@@ -469,12 +475,12 @@ module Girl
       method, url, proto = lines.first.split( ' ' )
 
       if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://'
-        domain_and_port = url.split( '/' )[ 2 ]
-        data = data.sub( "http://#{ domain_and_port }", '' )
-        # puts "debug1 subed #{ data.inspect } #{ domain_and_port }"
+        domain_port = url.split( '/' )[ 2 ]
+        data = data.sub( "http://#{ domain_port }", '' )
+        # puts "debug1 subed #{ data.inspect } #{ domain_port }"
       end
 
-      [ data, domain_and_port ]
+      [ data, domain_port ]
     end
 
     ##
@@ -556,9 +562,9 @@ module Girl
     # tunnel data
     #
     def tunnel_data( src, data )
+      now = Time.new
       src_info = @src_infos[ src ]
       src_id = src_info[ :id ]
-      now = Time.new
       pack_id = src_info[ :biggest_pack_id ]
       idx = 0
       len = data.bytesize
@@ -682,10 +688,11 @@ module Girl
     # del src ext
     #
     def del_src_ext( src_id )
-      @tun_info[ :wmems ].delete_if { | src_id_and_pack_id, _ | src_id_and_pack_id.first == src_id }
-      src = @tun_info[ :srcs ].delete( src_id )
+      src = @tun_info[ :srcs ][ src_id ]
 
-      if src
+      if src && src.closed?
+        @tun_info[ :wmems ].delete_if { | src_id_pack_id, _ | src_id_pack_id.first == src_id }
+        @tun_info[ :srcs ].delete( src_id )
         src_info = @src_infos.delete( src )
 
         if src_info
@@ -865,9 +872,9 @@ module Girl
       when :uncheck
         if data[ 0, 7 ] == 'CONNECT'
           # puts "debug1 CONNECT"
-          domain_and_port = data.split( "\r\n" )[ 0 ].split( ' ' )[ 1 ]
+          domain_port = data.split( "\r\n" )[ 0 ].split( ' ' )[ 1 ]
 
-          unless domain_and_port
+          unless domain_port
             puts "p#{ Process.pid } #{ Time.new } CONNECT miss domain"
             set_is_closing( src )
             return
@@ -913,13 +920,13 @@ module Girl
             return
           end
 
-          data, domain_and_port = sub_http_request( data )
+          data, domain_port = sub_http_request( data )
 
-          unless domain_and_port
+          unless domain_port
             # puts "debug1 not HTTP"
-            domain_and_port = host_line.split( ' ' )[ 1 ]
+            domain_port = host_line.split( ' ' )[ 1 ]
 
-            unless domain_and_port
+            unless domain_port
               puts "p#{ Process.pid } #{ Time.new } Host line miss domain"
               set_is_closing( src )
               return
@@ -930,7 +937,7 @@ module Girl
           src_info[ :rbuff ] << data
         end
 
-        domain, port = domain_and_port.split( ':' )
+        domain, port = domain_port.split( ':' )
         port = port ? port.to_i : 80
 
         src_info[ :proxy_proto ] = :http
@@ -1036,7 +1043,7 @@ module Girl
       src = dst_info[ :src ]
 
       if src.closed?
-        puts "p#{ Process.pid } #{ Time.new } src closed, close dst"
+        puts "p#{ Process.pid } #{ Time.new } src closed, close dst #{ dst_info[ :domain ] }"
         set_is_closing( dst )
         return
       end
@@ -1082,10 +1089,10 @@ module Girl
           src_id, dst_id = data[ 9, 10 ].unpack( 'Q>n' )
 
           src = @tun_info[ :srcs ][ src_id ]
-          return if src.closed?
+          return if src.nil? || src.closed?
 
           src_info = @src_infos[ src ]
-          return if src_info[ :dst_id ]
+          return if src_info.nil? || src_info[ :dst_id ]
 
           # puts "debug1 got paired #{ src_id } #{ dst_id }"
 
@@ -1278,7 +1285,7 @@ module Girl
       return unless src_id
 
       src = @tun_info[ :srcs ][ src_id ]
-      return unless src
+      return if src.nil? || src.closed?
 
       src_info = @src_infos[ src ]
       return unless src_info

data/lib/girl/proxyd_worker.rb

@@ -92,7 +92,7 @@ module Girl
           sleep CHECK_EXPIRE_INTERVAL
 
           @mutex.synchronize do
-            need_trigger = false
+            trigger = false
             now = Time.new
 
             @tund_infos.each do | tund, tund_info |
@@ -102,7 +102,7 @@ module Girl
                 if is_expired
                   puts "p#{ Process.pid } #{ Time.new } expire tund #{ tund_info[ :port ] }"
                   set_is_closing( tund )
-                  need_trigger = true
+                  trigger = true
                 else
                   data = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
                   # puts "debug1 #{ Time.new } #{ tund_info[ :port ] } heartbeat"
@@ -115,7 +115,7 @@ module Girl
 
                       if dst_info && ( now - dst_info[ :last_continue_at ] > EXPIRE_AFTER )
                         puts "p#{ Process.pid } #{ Time.new } expire dst ext #{ dst_info[ :domain_port ] }"
-                        tund_info[ :wmems ].delete_if { | port_and_pack_id, _ | port_and_pack_id.first == dst_id }
+                        tund_info[ :wmems ].delete_if { | dst_id_pack_id, _ | dst_id_pack_id.first == dst_id }
                         tund_info[ :dst_ids ].delete( dst_info[ :src_id ] )
                         @dst_infos.delete( dst )
                         del_dst_ids << dst_id
@@ -134,11 +134,11 @@ module Girl
               if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
                 puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain_port ] }"
                 set_is_closing( dst )
-                need_trigger = true
+                trigger = true
               end
             end
 
-            if need_trigger
+            if trigger
               next_tick
             end
           end
@@ -155,8 +155,6 @@ module Girl
           sleep CHECK_STATUS_INTERVAL
 
           @mutex.synchronize do
-            need_trigger = false
-
             if @tunds.any?
               @tunds.each do | tund_port, tund |
                 tund_info = @tund_infos[ tund ]
@@ -206,18 +204,14 @@ module Girl
                   add_read( dst )
                 end
 
+                next_tick
                 @pause_dsts -= resume_dsts
-                need_trigger = true
               end
 
               if ignore_dsts.any?
                 @pause_dsts -= ignore_dsts
               end
             end
-
-            if need_trigger
-              next_tick
-            end
           end
         end
       end
@@ -394,14 +388,14 @@ module Girl
       tund = dst_info[ :tund ]
 
       if tund.closed?
-        puts "p#{ Process.pid } #{ Time.new } tund closed, close dst"
+        puts "p#{ Process.pid } #{ Time.new } tund closed, close dst #{ dst_info[ :domain_port ] } #{ dst_info[ :biggest_pack_id ] }"
         set_is_closing( dst )
         return
       end
 
+      now = Time.new
       tund_info = @tund_infos[ tund ]
       dst_id = dst_info[ :id ]
-      now = Time.new
       pack_id = dst_info[ :biggest_pack_id ]
       idx = 0
       len = data.bytesize
@@ -437,6 +431,10 @@ module Girl
     # send data
     #
     def send_data( sock, data, to_addr )
+      unless to_addr
+        return false
+      end
+
       begin
         sock.sendmsg( data, 0, to_addr )
       rescue IO::WaitWritable, Errno::EINTR
@@ -508,10 +506,11 @@ module Girl
     # del dst ext
     #
     def del_dst_ext( tund_info, dst_id )
-      tund_info[ :wmems ].delete_if { | port_and_pack_id, _ | port_and_pack_id.first == dst_id }
-      dst = tund_info[ :dsts ].delete( dst_id )
+      dst = tund_info[ :dsts ][ dst_id ]
 
-      if dst
+      if dst && dst.closed?
+        tund_info[ :wmems ].delete_if { | dst_id_pack_id, _ | dst_id_pack_id.first == dst_id }
+        tund_info[ :dsts ].delete( dst_id )
         dst_info = @dst_infos.delete( dst )
 
         if dst_info
@@ -716,7 +715,7 @@ module Girl
 
           data = data[ 17..-1 ]
           domain_port = @custom.decode( data )
-          puts "p#{ Process.pid } #{ Time.new } a new source #{ src_id } #{ domain_port }"
+          # puts "debug1 a new source #{ src_id } #{ domain_port }"
           resolve_domain( tund, src_id, domain_port )
         when SOURCE_STATUS
           src_id, relay_src_pack_id, continue_dst_pack_id  = data[ 9, 24 ].unpack( 'Q>Q>Q>' )
@@ -871,7 +870,7 @@ module Girl
       return unless dst_id
 
       dst = tund_info[ :dsts ][ dst_id ]
-      return unless dst
+      return if dst.nil? || dst.closed?
 
       dst_info = @dst_infos[ dst ]
       return unless dst_info

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.87.1'.freeze
+  VERSION = '0.88.0'.freeze
 end

metadata

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