girl 4.0.0 → 4.5.0

data/lib/girl/resolv_custom.rb

@@ -1,7 +1,7 @@
-require 'girl/custom_dns_query'
+require 'girl/custom'
 
 module Girl
   class ResolvCustom
-    include CustomDnsQuery
+    include Custom
   end
 end

data/lib/girl/resolvd_worker.rb

@@ -5,7 +5,7 @@ module Girl
     # initialize
     #
     def initialize( resolvd_port, nameserver )
-      @resolv_custom = Girl::ResolvCustom.new
+      @custom = Girl::ResolvCustom.new
       @nameserver_addr = Socket.sockaddr_in( 53, nameserver )
       @roles = ConcurrentHash.new     # :resolvd / :dst
       @reads = []
@@ -162,7 +162,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @closing_dsts.any? then
         @closing_dsts.each { | dst | close_dst( dst ) }
@@ -176,7 +176,7 @@ module Girl
     def read_resolvd( resolvd )
       data, addrinfo, rflags, *controls = resolvd.recvmsg
       # puts "debug1 resolvd recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
-      data = @resolv_custom.decode( data )
+      data = @custom.decode( data )
       new_a_dst( addrinfo.to_sockaddr, data )
     end
 
@@ -187,7 +187,7 @@ module Girl
       data, addrinfo, rflags, *controls = dst.recvmsg
       # puts "debug1 dst recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      data = @resolv_custom.encode( data )
+      data = @custom.encode( data )
       send_data( @resolvd, dst_info[ :src_addr ], data )
       close_dst( dst )
     end

data/lib/girl/ssl_worker.rb

@@ -236,6 +236,17 @@ module Girl
       end
     end
 
+    ##
+    # close redir
+    #
+    def close_redir( redir )
+      return if redir.closed?
+      redir.close
+      @roles.delete( redir )
+      @reads.delete( redir )
+      @src_infos.each { | src, _ | close_src( src ) }
+    end
+
     ##
     # close sock
     #
@@ -356,7 +367,7 @@ module Girl
             src_info = @src_infos[ src ]
             dst = src_info[ :dst ]
 
-            if dst then
+            if dst && !dst.closed? then
               dst_info = @dst_infos[ dst ]
 
               if dst_info[ :wbuff ].size < RESUME_BELOW then
@@ -369,11 +380,14 @@ module Girl
           @paused_dsts.each do | dst |
             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 } resume dst #{ dst_info[ :domain ] }"
-              add_resume_dst( dst )
+            if src && !src.closed? then
+              src_info = @src_infos[ src ]
+
+              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
         end
@@ -520,7 +534,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @closing_srcs.any? then
         @closing_srcs.each { | src | close_src( src ) }
@@ -557,15 +571,17 @@ module Girl
 
         unless accepted then
           puts "p#{ Process.pid } #{ Time.new } accept timeout"
-          redir.close
-          @roles.delete( redir )
-          @reads.delete( redir )
+          close_redir( redir )
           new_a_redir
         end
       end
 
       begin
         src = redir.accept
+      rescue SystemExit => e
+        puts "p#{ Process.pid } #{ Time.new } redir accept #{ e.class }"
+        close_redir( redir )
+        return
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } redir accept #{ e.class }"
         puts e.full_message
@@ -607,7 +623,7 @@ module Girl
       src_info = @src_infos[ src ]
 
       begin
-        data = src.read_nonblock( 65535 )
+        data = src.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable
         return
       rescue Errno::EINTR => e
@@ -725,7 +741,7 @@ module Girl
       src = dst_info[ :src ]
 
       begin
-        data = dst.read_nonblock( 65535 )
+        data = dst.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
         print 'r'
         return

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.5.0
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email:
@@ -21,7 +21,6 @@ files:
 - lib/girl.rb
 - lib/girl/concurrent_hash.rb
 - lib/girl/custom.rb
-- lib/girl/custom_dns_query.rb
 - lib/girl/head.rb
 - lib/girl/proxy.rb
 - lib/girl/proxy_custom.rb
@@ -56,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: 妹子

data/lib/girl/custom_dns_query.rb

@@ -1,11 +0,0 @@
-module Girl
-  module CustomDnsQuery
-    def encode( data )
-      data.reverse
-    end
-
-    def decode( data )
-      data.reverse
-    end
-  end
-end