girl 4.4.0 → 4.9.0

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
@@ -520,10 +519,9 @@ module Girl
           if @ctl && !@ctl.closed? then
             last_recv_at = @ctl_info[ :last_recv_at ] || @ctl_info[ :created_at ]
 
-            if now - last_recv_at >= EXPIRE_AFTER then
-               puts "p#{ Process.pid } #{ Time.new } expire ctl"
-               @ctl_info[ :closing ] = true
-               next_tick
+            if now - last_recv_at >= EXPIRE_CTL then
+               puts "p#{ Process.pid } #{ Time.new } expire ctl #{ EXPIRE_CTL }"
+               set_ctl_closing
             end
           end
 
@@ -537,9 +535,24 @@ 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 ] || src_info[ :tun ] ) ? 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
+            elsif src_info[ :atun ] then
+              expire_after = EXPIRE_AFTER
+              is_expire = ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after )
+            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 )
 
@@ -568,7 +581,7 @@ module Girl
               if !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
@@ -579,7 +592,7 @@ module Girl
               if atun && !atun.closed? then
                 atun_info = @atun_infos[ atun ]
 
-                if atun_info[ :wbuff ].size < RESUME_BELOW then
+                if atun_info[ :wbuff ].bytesize < RESUME_BELOW then
                   puts "p#{ Process.pid } #{ Time.new } resume tunnel src #{ src_info[ :destination_domain ] }"
                   add_resume_src( src )
                 end
@@ -594,7 +607,7 @@ module Girl
             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
@@ -608,7 +621,7 @@ module Girl
             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 btun #{ btun_info[ :domain ] }"
                 add_resume_btun( btun )
               end
@@ -635,6 +648,7 @@ module Girl
 
           if resend >= RESEND_LIMIT then
             @ctl_info[ :resends ].delete( key )
+            set_ctl_closing
             break
           end
 
@@ -651,15 +665,22 @@ module Girl
       src_info = @src_infos[ src ]
       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::SOL_TCP, Socket::TCP_NODELAY, 1 )
+
+      begin
+        dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
+      rescue Exception => e
+        puts "p#{ Process.pid } #{ Time.new } new a dst #{ src_info[ :destination_domain ] } #{ src_info[ :destination_port ] } #{ e.class }"
+        add_closing_src( src )
+        return
+      end
+
+      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
@@ -674,15 +695,17 @@ 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
 
       if src_info[ :rbuff ] then
         # puts "debug move src.rbuff to dst.wbuff"
         dst_info[ :wbuff ] << src_info[ :rbuff ]
-        add_write( dst )
       end
+
+      add_read( dst, :dst )
+      add_write( dst )
     end
 
     ##
@@ -698,7 +721,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
@@ -708,7 +734,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
@@ -718,6 +744,7 @@ module Girl
     #
     def new_a_redir( redir_port )
       redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      redir.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
       redir.bind( Socket.sockaddr_in( redir_port, '0.0.0.0' ) )
@@ -751,12 +778,12 @@ 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
 
-      puts "p#{ Process.pid } #{ Time.new } new a rsv to #{ Addrinfo.new( to_addr ).inspect }"
+      # puts "debug new a rsv to #{ Addrinfo.new( to_addr ).inspect }"
 
       @rsv_infos[ rsv ] = {
         src_addr: src_addr,
@@ -778,23 +805,25 @@ module Girl
 
       # puts "debug new atun and btun"
       atun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      atun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         atun.connect_nonblock( @ctl_info[ :atund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }, close atun"
+        puts "p#{ Process.pid } #{ Time.new } connect atund #{ e.class }"
         atun.close
         return
       end
 
       btun = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      btun.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         btun.connect_nonblock( @ctl_info[ :btund_addr ] )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }, close btun"
+        puts "p#{ Process.pid } #{ Time.new } connect btund #{ e.class }"
         btun.close
         return
       end
@@ -803,7 +832,7 @@ module Girl
       atun_wbuff = [ dst_id ].pack( 'n' )
 
       until src_info[ :rbuff ].empty? do
-        data = src_info[ :rbuff ][ 0, 65535 ]
+        data = src_info[ :rbuff ][ 0, CHUNK_SIZE ]
         data_size = data.bytesize
         # puts "debug move src.rbuff #{ data_size } to atun.wbuff"
         atun_wbuff << pack_a_chunk( data )
@@ -861,7 +890,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 }"
@@ -869,6 +898,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
     #
