girl 9.1.4 → 9.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 336d5a273c06df15d5c88139e32066b3c9a574bcc97fcf9c1690cb7aeb8034e7
-  data.tar.gz: 339782aa3b87b31535897ccf5c4201cbfa2b53487625de16bccef9123ae71fad
+  metadata.gz: a169cd643cb853f29ec9046ac36d027d6ee58dcd0dcda253b631f5a62cb710a6
+  data.tar.gz: 47dd11c75a7ab9138d5ac8cc1a724c32dd1b4277077f9399fd81ef80662138b6
 SHA512:
-  metadata.gz: 8c478838350d1862edcfd99d629f4c88d09d892816f73f6505ec567ba481d2774ee05dfbd018055629b4b709c55e2a0cf2b1f7ee8025d09c1d05ac7d0be621f3
-  data.tar.gz: 95202954f953df2d1de2d53d9c4cfb8d4ed73d393e7f9d5b2418c9391bdbefea4e0294dc3c54d277519db789be211528232496a47899fc5a208e0e72f1a23883
+  metadata.gz: 49c302c5096078a4dd2bcd91d6d8ec161e6d61153f043d47f8f9fb98a84fb8b6c7d0ce151f1fbd78406d7c6ecdecc0dc5814f4f7a9323ab3502d4c89973b1628
+  data.tar.gz: 34b61c00f9732ee0001435acd00d3006b5f3e995a2cc153476878dea745bc92e18e7e51eeb93de7c09bd82fdce37ba2323a3abbce87ad8e5f66750fa73c3dd67

data/lib/girl/head.rb

@@ -1,11 +1,11 @@
 module Girl
-  BACKLOG              = 512              # 听队列大小，满后掉SYN包
-  RLIMIT               = 1024             # sock数上限
-  READ_SIZE            = 4 * 1024 * 1024  # 一次读多少
-  WBUFF_LIMIT          = 10 * 1024 * 1024 # 写前上限，超过上限暂停读另一头
-  CLOSE_ABOVE          = 30 * 1024 * 1024 # 超过多少强制关闭
-  HEARTBEAT_INTERVAL   = 10               # 心跳间隔
-  CHECK_TRAFF_INTERVAL = 3600             # 多久检查一次，今天是不是流量计数重置日
+  BACKLOG              = 512               # 听队列大小，满后掉SYN包
+  RLIMIT               = 1024              # sock数上限
+  READ_SIZE            = 1 * 1024 * 1024   # 一次最多读多少
+  WBUFF_LIMIT          = 10 * 1024 * 1024  # 写前上限，超过上限暂停读另一头
+  CLOSE_ABOVE          = 100 * 1024 * 1024 # 超过多少强制关闭
+  HEARTBEAT_INTERVAL   = 10                # 心跳间隔
+  CHECK_TRAFF_INTERVAL = 3600              # 多久检查一次，今天是不是流量计数重置日
   HTTP_OK = "HTTP/1.1 200 OK\r\n\r\n"
   RESERVED_ROUTE = <<EOF
 0.0.0.0/8

data/lib/girl/proxy_worker.rb

@@ -37,7 +37,6 @@ module Girl
       is_debug,
       is_client_fastopen,
       is_server_fastopen)
-
       @proxyd_host = proxyd_host
       @proxyd_addr = Socket.sockaddr_in(proxyd_port, proxyd_host)
       @bigd_addr = Socket.sockaddr_in(bigd_port, proxyd_host)
@@ -47,7 +46,7 @@ module Girl
       @remotes = remotes
       @local_ips = Socket.ip_address_list.select{|info| info.ipv4?}.map{|info| info.ip_address}
       @update_roles = [:dns, :dst, :mem, :p1, :src, :rsv] # 参与淘汰的角色
-      @updates_limit = 1008  # 淘汰池上限，1015(mac) - info, infod, memd, proxy, redir, rsvd, tspd
+      @updates_limit = 1008  # 淘汰池上限，1015(mac) - [info infod memd proxy redir rsvd tspd]
       @eliminate_count = 0   # 淘汰次数
       @reads = []            # 读池
       @writes = []           # 写池
@@ -61,13 +60,12 @@ module Girl
       @dns_infos = {}        # dns => {:domain :src}
       @rsv_infos = {}        # rsv => {:addrinfo :domain :type}
       @near_infos = {}       # near_id => {:addrinfo :created_at :domain :id :type}
-      @resolv_caches = {}    # domain => [ip, created_at]
+      @resolv_caches = {}    # domain => [ip created_at]
       @is_direct_caches = {} # ip => true / false
-      @response_caches = {}  # domain => [response, created_at, ip, is_remote]
-      @response6_caches = {} # domain => [response, created_at, ip, is_remote]
+      @response_caches = {}  # domain => [response created_at ip is_remote]
+      @response6_caches = {} # domain => [response created_at ip is_remote]
       @p1_infos = {}         # p1 => {:closing :connected :in :is_big :overflowing :p2_id :wbuff}
       @appd_addr = Socket.sockaddr_in(appd_port, appd_host)
-
       @head_len = head_len
       @h_a_new_source = h_a_new_source
       @h_a_new_p2 = h_a_new_p2
@@ -88,7 +86,6 @@ module Girl
       @is_debug = is_debug
       @is_client_fastopen = is_client_fastopen
       @is_server_fastopen = is_server_fastopen
-
       new_a_redir(redir_host, redir_port)
       new_a_infod(redir_port)
       new_a_memd(memd_port)
@@ -173,7 +170,7 @@ module Girl
     private
 
     def add_big_wbuff(data)
-      return if @big.nil? || @big.closed? || data.nil? || data.empty?
+      return if @big.closed? || data.nil? || data.empty?
       big_info = @big_infos[@big]
       big_info[:wbuff] << data
       bytesize = big_info[:wbuff].bytesize
@@ -187,19 +184,10 @@ module Girl
       if !big_info[:overflowing] && (bytesize >= WBUFF_LIMIT)
         puts "big overflow"
         big_info[:overflowing] = true
-        
-        @src_infos.select{|_, info| info[:is_big]}.each do |src, info|
-          puts "pause src #{info[:destination_domain]}"
-          @reads.delete(src)
-        end
-
-        @p1_infos.select{|_, info| info[:is_big]}.each do |p1, info|
-          puts "pause p1 #{info[:p2_id]}"
-          @reads.delete(p1)
-        end
       end
 
       add_write(@big)
+      big_info[:overflowing]
     end
 
     def add_dst_wbuff(dst, data)
@@ -1169,12 +1157,6 @@ module Girl
       end
 
       set_update(p1)
-
-      if @proxy.closed?
-        close_p1(p1)
-        return
-      end
-
       p1_info = @p1_infos[p1]
       p1_info[:in] += data.bytesize
       p2_id = p1_info[:p2_id]
@@ -1187,8 +1169,23 @@ module Girl
       data = pack_p2_traffic(p2_id, data)
       
       if p1_info[:is_big]
-        add_big_wbuff(data)
+        if @big.closed?
+          close_p1(p1)
+          return
+        end
+
+        overflowing = add_big_wbuff(data)
+
+        if overflowing
+          puts "big overflowing pause p1 #{p2_id}"
+          @reads.delete(p1)
+        end
       else
+        if @proxy.closed?
+          close_p1(p1)
+          return
+        end
+
         add_proxy_wbuff(data)
       end
     end
@@ -1497,19 +1494,34 @@ module Girl
         end
       when :remote
         src_info[:in] += data.bytesize
+        src_id = src_info[:src_id]
         domain = src_info[:destination_domain]
 
         if !src_info[:is_big] && (src_info[:in] >= READ_SIZE)
-          puts "set src is big #{domain}"
+          puts "set src is big #{src_id} #{domain}"
           src_info[:is_big] = true
         end
 
-        src_id = src_info[:src_id]
         data = pack_traffic(src_id, data)
 
         if src_info[:is_big]
-          add_big_wbuff(data)
+          if @big.closed?
+            close_src(src)
+            return
+          end
+
+          overflowing = add_big_wbuff(data)
+
+          if overflowing
+            puts "big overflowing pause src #{src_id} #{domain}"
+            @reads.delete(src)
+          end
         else
+          if @proxy.closed?
+            close_src(src)
+            return
+          end
+
           add_proxy_wbuff(data)
         end
       when :direct
@@ -1772,7 +1784,7 @@ module Girl
         big_info[:overflowing] = false
 
         @src_infos.select{|_, info| info[:is_big]}.each do |src, info|
-          puts "resume src #{info[:destination_domain]}"
+          puts "resume src #{info[:src_id]} #{info[:destination_domain]}"
           add_read(src)
         end
 
