girl 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06e25ddc6594959cceb39bd5d4ad420941dfaeec6866a86d7817e974cf9bc2f
-  data.tar.gz: 6d8016cd3a42b0cf611bad16759e34f130f193bb9e68a88f5f8b80597bd62dc9
+  metadata.gz: 944b2055e93c9751113af05107dce4dc040bb40a41602388350c292af2286e0b
+  data.tar.gz: 71c9b4cb592f41750a5f21d751afeb4d13be0b2c20da2f10eb0df42a8cfbe2fd
 SHA512:
-  metadata.gz: d1d49eddf9232d1af3cbf4d9426a257cdaf48003fe9a1b08fdca5b1caaba5497eda97b3092b49191c228868026d70843839ac711b1a70201832901062caeecf8
-  data.tar.gz: aa1f7dc236106913f5ea2c061fd5b54c7675da04e0db71fc2d200f1665213c8c33b5ed78a4959111453b19189562d0ba233cbf3cc71e32fb3575e7199050b77f
+  metadata.gz: 8a01d46a18c169d0d4773168379b0aa1106157872554444d166156dbaf7d55966d8f941561754d5e506c91d098383bf419ad42a8cd59432dc0270e7f879dc355
+  data.tar.gz: a9ed3e588404a191c0c7b38abdb1ec3573af2139022258dd9f2ee469ce6ad335b21ab5595002638d73946130535b6f92ac8c7bb429da7cd3c5b005e1dffdb3f8

data/lib/girl/proxy_worker.rb

@@ -700,7 +700,7 @@ module Girl
       @ctl = ctl
       add_read( ctl, :ctl )
 
-      ctld_port = @proxyd_port + 5.times.to_a.sample
+      ctld_port = @proxyd_port + 10.times.to_a.sample
       ctld_addr = Socket.sockaddr_in( ctld_port, @proxyd_host )
       @ctl_info = {
         ctld_addr: ctld_addr,        # ctld地址

data/lib/girl/proxyd_worker.rb

@@ -514,7 +514,7 @@ module Girl
     # new ctlds
     #
     def new_ctlds( proxyd_port )
-      5.times do | i |
+      10.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 )

data/lib/girl/relay_worker.rb

@@ -6,10 +6,10 @@ module Girl
     #
     def initialize( resolv_port, nameserver, resolvd_port, redir_port, proxyd_host, proxyd_port, directs, remotes, im )
       @nameserver_addr = Socket.sockaddr_in( 53, nameserver )
-      @resolvd_addr = Socket.sockaddr_in( resolvd_port, proxyd_host )
+      @resolvd_ports = 10.times.map { | i | resolvd_port + i }
       @qnames = remotes.map { | dom | dom.split( '.' ).map{ | sub | [ sub.size ].pack( 'C' ) + sub }.join }
       @proxyd_host = proxyd_host
-      @proxyd_addr = Socket.sockaddr_in( proxyd_port, proxyd_host )
+      @proxyd_port = proxyd_port
       @directs = directs
       @remotes = remotes
       @custom = Girl::ProxyCustom.new( im )
@@ -444,8 +444,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
@@ -522,8 +521,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
 
@@ -650,6 +648,7 @@ module Girl
 
           if resend >= RESEND_LIMIT then
             @ctl_info[ :resends ].delete( key )
+            set_ctl_closing
             break
           end
 
@@ -715,7 +714,10 @@ module Girl
       @ctl = ctl
       add_read( ctl, :ctl )
 
+      ctld_port = @proxyd_port + 10.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
@@ -725,7 +727,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
@@ -769,7 +771,7 @@ module Girl
 
       if @qnames.any? { | qname | data.include?( qname ) } then
         data = @custom.encode( data )
-        to_addr = @resolvd_addr
+        to_addr = Socket.sockaddr_in( @resolvd_ports.sample, @proxyd_host )
       else
         to_addr = @nameserver_addr
       end
@@ -881,7 +883,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 }"
@@ -889,6 +891,17 @@ module Girl
       end
     end
 
+    ##
+    # send data
+    #
+    def send_data( sock, to_addr, data )
+      begin
+        sock.sendmsg( data, 0, to_addr )
+      rescue Exception => e
+        puts "p#{ Process.pid } #{ Time.new } sendmsg to #{ to_addr.ip_unpack.inspect } #{ e.class }"
+      end
+    end
+
     ##
     # set atun closing
     #
@@ -902,14 +915,12 @@ module Girl
     end
 
     ##
-    # send data
+    # set ctl closing
     #
-    def send_data( sock, to_addr, data )
-      begin
-        sock.sendmsg( data, 0, to_addr )
-      rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } sendmsg to #{ to_addr.ip_unpack.inspect } #{ e.class }"
-      end
+    def set_ctl_closing
+      return if @ctl.closed?
+      @ctl_info[ :closing ] = true
+      next_tick
     end
 
     ##
@@ -1015,7 +1026,7 @@ module Girl
       data, addrinfo, rflags, *controls = rsv.recvmsg
       # puts "debug rsv recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
 
-      if addrinfo.to_sockaddr == @resolvd_addr then
+      if addrinfo.ip_address == @proxyd_host then
         data = @custom.decode( data )
       end
 

data/lib/girl/resolvd_worker.rb

@@ -16,7 +16,7 @@ module Girl
       dotr, dotw = IO.pipe
       @dotw = dotw
       add_read( dotr, :dotr )
-      new_a_resolvd( resolvd_port )
+      new_resolvds( resolvd_port )
     end
 
     ##
@@ -111,13 +111,14 @@ module Girl
     ##
     # new a dst
     #
-    def new_a_dst( src_addr, data )
+    def new_a_dst( resolvd, src_addr, data )
       dst = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       dst.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
       dst.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
 
       puts "p#{ Process.pid } #{ Time.new } new a dst"
       @dst_infos[ dst ] = {
+        resolvd: resolvd,
         src_addr: src_addr,
         created_at: Time.new
       }
@@ -126,16 +127,18 @@ module Girl
     end
 
     ##
-    # new a resolvd
+    # new resolvds
     #
-    def new_a_resolvd( resolvd_port )
-      resolvd = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      resolvd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      resolvd.bind( Socket.sockaddr_in( resolvd_port, '0.0.0.0' ) )
-
-      puts "p#{ Process.pid } #{ Time.new } resolvd bind on #{ resolvd_port }"
-      add_read( resolvd, :resolvd )
-      @resolvd = resolvd
+    def new_resolvds( resolvd_port )
+      10.times do
+        resolvd = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+        resolvd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        resolvd.bind( Socket.sockaddr_in( resolvd_port, '0.0.0.0' ) )
+
+        puts "p#{ Process.pid } #{ Time.new } resolvd bind on #{ resolvd_port }"
+        add_read( resolvd, :resolvd )
+        resolvd_port += 1
+      end
     end
 
     ##
@@ -177,7 +180,7 @@ module Girl
       data, addrinfo, rflags, *controls = resolvd.recvmsg
       # puts "debug1 resolvd recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
       data = @custom.decode( data )
-      new_a_dst( addrinfo.to_sockaddr, data )
+      new_a_dst( resolvd, addrinfo.to_sockaddr, data )
     end
 
     ##
@@ -188,7 +191,7 @@ module Girl
       # puts "debug1 dst recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
       data = @custom.encode( data )
-      send_data( @resolvd, dst_info[ :src_addr ], data )
+      send_data( dst_info[ :resolvd ], dst_info[ :src_addr ], data )
       close_dst( dst )
     end
 

data/lib/girl/version.rb

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

metadata

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