girl 9.1.2 → 9.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 673184bfb0785b65e56e4715c2b007481ae91d16620fbc11e3f6e12c50f511b5
-  data.tar.gz: 9a37c381bbf266cac12239b479214979202a8b715a1db0c5f443f8ecd3ca046a
+  metadata.gz: 336d5a273c06df15d5c88139e32066b3c9a574bcc97fcf9c1690cb7aeb8034e7
+  data.tar.gz: 339782aa3b87b31535897ccf5c4201cbfa2b53487625de16bccef9123ae71fad
 SHA512:
-  metadata.gz: d291af3cfc1ff8813e187062a55b93ad9f0c6a52f7bd14e19c4638becd98c96451da21146a167111c5da01d2f20b6fc31711143e71d82e82bf5cf68d8e420efb
-  data.tar.gz: 9a6e13e0f756afd3a024f7c7c386fd18e5978488bd1909fd69dbabffacd25e71d8d0c286920ec86665ed69766cee1464ba1d4a8fcab94055fdf82d405392d96b
+  metadata.gz: 8c478838350d1862edcfd99d629f4c88d09d892816f73f6505ec567ba481d2774ee05dfbd018055629b4b709c55e2a0cf2b1f7ee8025d09c1d05ac7d0be621f3
+  data.tar.gz: 95202954f953df2d1de2d53d9c4cfb8d4ed73d393e7f9d5b2418c9391bdbefea4e0294dc3c54d277519db789be211528232496a47899fc5a208e0e72f1a23883

data/lib/girl/dns.rb

@@ -1,46 +1,46 @@
 module Girl
   module Dns
     
-    def pack_a_query( domain, type = 1 )
+    def pack_a_query(domain, type = 1)
       # https://www.ietf.org/rfc/rfc1035.txt
       # https://www.ietf.org/rfc/rfc3596.txt
       raise "domain may not exceed 255 chars" if domain.bytesize > 255
       raise "invalid domain" if domain =~ /[^\w\.\-]/
-      data = [ rand( 65_535 ), 1, 0, 1, 0, 0, 0 ].pack( 'nCCnnnn' )
-      data << [ pack_domain( domain ), type, 1 ].pack( 'a*nn' )
+      data = [rand(65_535), 1, 0, 1, 0, 0, 0].pack('nCCnnnn')
+      data << [pack_domain(domain), type, 1].pack('a*nn')
       data
     end
   
-    def pack_domain( domain )
+    def pack_domain(domain)
       data = ''
   
-      domain.split( '.' ).each do | label |
+      domain.split('.').each do |label|
         raise "label may not exceed 63 chars" if label.bytesize > 63
-        data << [ label.bytesize, label ].pack( 'Ca*' )
+        data << [label.bytesize, label].pack('Ca*')
       end
   
-      data << [ 0 ].pack( 'C' )
+      data << [0].pack('C')
       data
     end
   
-    def seek_dn( data, offset )
+    def seek_dn(data, offset)
       name = ""
       datalen = data.bytesize
   
       loop do
-        raise "offset is greater than datalen" if datalen < ( offset + 1 )
+        raise "offset is greater than datalen" if datalen < (offset + 1)
   
-        len = data.unpack( "@#{ offset } C" ).first
+        len = data.unpack("@#{offset} C").first
   
         if len == 0
           offset += 1
           break
-        elsif ( len & 0xC0 ) == 0xC0
-          raise "data ended before offset expand" if datalen < ( offset + 2 )
+        elsif (len & 0xC0) == 0xC0
+          raise "data ended before offset expand" if datalen < (offset + 2)
   
-          ptr = data.unpack( "@#{ offset } n" ).first
+          ptr = data.unpack("@#{offset} n").first
           ptr &= 0x3FFF
-          name2 = seek_dn( data, ptr ).first
+          name2 = seek_dn(data, ptr).first
           raise "data is malformed" if name2.nil?
   
           name += name2
@@ -48,89 +48,86 @@ module Girl
           break
         else
           offset += 1
-          raise "no expansion found" if datalen < ( offset + len )
+          raise "no expansion found" if datalen < (offset + len)
   
-          elem = data[ offset..offset + len - 1 ]
-          name += "#{ elem }."
+          elem = data[offset..offset + len - 1]
+          name += "#{elem}."
           offset += len
         end
       end
   
-      [ name, offset ]
+      [name, offset]
     end
   