@@ -1976,8 +1988,9 @@ module Girl
       src_info[:wbuff] = data
 
       if src_info[:wbuff].empty? && src_info[:overflowing]
+        src_id = src_info[:src_id]
         domain = src_info[:destination_domain]
-        puts "src empty #{domain}"
+        puts "src empty #{src_id} #{domain}"
         src_info[:overflowing] = false
 
         if src_info[:proxy_type] == :direct

data/lib/girl/proxyd_worker.rb

@@ -29,11 +29,10 @@ module Girl
       expire_short_after,
       is_debug,
       is_server_fastopen)
-
       @nameserver_addrs = nameservers.map{|n| Socket.sockaddr_in(53, n)}
       @reset_traff_day = reset_traff_day
       @update_roles = [:big, :dns, :dst, :mem, :p2, :proxy, :rsv] # 参与淘汰的角色
-      @updates_limit = 1011 - ims.size # 淘汰池上限，1015(mac) - info, infod, memd, proxyd, p2ds(=ims)
+      @updates_limit = 1010 - ims.size # 淘汰池上限，1015(mac) - [bigd info infod memd proxyd] - p2ds
       @eliminate_count = 0 # 淘汰次数
       @reads = []          # 读池
       @writes = []         # 写池
@@ -42,15 +41,14 @@ module Girl
       @proxy_infos = {}    # proxy => {:addrinfo :im :rbuff :wbuff}
       @big_infos = {}      # big => {:addrinfo :im :overflowing :rbuff :wbuff}
       @im_infos = {}       # im => {:addrinfo :big :big_connect_at :in :out :p2d :p2d_host :p2d_port :proxy :proxy_connect_at}
-      @src_infos = {}      # src_id => {:created_at, :dst :im :rbuff}
+      @src_infos = {}      # src_id => {:created_at :dst :im :rbuff}
       @mem_infos = {}      # mem => {:wbuff}
       @dst_infos = {}      # dst => {:closing :connected :domain :im :in :ip :is_big :overflowing :port :rbuffs :src_id :wbuff}
       @dns_infos = {}      # dns => {:domain :im :port :src_id}
       @rsv_infos = {}      # rsv => {:domain :im :near_id}
-      @resolv_caches = {}  # domain => [:ip :created_at]
+      @resolv_caches = {}  # domain => [ip created_at]
       @p2d_infos = {}      # p2d => {:im}
       @p2_infos = {}       # p2 => {:addrinfo :closing :im :in :is_big :overflowing :p2_id :wbuff}
-
       @head_len = head_len
       @h_a_new_source = h_a_new_source
       @h_a_new_p2 = h_a_new_p2
@@ -69,7 +67,6 @@ module Girl
       @expire_short_after = expire_short_after
       @is_debug = is_debug
       @is_server_fastopen = is_server_fastopen
-
       init_im_infos(ims, p2d_host, p2d_port)
       new_a_proxyd(proxyd_port)
       new_a_bigd(bigd_port)
@@ -164,19 +161,10 @@ module Girl
       if !big_info[:overflowing] && (bytesize >= WBUFF_LIMIT)
         puts "big overflow #{im}"
         big_info[:overflowing] = true
-        
-        @dst_infos.select{|_, info| (info[:im] == im) && info[:is_big]}.each do |dst, info|
-          puts "pause dst #{info[:domain]}"
-          @reads.delete(dst)
-        end
-
-        @p2_infos.select{|_, info| (info[:im] == im) && info[:is_big]}.each do |p2, info|
-          puts "pause p2 #{info[:p2_id]}"
-          @reads.delete(p2)
-        end
       end
 
       add_write(big)
+      big_info[:overflowing]
     end
 
     def add_dst_wbuff(dst, data)
@@ -450,10 +438,9 @@ module Girl
         im_info = @im_infos[im]
 
         if im_info
-          proxy = im_info[:proxy]
           puts "add h_p2_close #{im} #{p2_id}"
           msg = "#{@h_p2_close}#{[p2_id].pack('Q>')}"
-          add_proxy_wbuff(proxy, pack_a_chunk(msg))
+          add_proxy_wbuff(im_info[:proxy], pack_a_chunk(msg))
         end
       end
 
@@ -693,7 +680,7 @@ module Girl
         im: im,
         in: 0,
         ip: ip,
