girl 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5199f1adef8e1a8ec53a5b72bfce597c65abc6dee357e7004c1628ebbead85bc
-  data.tar.gz: 5541fcfa8dd95bc60723ad6deaa98cec54224d407ad4fa04b085638136bd5b5c
+  metadata.gz: ba24b62a261882eae66a3aeacb3966b96a65019a290ee80414ddb1e59c451899
+  data.tar.gz: 0b75d6df0abe02ac88a48debd383621e68f8679d41b856f09d88e08a81a37b82
 SHA512:
-  metadata.gz: ecdb7c484ff08eb6f240656ff440f4640f201145f152dd61fca9a2aa85da271e1efb2db39e8b4ff57f9418d4e8936838f968e3c5ea0553140e694af444ac0392
-  data.tar.gz: 2f5a56d688433e4b4a6fb60e0c74ac93c8d5e3c3c8f88c1fc69e3cfa9bee269f0463d029618b95c92fdf541977997b8860b94e06fca0c3d56a38172f288c44d7
+  metadata.gz: 8e6bf4dedbf159c5bfe0a120c9bb16597432b70ae4796a1fa4a27c2f8564c0ddd0456eacf720a05aa14356369948f79d49f33ee4d2b23668ff4d3df1c053591c
+  data.tar.gz: e3b579ab02a36d0807bc2f54a78f259a3a6510552ba16c2e44906baaf21c11433a8692818cd07bcd25bc684bc45ac0766f034babcb9987220830c2d9c6a897fe

data/lib/girl/proxyd_worker.rb

@@ -423,7 +423,7 @@ module Girl
           @proxy_infos.each do | proxy, proxy_info |
             last_recv_at = proxy_info[ :last_recv_at ] || proxy_info[ :created_at ]
 
-            if proxy_info[ :dsts ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) then
+            if now - last_recv_at >= EXPIRE_AFTER then
               puts "p#{ Process.pid } #{ Time.new } expire proxy #{ proxy_info[ :addrinfo ].inspect }"
 
               unless @closing_proxys.include?( proxy ) then
@@ -515,15 +515,16 @@ module Girl
     # new a proxyd
     #
     def new_a_proxyd( proxyd_port )
-      proxyd = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      proxyd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      proxyd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      proxyd.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      proxyd.bind( Socket.sockaddr_in( proxyd_port, '0.0.0.0' ) )
+      pre_proxyd = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      pre_proxyd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+      pre_proxyd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+      pre_proxyd.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      pre_proxyd.bind( Socket.sockaddr_in( proxyd_port, '0.0.0.0' ) )
+      
+      proxyd = OpenSSL::SSL::SSLServer.new pre_proxyd, @context
       proxyd.listen( 127 )
-      puts "p#{ Process.pid } #{ Time.new } proxyd bind on #{ proxyd_port }"
-      ssl_proxyd = OpenSSL::SSL::SSLServer.new proxyd, @context
-      add_read( ssl_proxyd, :proxyd )
+      puts "p#{ Process.pid } #{ Time.new } proxyd listen on #{ proxyd_port }"
+      add_read( proxyd, :proxyd )
     end
 
     ##
@@ -657,7 +658,7 @@ module Girl
     #
     def read_proxyd( proxyd )
       begin
-        proxy = proxyd.accept_nonblock
+        proxy = proxyd.accept
       rescue IO::WaitReadable, Errno::EINTR
         print 'r'
         return
@@ -729,23 +730,24 @@ module Girl
             @traff_outs[ im ] = 0
           end
 
-          tund = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-          tund.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-          tund.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
-          tund_port = tund.local_address.ip_port
+          pre_tund = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+          pre_tund.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+          pre_tund.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
+
+          tund_port = pre_tund.local_address.ip_port
+          tund = OpenSSL::SSL::SSLServer.new pre_tund, @context
           tund.listen( 127 )
-          puts "p#{ Process.pid } #{ Time.new } tund #{ im.inspect } bind on #{ tund_port }"
-          ssl_tund = OpenSSL::SSL::SSLServer.new tund, @context
-          add_read( ssl_tund, :tund )
+          puts "p#{ Process.pid } #{ Time.new } tund #{ im.inspect } listen on #{ tund_port }"
+          add_read( tund, :tund )
 
-          @tund_infos[ ssl_tund ] = {
+          @tund_infos[ tund ] = {
             proxy: proxy,
             close_read: false,
             close_write: false
           }
 
           proxy_info[ :im ] = im
-          proxy_info[ :tund ] = ssl_tund
+          proxy_info[ :tund ] = tund
           proxy_info[ :tund_port ] = tund_port
           data2 = [ TUND_PORT, tund_port ].pack( 'Cn' )
           add_ctlmsg( proxy, data2 )
@@ -863,7 +865,7 @@ module Girl
       end
 
       begin
-        tun = tund.accept_nonblock
+        tun = tund.accept
       rescue IO::WaitReadable, Errno::EINTR
         print 'r'
         return

data/lib/girl/ssl_worker.rb

@@ -421,18 +421,17 @@ module Girl
     # new a redir
     #
     def new_a_redir( redir_port, cert, key )
-      redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      redir.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      redir.bind( Socket.sockaddr_in( redir_port, '0.0.0.0' ) )
-      redir.listen( 127 )
+      pre_redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      pre_redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+      pre_redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+      pre_redir.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      pre_redir.bind( Socket.sockaddr_in( redir_port, '0.0.0.0' ) )
 
-      @redir_local_address = redir.local_address
+      @redir_local_address = pre_redir.local_address
       context = OpenSSL::SSL::SSLContext.new
       context.add_certificate( cert, key )
-      redir = OpenSSL::SSL::SSLServer.new redir, context
-
+      redir = OpenSSL::SSL::SSLServer.new pre_redir, context
+      redir.listen( 127 )
       puts "p#{ Process.pid } #{ Time.new } redir listen on #{ redir_port }"
       add_read( redir, :redir )
     end
@@ -540,7 +539,7 @@ module Girl
     #
     def read_redir( redir )
       begin
-        src = redir.accept_nonblock
+        src = redir.accept
       rescue IO::WaitReadable, Errno::EINTR
         print 'r'
         return

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '3.8.0'.freeze
+  VERSION = '3.9.0'.freeze
 end

metadata

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