-    def seek_ip( data )
+    def seek_ip(data)
       ip = nil
-      answer_count = data.unpack( "@6 n" ).first
-      # puts "debug answer count #{ answer_count }"
-      offset = seek_question( data )
-      # puts "debug offset #{ offset }"
+      answer_count = data.unpack("@6 n").first
+      # puts "debug answer count #{answer_count}"
+      offset = seek_question(data)
+      # puts "debug offset #{offset}"
   
       answer_count.times do
-        ip, offset = seek_rr_ip( data, offset )
-  
-        if ip then
-          break
-        end
+        ip, offset = seek_rr_ip(data, offset)
+        break if ip
       end
   
       ip
     end
   
-    def seek_question( data )
+    def seek_question(data)
       offset = 12
   
       loop do
-        len = data.unpack( "@#{ offset } C" ).first
-        # puts "debug len #{ len } #{ data[ offset + 1, len ] }"
+        len = data.unpack("@#{offset} C").first
+        # puts "debug len #{len} #{data[offset + 1, len]}"
         break if len == 0
-        offset += ( 1 + len )
+        offset += (1 + len)
       end
   
       offset += 5
       offset
     end
 
-    def seek_question_dn( data )
-      id = data[ 0, 2 ]
+    def seek_question_dn(data)
+      id = data[0, 2]
       parts = []
       offset = 12
   
       loop do
-        len = data.unpack( "@#{ offset } C" ).first
-        # puts "debug len #{ len } #{ data[ offset + 1, len ] }"
+        len = data.unpack("@#{offset} C").first
+        # puts "debug len #{len} #{data[offset + 1, len]}"
         break if len == 0
-        parts << data[ offset + 1, len ]
-        offset += ( 1 + len )
+        parts << data[offset + 1, len]
+        offset += (1 + len)
       end
       
-      type = data.unpack( "@#{ offset + 1 } n" ).first
-      # puts "debug id #{ id.inspect } dn #{ parts.join( '.' ).inspect } type #{ type }"
-      [ id, parts.join( '.' ), type ]
+      type = data.unpack("@#{offset + 1} n").first
+      # puts "debug id #{id.inspect} dn #{parts.join('.').inspect} type #{type}"
+      [id, parts.join('.'), type]
     end
   
-    def seek_rr_ip( data, offset )
+    def seek_rr_ip(data, offset)
       ip = nil
-      name, offset = seek_dn( data, offset )
-      # puts "debug seek_dn #{ name }, #{ offset }"
-      type = data.unpack( "@#{ offset } n" ).first
-      # puts "debug type #{ type }"
+      name, offset = seek_dn(data, offset)
+      # puts "debug seek_dn #{name}, #{offset}"
+      type = data.unpack("@#{offset} n").first
+      # puts "debug type #{type}"
       offset += 8
-      rdlen = data.unpack( "@#{ offset } n" ).first
-      # puts "debug rdlen #{ rdlen }"
+      rdlen = data.unpack("@#{offset} n").first
+      # puts "debug rdlen #{rdlen}"
       offset += 2
   
-      if type == 1 then
+      if type == 1
         raise "rdlen not 4?" if rdlen != 4
-        a, b, c, d = data.unpack( "@#{ offset } CCCC" )
-        ip = "#{ a }.#{ b }.#{ c }.#{ d }"
-      elsif type == 28 then
-        tokens = data.unpack("@#{ offset } n8")
-        ip = format( "%x:%x:%x:%x:%x:%x:%x:%x", *tokens )
+        a, b, c, d = data.unpack("@#{offset} CCCC")
+        ip = "#{a}.#{b}.#{c}.#{d}"
+      elsif type == 28
+        tokens = data.unpack("@#{offset} n8")
+        ip = format("%x:%x:%x:%x:%x:%x:%x:%x", *tokens)
       end
   
       offset += rdlen
-      [ ip, offset ]
+      [ip, offset]
     end
 
   end

data/lib/girl/head.rb

@@ -2,11 +2,10 @@ module Girl
   BACKLOG              = 512              # 听队列大小，满后掉SYN包
   RLIMIT               = 1024             # sock数上限
   READ_SIZE            = 4 * 1024 * 1024  # 一次读多少