@@ -882,14 +922,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
 
     ##
@@ -934,7 +972,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( 65535 )
+      dotr.read_nonblock( READ_SIZE )
 
       if @ctl_info && @ctl_info[ :closing ] then
         send_ctlmsg( [ CTL_FIN ].pack( 'C' ) )
@@ -995,7 +1033,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
 
@@ -1039,6 +1077,8 @@ module Girl
         destination_port: dest_port, # 目的地端口
         rbuff: '',                   # 读到的流量
         dst: nil,                    # :direct的场合，对应的dst
+        dst_created_at: nil,         # :direct的场合，对应的dst的创建时间
+        dst_connected: false,        # :direct的场合，对应的dst是否已连接
         ctl: nil,                    # :tunnel的场合，对应的ctl
         atun: nil,                   # :tunnel的场合，对应的atun
         btun: nil,                   # :tunnel的场合，对应的btun
@@ -1076,7 +1116,7 @@ module Girl
 
       case ctl_num
       when TUND_PORT then
-        return if @ctl_info[ :atund_addr ] || data.size != 5
+        return if @ctl_info[ :atund_addr ] || data.bytesize != 5
         atund_port, btund_port = data[ 1, 4 ].unpack( 'nn' )
         puts "p#{ Process.pid } #{ Time.new } got tund port #{ atund_port } #{ btund_port }"
         @ctl_info[ :resends ].delete( [ HELLO ].pack( 'C' ) )
@@ -1090,14 +1130,14 @@ module Girl
           @pending_srcs.clear
         end
       when PAIRED then
-        return if data.size != 11
+        return if data.bytesize != 11
         src_id, dst_id = data[ 1, 10 ].unpack( 'Q>n' )
         # puts "debug got paired #{ src_id } #{ dst_id }"
         @ctl_info[ :resends ].delete( [ A_NEW_SOURCE, src_id ].pack( 'CQ>' ) )
         @ctl_info[ :last_recv_at ] = Time.new
         new_tuns( src_id, dst_id )
       when UNKNOWN_CTL_ADDR then
-        puts "p#{ Process.pid } #{ Time.new } got unknown ctl addr, close ctl"
+        puts "p#{ Process.pid } #{ Time.new } got unknown ctl addr"
         close_ctl( ctl )
       end
     end
@@ -1114,7 +1154,7 @@ module Girl
       src_info = @src_infos[ src ]
 
       begin
-        data = src.read_nonblock( 65535 )
+        data = src.read_nonblock( CHUNK_SIZE )
       rescue IO::WaitReadable
         print 'r'
         return
@@ -1176,7 +1216,7 @@ module Girl
       src = dst_info[ :src ]
 
       begin
-        data = dst.read_nonblock( 65535 )
+        data = dst.read_nonblock( CHUNK_SIZE )
       rescue IO::WaitReadable
         print 'r'
         return
@@ -1341,6 +1381,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 ]
 
       # 写前为空，处理关闭写
@@ -1371,7 +1417,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/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
 
     ##
@@ -49,7 +49,7 @@ module Girl
     # quit!
     #
     def quit!
-      # puts "debug1 exit"
+      # puts "debug exit"
       exit
     end
 
@@ -82,7 +82,7 @@ module Girl
     # close dst
     #
     def close_dst( dst )
-      # puts "debug1 close dst"
+      # puts "debug close dst"
       dst.close
       @reads.delete( dst )
       @roles.delete( dst )
@@ -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"
+      # puts "debug 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
 
     ##
@@ -162,7 +165,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 ) }
@@ -175,9 +178,9 @@ module Girl
     #
     def read_resolvd( resolvd )
       data, addrinfo, rflags, *controls = resolvd.recvmsg
-      # puts "debug1 resolvd recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
+      # puts "debug 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
 
     ##
@@ -185,10 +188,10 @@ module Girl
     #
     def read_dst( dst )
       data, addrinfo, rflags, *controls = dst.recvmsg
-      # puts "debug1 dst recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
+      # puts "debug 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