girl 4.1.0 → 4.6.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.keys.each { | src | close_src( src ) }
+    end
+
     ##
     # close sock
     #
@@ -329,9 +340,21 @@ module Girl
           @src_infos.each do | src, src_info |
             last_recv_at = src_info[ :last_recv_at ] || src_info[ :created_at ]
             last_sent_at = src_info[ :last_sent_at ] || src_info[ :created_at ]
-            expire_after = src_info[ :dst ] ? EXPIRE_AFTER : EXPIRE_NEW
 
-            if ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after ) then
+            if src_info[ :dst ] then
+              if src_info[ :dst_connected ] then
+                expire_after = EXPIRE_AFTER
+                is_expire = ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after )
+              else
+                expire_after = EXPIRE_CONNECTING
+                is_expire = ( now - src_info[ :dst_created_at ] >= expire_after )
+              end
+            else
+              expire_after = EXPIRE_NEW
+              is_expire = ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after )
+            end
+
+            if is_expire then
               puts "p#{ Process.pid } #{ Time.new } expire src #{ expire_after } #{ src_info[ :id ] } #{ src_info[ :destination_domain ] }"
               add_closing_src( src )
 
@@ -359,7 +382,7 @@ module Girl
             if dst && !dst.closed? then
               dst_info = @dst_infos[ dst ]
 
-              if dst_info[ :wbuff ].size < RESUME_BELOW then
+              if dst_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
                 add_resume_src( src )
               end
@@ -369,11 +392,11 @@ module Girl
           @paused_dsts.each do | dst |
             dst_info = @dst_infos[ dst ]
             src = dst_info[ :src ]
-            
+
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
-              if src_info[ :wbuff ].size < RESUME_BELOW then
+              if src_info[ :wbuff ].bytesize < RESUME_BELOW then
                 puts "p#{ Process.pid } #{ Time.new } resume dst #{ dst_info[ :domain ] }"
                 add_resume_dst( dst )
               end
@@ -392,13 +415,14 @@ module Girl
       domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
+      dst.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         dst.connect_nonblock( destination_addr )
       rescue IO::WaitWritable
         # connect nonblock 必抛 wait writable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }, close src"
+        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }"
         dst.close
         add_closing_src( src )
         return
@@ -413,10 +437,12 @@ module Girl
       }
 
       @dst_infos[ dst ] = dst_info
-      add_read( dst, :dst )
       src_info[ :proxy_type ] = :direct
       src_info[ :dst ] = dst
+      src_info[ :dst_created_at ] = Time.new
       add_socks5_conn_reply( src )
+      add_read( dst, :dst )
+      add_write( dst )
     end
 
     ##
@@ -424,6 +450,7 @@ module Girl
     #
     def new_a_redir
       pre = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      pre.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       pre.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       pre.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
       pre.bind( Socket.sockaddr_in( @redir_port, '0.0.0.0' ) )
@@ -523,7 +550,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 ) }
@@ -560,15 +587,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
@@ -586,6 +615,8 @@ module Girl
         is_connect: true,        # 代理协议是http的场合，是否是CONNECT
         rbuff: '',               # 读到的流量
         dst: nil,                # 对应的dst
+        dst_created_at: nil,     # 对应的dst的创建时间
+        dst_connected: false,    # 对应的dst是否已连接
         wbuff: '',               # 从dst读到的流量
         created_at: Time.new,    # 创建时间
         last_recv_at: nil,       # 上一次收到新流量（由dst收到）的时间
@@ -610,7 +641,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
@@ -728,7 +759,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
@@ -799,6 +830,12 @@ module Girl
 
       dst_info = @dst_infos[ dst ]
       src = dst_info[ :src ]
+      src_info = @src_infos[ src ]
+
+      unless src.closed? then
+        src_info[ :dst_connected ] = true
+      end
+
       data = dst_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -829,7 +866,6 @@ module Girl
       dst_info[ :wbuff ] = data
 
       unless src.closed? then
-        src_info = @src_infos[ src ]
         src_info[ :last_sent_at ] = Time.new
       end
     end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '4.1.0'.freeze
+  VERSION = '4.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.6.0
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-20 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.2.3
 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