-  WBUFF_LIMIT          = 30 * 1024 * 1024 # 写前上限，超过上限暂停读
-  RESUME_BELOW         = WBUFF_LIMIT / 2  # 降到多少以下恢复读
-  CLOSE_ABOVE          = WBUFF_LIMIT * 3  # 超过多少强制关闭
+  WBUFF_LIMIT          = 10 * 1024 * 1024 # 写前上限，超过上限暂停读另一头
+  CLOSE_ABOVE          = 30 * 1024 * 1024 # 超过多少强制关闭
   HEARTBEAT_INTERVAL   = 10               # 心跳间隔
-  CHECK_TRAFF_INTERVAL = 3600             # 检查今天是否是流量计数重置日间隔
+  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.rb

@@ -1,4 +1,3 @@
-require 'fileutils'
 require 'girl/dns'
 require 'girl/head'
 require 'girl/proxy_worker'
@@ -14,81 +13,68 @@ require 'socket'
 module Girl
   class Proxy
 
-    def initialize( config_path = nil )
-      unless config_path then
-        config_path = File.expand_path( '../girl.conf.json', __FILE__ )
-      end
-
-      raise "missing config file #{ config_path }" unless File.exist?( config_path )
-
-      conf = JSON.parse( IO.binread( config_path ), symbolize_names: true )
-      puts "load #{ config_path } #{ conf.inspect }"
-      redir_host = conf[ :redir_host ]
-      redir_port = conf[ :redir_port ]
-      memd_port = conf[ :memd_port ]
-      relayd_host = conf[ :relayd_host ]
-      relayd_port = conf[ :relayd_port ]
-      tspd_host = conf[ :tspd_host ]
-      tspd_port = conf[ :tspd_port ]
-      proxyd_host = conf[ :proxyd_host ]
-      proxyd_port = conf[ :proxyd_port ]
-      nameserver = conf[ :nameserver ]
-      im = conf[ :im ]
-      direct_path = conf[ :direct_path ]
-      remote_path = conf[ :remote_path ]
-      appd_host = conf[ :appd_host ]
-      appd_port = conf[ :appd_port ]
-      head_len = conf[ :head_len ]               # 头长度
-      h_a_new_source = conf[ :h_a_new_source ]   # A
-      h_a_new_p2 = conf[ :h_a_new_p2 ]           # B
-      h_dst_close = conf[ :h_dst_close ]         # D
-      h_heartbeat = conf[ :h_heartbeat ]         # H
-      h_p1_close = conf[ :h_p1_close ]           # I
-      h_p2_close = conf[ :h_p2_close ]           # J
-      h_p2_traffic = conf[ :h_p2_traffic ]       # K
-      h_p1_overflow = conf[ :h_p1_overflow ]     # L
-      h_p1_underhalf = conf[ :h_p1_underhalf ]   # M
-      h_p2_overflow = conf[ :h_p2_overflow ]     # N
-      h_p2_underhalf = conf[ :h_p2_underhalf ]   # O
-      h_query = conf[ :h_query ]                 # Q
-      h_response = conf[ :h_response ]           # R
-      h_src_close = conf[ :h_src_close ]         # S
-      h_traffic = conf[ :h_traffic ]             # T
-      h_src_overflow = conf[ :h_src_overflow ]   # U
-      h_src_underhalf = conf[ :h_src_underhalf ] # V
-      h_dst_overflow = conf[ :h_dst_overflow ]   # W
-      h_dst_underhalf = conf[ :h_dst_underhalf ] # X
-      expire_connecting = conf[ :expire_connecting ]     # 连接多久没有建成关闭（秒）
-      expire_long_after = conf[ :expire_long_after ]     # 长连接多久没有新流量关闭（秒）
-      expire_proxy_after = conf[ :expire_proxy_after ]   # proxy多久没有收到流量重建（秒）
-      expire_resolv_cache = conf[ :expire_resolv_cache ] # dns查询结果缓存多久（秒）
-      expire_short_after = conf[ :expire_short_after ]   # 短连接创建多久后关闭（秒）
-      is_debug = conf[ :is_debug ]
+    def initialize(config_path = nil)
+      config_path = File.expand_path('../girl.conf.json', __FILE__) unless config_path
+      raise "missing config file #{config_path}" unless File.exist?(config_path)
+
+      conf = JSON.parse(IO.binread(config_path), symbolize_names: true)
+      puts "load #{config_path} #{conf.inspect}"
+      redir_host = conf[:redir_host]
+      redir_port = conf[:redir_port]
+      memd_port = conf[:memd_port]
+      tspd_host = conf[:tspd_host]
+      tspd_port = conf[:tspd_port]
+      proxyd_host = conf[:proxyd_host]
+      proxyd_port = conf[:proxyd_port]
+      bigd_port = conf[:bigd_port]
+      nameserver = conf[:nameserver]
+      im = conf[:im]
+      direct_path = conf[:direct_path]
+      remote_path = conf[:remote_path]
+      appd_host = conf[:appd_host]
+      appd_port = conf[:appd_port]
+      head_len = conf[:head_len]               # 头长度
+      h_a_new_source = conf[:h_a_new_source]   # A
+      h_a_new_p2 = conf[:h_a_new_p2]           # B
+      h_dst_close = conf[:h_dst_close]         # D
+      h_heartbeat = conf[:h_heartbeat]         # H
+      h_p1_close = conf[:h_p1_close]           # I
+      h_p2_close = conf[:h_p2_close]           # J
+      h_p2_traffic = conf[:h_p2_traffic]       # K
+      h_query = conf[:h_query]                 # Q
+      h_response = conf[:h_response]           # R
+      h_src_close = conf[:h_src_close]         # S
+      h_traffic = conf[:h_traffic]             # T
+      expire_connecting = conf[:expire_connecting]     # 连接多久没有建成关闭（秒）
+      expire_long_after = conf[:expire_long_after]     # 长连接多久没有新流量关闭（秒）
+      expire_proxy_after = conf[:expire_proxy_after]   # proxy多久没有收到流量重建（秒）
+      expire_resolv_cache = conf[:expire_resolv_cache] # dns查询结果缓存多久（秒）
+      expire_short_after = conf[:expire_short_after]   # 短连接创建多久后关闭（秒）
+      is_debug = conf[:is_debug]
 
       redir_host = redir_host ? redir_host.to_s : '0.0.0.0'
       redir_port = redir_port ? redir_port.to_i : 6666
-      memd_port = memd_port ? memd_port.to_i : redir_port + 1
-      relayd_host = relayd_host ? relayd_host.to_s : '0.0.0.0'
-      relayd_port = relayd_port ? relayd_port.to_i : redir_port + 2
+      memd_port = memd_port ? memd_port.to_i : redir_port + 2
       tspd_host = tspd_host ? tspd_host.to_s : '0.0.0.0'
       tspd_port = tspd_port ? tspd_port.to_i : 7777
       raise "missing proxyd host" unless proxyd_host
       proxyd_port = proxyd_port ? proxyd_port.to_i : 6060
+      bigd_port = bigd_port ? bigd_port.to_i : proxyd_port + 1
       nameserver = '114.114.114.114' unless nameserver
-      nameservers = nameserver.split( ' ' )
+      nameservers = nameserver.split(' ')
       im = 'office-pc' unless im
       directs = []
 
-      if direct_path then
-        raise "not found direct file #{ direct_path }" unless File.exist?( direct_path )
-        directs = ( RESERVED_ROUTE.split( "\n" ) + IO.binread( direct_path ).split( "\n" ) ).map{ | line | IPAddr.new( line.strip ) }
+      if direct_path
+        raise "not found direct file #{direct_path}" unless File.exist?(direct_path)
+        directs = (RESERVED_ROUTE.split("\n") + IO.binread(direct_path).split("\n")).map{|line| IPAddr.new(line.strip)}
       end
 
       remotes = []
 
-      if remote_path then
-        raise "not found remote file #{ remote_path }" unless File.exist?( remote_path )
-        remotes = IO.binread( remote_path ).split( "\n" ).map{ | line | line.strip }
+      if remote_path
+        raise "not found remote file #{remote_path}" unless File.exist?(remote_path)
+        remotes = IO.binread(remote_path).split("\n").map{|line| line.strip}
       end
 
       appd_host = appd_host ? appd_host.to_s : '127.0.0.1'
@@ -101,18 +87,10 @@ module Girl
       h_p1_close = h_p1_close ? h_p1_close.to_s : 'I'
       h_p2_close = h_p2_close ? h_p2_close.to_s : 'J'
       h_p2_traffic = h_p2_traffic ? h_p2_traffic.to_s : 'K'
