girl 4.6.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d3b294765df9759f671cd5916a4315aa5872a85e42ea9739d8e2bd409f55f49
-  data.tar.gz: 8405a9e93e8c038e757c3a191c40c3801ff34e9ce593be0b0187ee728cb70fa7
+  metadata.gz: e06e25ddc6594959cceb39bd5d4ad420941dfaeec6866a86d7817e974cf9bc2f
+  data.tar.gz: 6d8016cd3a42b0cf611bad16759e34f130f193bb9e68a88f5f8b80597bd62dc9
 SHA512:
-  metadata.gz: 8b09b4c9b12257b9fc8672eace67cd89bfac89b5032ffb6ccf2a6810342a3c09e45ba0b6658b86cafd7d671fdeaf0235de794a3f0b356c2835a3c5248de9743b
-  data.tar.gz: 5e16e91e812c7c53d3fbb47e4c16fc90f7f922a011d4983b6ee955306fd88496b7965e0f02c7ab78b9db80e25a4468c483dffab634d009d1f459d1a16c589a8f
+  metadata.gz: d1d49eddf9232d1af3cbf4d9426a257cdaf48003fe9a1b08fdca5b1caaba5497eda97b3092b49191c228868026d70843839ac711b1a70201832901062caeecf8
+  data.tar.gz: aa1f7dc236106913f5ea2c061fd5b54c7675da04e0db71fc2d200f1665213c8c33b5ed78a4959111453b19189562d0ba233cbf3cc71e32fb3575e7199050b77f

data/lib/girl/proxy_worker.rb

@@ -7,7 +7,6 @@ module Girl
     def initialize( redir_port, proxyd_host, proxyd_port, directs, remotes, im )
       @proxyd_host = proxyd_host
       @proxyd_port = proxyd_port
-      @proxyd_addr = Socket.sockaddr_in( proxyd_port, proxyd_host )
       @directs = directs
       @remotes = remotes
       @custom = Girl::ProxyCustom.new( im )
@@ -431,8 +430,7 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
 
-      if ( ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) ) \
-        || ( ( ip_info.ip_address == @proxyd_host ) && ( src_info[ :destination_port ] == @proxyd_port ) ) then
+      if ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) then
         puts "p#{ Process.pid } #{ Time.new } ignore #{ ip_info.ip_address }:#{ src_info[ :destination_port ] }"
         add_closing_src( src )
         return
@@ -509,8 +507,7 @@ module Girl
 
             if now - last_recv_at >= EXPIRE_CTL then
                puts "p#{ Process.pid } #{ Time.new } expire ctl #{ EXPIRE_CTL }"
-               @ctl_info[ :closing ] = true
-               next_tick
+               set_ctl_closing
             end
           end
 
@@ -630,6 +627,7 @@ module Girl
 
           if resend >= RESEND_LIMIT then
             @ctl_info[ :resends ].delete( key )
+            set_ctl_closing
             break
           end
 
@@ -702,7 +700,10 @@ module Girl
       @ctl = ctl
       add_read( ctl, :ctl )
 
+      ctld_port = @proxyd_port + 5.times.to_a.sample
+      ctld_addr = Socket.sockaddr_in( ctld_port, @proxyd_host )
       @ctl_info = {
+        ctld_addr: ctld_addr,        # ctld地址
         resends: ConcurrentHash.new, # key => count
         atund_addr: nil,             # atund地址，src->dst
         btund_addr: nil,             # btund地址，dst->src
@@ -712,7 +713,7 @@ module Girl
       }
 
       hello = @custom.hello
-      puts "p#{ Process.pid } #{ Time.new } hello i'm #{ hello.inspect }"
+      puts "p#{ Process.pid } #{ Time.new } hello i'm #{ hello.inspect } #{ ctld_port }"
       key = [ HELLO ].pack( 'C' )
       add_ctlmsg( key, hello )
     end
@@ -887,7 +888,7 @@ module Girl
       data = @custom.encode( data )
 
       begin