-        is_big: false, # 收来的流量是否是大流量
+        is_big: false, # 是否收流量大户
         overflowing: false,
         port: port,
         rbuffs: [],
@@ -969,9 +956,11 @@ module Girl
       dst_info = @dst_infos[dst]
       dst_info[:in] += data.bytesize
       im = dst_info[:im]
+      src_id = dst_info[:src_id]
+      domain = dst_info[:domain]
 
       if !dst_info[:is_big] && (dst_info[:in] >= READ_SIZE)
-        puts "set dst is big #{im} #{dst_info[:domain]}"
+        puts "set dst is big #{im} #{src_id} #{domain}"
         dst_info[:is_big] = true
       end
 
@@ -983,14 +972,30 @@ module Girl
       end
 
       im_info[:in] += data.bytesize
-      src_id = dst_info[:src_id]
       data = pack_traffic(src_id, data)
 
       if dst_info[:is_big]
         big = im_info[:big]
-        add_big_wbuff(big, data)
+
+        if big.nil? || big.closed?
+          close_dst(dst)
+          return
+        end
+
+        overflowing = add_big_wbuff(big, data)
+
+        if overflowing
+          puts "big overflowing pause dst #{src_id} #{domain}"
+          @reads.delete(dst)
+        end
       else
         proxy = im_info[:proxy]
+
+        if proxy.nil? || proxy.closed?
+          close_dst(dst)
+          return
+        end
+
         add_proxy_wbuff(proxy, data)
       end
     end
@@ -1127,9 +1132,26 @@ module Girl
 
       if p2_info[:is_big]
         big = im_info[:big]
-        add_big_wbuff(big, data)
+
+        if big.nil? || big.closed?
+          close_p2(p2)
+          return
+        end
+
+        overflowing = add_big_wbuff(big, data)
+
+        if overflowing
+          puts "big overflowing pause p2 #{p2_id}"
+          @reads.delete(p2)
+        end
       else
         proxy = im_info[:proxy]
+
+        if proxy.nil? || proxy.closed?
+          close_p2(p2)
+          return
+        end
+
         add_proxy_wbuff(proxy, data)
       end
     end
@@ -1152,7 +1174,7 @@ module Girl
         closing: false,
         im: im,
         in: 0,
-        is_big: false, # 收来的流量是否是大流量
+        is_big: false, # 是否收流量大户
         overflowing: false,
         p2_id: p2_id,
         wbuff: ''
@@ -1160,10 +1182,9 @@ module Girl
       add_read(p2, :p2)
       im_info = @im_infos[im]
       return unless im_info
-      proxy = im_info[:proxy]
       puts "add h_a_new_p2 #{im} #{p2_id}"
       msg = "#{@h_a_new_p2}#{[p2_id].pack('Q>')}"
-      add_proxy_wbuff(proxy, pack_a_chunk(msg))
+      add_proxy_wbuff(im_info[:proxy], pack_a_chunk(msg))
     end
 
     def read_rsv(rsv)
@@ -1184,6 +1205,12 @@ module Girl
 
         if im_info
           proxy = im_info[:proxy]
+
+          if proxy.nil? || proxy.closed?
+            close_rsv(rsv)
+            return
+          end
+
           near_id = rsv_info[:near_id]
           puts "add h_response #{im} #{near_id} #{rsv_info[:domain]} #{data.bytesize}" if @is_debug
           msg = "#{@h_response}#{[near_id].pack('Q>')}#{data}"
@@ -1454,7 +1481,7 @@ module Girl
         big_info[:overflowing] = false
 
         @dst_infos.select{|_, info| (info[:im] == im) && info[:is_big]}.each do |dst, info|
-          puts "resume dst #{info[:domain]}"
+          puts "resume dst #{info[:src_id]} #{info[:domain]}"
           add_read(dst)
         end
 
@@ -1507,10 +1534,11 @@ module Girl
       
       data = data[written..-1]
       dst_info[:wbuff] = data
+      src_id = dst_info[:src_id]
       domain = dst_info[:domain]
 
       if dst_info[:wbuff].empty? && dst_info[:overflowing]
-        puts "dst empty #{im} #{domain}"
+        puts "dst empty #{im} #{src_id} #{domain}"
         dst_info[:overflowing] = false
 
         if big

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '9.1.4'.freeze
+  VERSION = '9.1.5'.freeze
 end

metadata

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