-      h_p1_overflow = h_p1_overflow ? h_p1_overflow.to_s : 'L'
-      h_p1_underhalf = h_p1_underhalf ? h_p1_underhalf.to_s : 'M'
-      h_p2_overflow = h_p2_overflow ? h_p2_overflow.to_s : 'N'
-      h_p2_underhalf = h_p2_underhalf ? h_p2_underhalf.to_s : 'O'
       h_query = h_query ? h_query.to_s : 'Q'
       h_response = h_response ? h_response.to_s : 'R'
       h_src_close = h_src_close ? h_src_close.to_s : 'S'
       h_traffic = h_traffic ? h_traffic.to_s : 'T'
-      h_src_overflow = h_src_overflow ? h_src_overflow.to_s : 'U'
-      h_src_underhalf = h_src_underhalf ? h_src_underhalf.to_s : 'V'
-      h_dst_overflow = h_dst_overflow ? h_dst_overflow.to_s : 'W'
-      h_dst_underhalf = h_dst_underhalf ? h_dst_underhalf.to_s : 'X'
       expire_connecting = expire_connecting ? expire_connecting.to_i : 5
       expire_long_after = expire_long_after ? expire_long_after.to_i : 3600
       expire_proxy_after = expire_proxy_after ? expire_proxy_after.to_i : 60
@@ -120,41 +98,34 @@ module Girl
       expire_short_after = expire_short_after ? expire_short_after.to_i : 5
       is_client_fastopen = is_server_fastopen = false
 
-      if RUBY_PLATFORM.include?( 'linux' ) then
-        IO.popen( 'sysctl -n net.ipv4.tcp_fastopen' ) do | io |
+      if RUBY_PLATFORM.include?('linux')
+        IO.popen('sysctl -n net.ipv4.tcp_fastopen') do |io|
           output = io.read
           val = output.to_i % 4
-
-          if [ 1, 3 ].include?( val ) then
-            is_client_fastopen = true
-          end
-
-          if [ 2, 3 ].include?( val ) then
-            is_server_fastopen = true
-          end
+          is_client_fastopen = true if [1, 3].include?(val)
+          is_server_fastopen = true if [2, 3].include?(val)
         end
       end
 
-      puts "girl proxy #{ Girl::VERSION } #{ im } #{ redir_port } #{ relayd_port } #{ tspd_port }"
-      puts "#{ proxyd_host } #{ proxyd_port } #{ appd_host } #{ appd_port } #{ nameservers.inspect } #{ is_client_fastopen } #{ is_server_fastopen }"
-      puts "#{ direct_path } #{ directs.size } directs"
-      puts "#{ remote_path } #{ remotes.size } remotes"
+      puts "girl proxy #{Girl::VERSION} #{im} #{redir_port} #{tspd_port}"
+      puts "#{proxyd_host} #{proxyd_port} #{appd_host} #{appd_port} #{nameservers.inspect} #{is_client_fastopen} #{is_server_fastopen}"
+      puts "#{direct_path} #{directs.size} directs"
+      puts "#{remote_path} #{remotes.size} remotes"
 
-      if %w[ darwin linux ].any?{ | plat | RUBY_PLATFORM.include?( plat ) } then
-        Process.setrlimit( :NOFILE, RLIMIT )
-        puts "NOFILE #{ Process.getrlimit( :NOFILE ).inspect }"
+      if %w[darwin linux].any?{|plat| RUBY_PLATFORM.include?(plat)}
+        Process.setrlimit(:NOFILE, RLIMIT)
+        puts "NOFILE #{Process.getrlimit(:NOFILE).inspect}"
       end
 
       worker = Girl::ProxyWorker.new(
         redir_host,
         redir_port,
         memd_port,
-        relayd_host,
-        relayd_port,
         tspd_host,
         tspd_port,
         proxyd_host,
         proxyd_port,
+        bigd_port,
         nameservers,
         im,
         directs,
@@ -169,18 +140,10 @@ module Girl
         h_p1_close,
         h_p2_close,
         h_p2_traffic,
-        h_p1_overflow,
-        h_p1_underhalf,
-        h_p2_overflow,
-        h_p2_underhalf,
         h_query,
         h_response,
         h_src_close,
         h_traffic,
-        h_src_overflow,
-        h_src_underhalf,
-        h_dst_overflow,
-        h_dst_underhalf,
         expire_connecting,
         expire_long_after,
         expire_proxy_after,
@@ -188,9 +151,9 @@ module Girl
         expire_short_after,
         is_debug,
         is_client_fastopen,
-        is_server_fastopen )
+        is_server_fastopen)
 
-      Signal.trap( :TERM ) do
+      Signal.trap(:TERM) do
         puts 'exit'
         worker.quit!
       end