-        @ctl.sendmsg( data, 0, @proxyd_addr )
+        @ctl.sendmsg( data, 0, @ctl_info[ :ctld_addr ] )
         @ctl_info[ :last_sent_at ] = Time.new
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } sendmsg #{ e.class }"
@@ -907,6 +908,15 @@ module Girl
       add_write( atun )
     end
 
+    ##
+    # set ctl closing
+    #
+    def set_ctl_closing
+      return if @ctl.closed?
+      @ctl_info[ :closing ] = true
+      next_tick
+    end
+
     ##
     # set dst closing write
     #

data/lib/girl/proxyd_worker.rb

@@ -28,7 +28,7 @@ module Girl
       dotr, dotw = IO.pipe
       @dotw = dotw
       add_read( dotr, :dotr )
-      new_a_ctld( proxyd_port )
+      new_ctlds( proxyd_port )
       new_a_infod( infod_port )
     end
 
@@ -345,7 +345,7 @@ module Girl
 
       data = [ PAIRED, src_id, dst_id ].pack( 'CQ>n' )
       # puts "debug add ctlmsg paired #{ src_id } #{ dst_id }"
-      send_ctlmsg( data, ctl_addr )
+      send_ctlmsg( ctl_info[ :ctld ], data, ctl_addr )
     end
 
     ##
@@ -488,18 +488,6 @@ module Girl
       end
     end
 
-    ##
-    # new a ctld
-    #
-    def new_a_ctld( proxyd_port )
-      ctld = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      ctld.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      ctld.bind( Socket.sockaddr_in( proxyd_port, '0.0.0.0' ) )
-      puts "p#{ Process.pid } #{ Time.new } ctld bind on #{ proxyd_port }"
-      add_read( ctld, :ctld )
-      @ctld = ctld
-    end
-
     ##
     # new a infod
     #
@@ -522,6 +510,20 @@ module Girl
       tund
     end
 
+    ##
+    # new ctlds
+    #
+    def new_ctlds( proxyd_port )
+      5.times do | i |
+        ctld_port = proxyd_port + i
+        ctld = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+        ctld.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        ctld.bind( Socket.sockaddr_in( ctld_port, '0.0.0.0' ) )
+        puts "p#{ Process.pid } #{ Time.new } ctld bind on #{ ctld_port }"
+        add_read( ctld, :ctld )
+      end
+    end
+
     ##
     # next tick
     #
@@ -581,11 +583,11 @@ module Girl
     ##
     # send ctlmsg
     #
-    def send_ctlmsg( data, to_addr )
+    def send_ctlmsg( ctld, data, to_addr )
       data = @custom.encode( data )
 
       begin
-        @ctld.sendmsg( data, 0, to_addr )
+        ctld.sendmsg( data, 0, to_addr )
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } sendmsg #{ e.class }"
       end
@@ -697,6 +699,7 @@ module Girl
           }
 
           @ctl_infos[ ctl_addr ] = {
+            ctld: ctld,                  # 对应的ctld
             addrinfo: addrinfo,          # 地址
             im: im,                      # 标识
             atund: atund,                # 对应atund，src->dst
@@ -712,10 +715,10 @@ module Girl
         end
 
         data2 = [ TUND_PORT, atund_port, btund_port ].pack( 'Cnn' )
-        send_ctlmsg( data2, ctl_addr )
+        send_ctlmsg( ctld, data2, ctl_addr )
       when A_NEW_SOURCE then
         unless ctl_info then
-          send_ctlmsg( [ UNKNOWN_CTL_ADDR ].pack( 'C' ), addrinfo )
+          send_ctlmsg( ctld, [ UNKNOWN_CTL_ADDR ].pack( 'C' ), addrinfo )
           return
         end
 
@@ -726,7 +729,7 @@ module Girl
         if dst_id then
           data2 = [ PAIRED, src_id, dst_id ].pack( 'CQ>n' )
           # puts "debug dst id exist, send ctlmsg paired #{ src_id } #{ dst_id }"
-          send_ctlmsg( data2, ctl_addr )
+          send_ctlmsg( ctld, data2, ctl_addr )
           return
         end
 

data/lib/girl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email: