girl 0.90.0 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e1916068595360e4ab83189c93759e2c6ed05979d4a4128ff83f95390e91dce
-  data.tar.gz: 9f39d67731002186f66f04e4bb463834980a243fc0d6322b5e35f749fa356f95
+  metadata.gz: 995e842429be7063ce5e29248927b336029f2e4dc864e4855979770d18ff7766
+  data.tar.gz: 83b4619a2b8cf5f99058282345478eee57a2b7638cefafa5a15d1d0170abfb96
 SHA512:
-  metadata.gz: 18e61543e05ae79c31ee76a8504cfcfef1271aa1419430ae667b46c8291dcc790630aa1123bc662ce817117a26b68ac343f5c7679134a3205548f32ba28cfb31
-  data.tar.gz: 797fa163ab50c3ace753ac833381bdeb040876c12de7d2b5570dbe0f3a799a91b18fa220ca5ea4ecbc8cfad69aabbd1dd245ad1bcd404b92423020890f5d38d1
+  metadata.gz: 349a7012c29fd90bae97816b1af481d25623f580969f3ec354c0b747c43aea805bba0b02f8ebb8e653427b12fa5af07584fc3566ddb67bd48fd04947b4386fcf
+  data.tar.gz: c078531bb08ed0568e28170336c2a10b8b22896b2138bfdc149d9f61758cae938816ea623f7b4e7bab89e48620c855c731c4c3fdb2485573f2706125e9602b7c

data/lib/girl/head.rb

@@ -1,9 +1,12 @@
 module Girl
   READ_SIZE             = 1024 * 1024       # 一次读多少
-  WBUFF_LIMIT           = 100 * 1024 * 1024 # 写前上限，超过上限暂停读src/dst
+  WBUFF_LIMIT           = 100 * 1024 * 1024 # 写前上限，超过上限暂停读
   RESUME_BELOW          = WBUFF_LIMIT / 2   # 降到多少以下恢复读
-  SEND_HELLO_COUNT      = 10                # hello最多发几次
+  SEND_HELLO_COUNT      = 10                # hello/a new source最多发几次
+  SEND_HELLO_INTERVAL   = 0.5               # 发送hello/a new source间隔
   EXPIRE_AFTER          = 300               # 多久没有新流量，过期
+  RESET_TRAFF_DAY       = 1                 # 流量计数重置日，0为不重置
+  CHECK_TRAFF_INTERVAL  = 86400             # 检查今天是否是流量计数重置日间隔
   CHECK_EXPIRE_INTERVAL = 30                # 检查过期间隔
   CHECK_RESUME_INTERVAL = 1                 # 检查恢复读间隔
   RESOLV_CACHE_EXPIRE   = 300               # dns查询结果缓存多久过期
@@ -26,6 +29,7 @@ module Girl
   CONTINUE              = 17
   IS_RESEND_READY       = 18
   RESEND_READY          = 19
+  TRAFF_INFOS           = 101
   HTTP_OK               = "HTTP/1.1 200 OK\r\n\r\n"
   # https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
   RESERVED_ROUTE = <<EOF
@@ -42,6 +46,7 @@ EOF
     WBUFF_LIMIT
     RESUME_BELOW
     SEND_HELLO_COUNT
+    SEND_HELLO_INTERVAL
     EXPIRE_AFTER
     CHECK_EXPIRE_INTERVAL
     CHECK_RESUME_INTERVAL

data/lib/girl/proxy.rb

@@ -20,21 +20,34 @@ proxyd-tun:
 
 Q>: 0 ctlmsg -> C: 1 tund port -> n: tund port -> n: tcpd port
 
+local-infod:
+
+C: 101 traff infos
+
+infod-local:
+
+C: 101 traff infos -> [ C: im len -> im -> Q>: traff in ->  Q>: traff out ]
+
 tun-tund:
 
-Q>: 0 ctlmsg -> C: 2 heartbeat       [not use]
+Q>: 0 ctlmsg -> C: 2 heartbeat
                    3 a new source    -> Q>: src id -> encoded destination address
                    4 paired          -> Q>: src id -> n: dst id
-                   5 dest status     [not use]
-                   6 source status   [not use]
-                   7 miss            [not use]
-                   8 fin1            [not use]
-                   9 confirm fin1    [not use]
-                  10 fin2            [not use]
-                  11 confirm fin2    [not use]
+                   5 dest status     NOT USE
+                   6 source status   NOT USE
+                   7 miss            NOT USE
+                   8 fin1            NOT USE
+                   9 confirm fin1    NOT USE
+                  10 fin2            NOT USE
+                  11 confirm fin2    NOT USE
                   12 tund fin
                   13 tun fin
                   14 tun ip changed
+                  15 single miss     NOT USE
+                  16 range miss      NOT USE
+                  17 continue        NOT USE
+                  18 is resend ready NOT USE
+                  19 resend ready    NOT USE
 =end
 
 module Girl
@@ -109,6 +122,10 @@ module Girl
       puts "im #{ im }"
       puts "worker count #{ worker_count }"
 
+      Girl::Custom.constants.each do | name |
+        puts "#{ name } #{ Girl::Custom.const_get( name ).inspect }"
+      end
+
       len = CONSTS.map{ | name | name.size }.max
 
       CONSTS.each do | name |

data/lib/girl/proxy_worker.rb

@@ -124,8 +124,28 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
       src_info[ :wbuff ] << data
-      add_write( src )
       src_info[ :last_recv_at ] = Time.new
+      add_write( src )
+
+      if src_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        dst = src_info[ :dst ]
+
+        if dst then
+          dst_info = @dst_infos[ dst ]
+          puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :domain ] }"
+          dst_info[ :paused ] = true
+          @reads.delete( dst )
+        else
+          stream = src_info[ :stream ]
+
+          if stream then
+            stream_info = @stream_infos[ stream ]
+            puts "p#{ Process.pid } #{ Time.new } pause stream #{ stream_info[ :domain ] }"
+            stream_info[ :paused ] = true
+            @reads.delete( stream )
+          end
+        end
+      end
     end
 
     ##
@@ -168,7 +188,10 @@ module Girl
     def close_dst( dst )
       # puts "debug1 close dst"
       close_sock( dst )
-      @dst_infos.delete( dst )
+      dst_info = @dst_infos.delete( dst )
+      src = dst_info[ :src ]
+      close_read_src( src )
+      set_src_closing_write( src )
     end
 
     ##
@@ -238,7 +261,32 @@ module Girl
     def close_src( src )
       # puts "debug1 close src"
       close_sock( src )
-      del_src_info( src )
+      src_info = del_src_info( src )
+      dst = src_info[ :dst ]
+
+      if dst then
+        close_read_dst( dst )
+        set_dst_closing_write( dst )
+      else
+        stream = src_info[ :stream ]
+
+        if stream then
+          close_read_stream( stream )
+          set_stream_closing_write( stream )
+        end
+      end
+    end
+
+    ##
+    # close stream
+    #
+    def close_stream( stream )
+      # puts "debug1 close stream"
+      close_sock( stream )
+      stream_info = @stream_infos.delete( stream )
+      src = stream_info[ :src ]
+      close_read_src( src )
+      set_src_closing_write( src )
     end
 
     ##
@@ -267,6 +315,7 @@ module Girl
         src_info = @src_infos[ src ]
       end
 
+      src_info[ :closed_write ] = true
       src_info
     end
 
@@ -287,6 +336,7 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
+      dst_info[ :closed_write ] = true
       dst_info
     end
 
@@ -307,6 +357,7 @@ module Girl
         stream_info = @stream_infos[ stream ]
       end
 
+      stream_info[ :closed_write ] = true
       stream_info
     end
 
@@ -333,7 +384,7 @@ module Girl
     def del_src_info( src )
       src_info = @src_infos.delete( src )
 
-      if src_info[ :stream ] && @tun && !@tun.closed? then
+      if ( src_info[ :proxy_type ] == :tunnel ) && @tun && !@tun.closed? then
         @tun_info[ :srcs ].delete( src_info[ :id ] )
       end
 
@@ -354,13 +405,17 @@ module Girl
 
             if @tun && !@tun.closed? then
               last_recv_at = @tun_info[ :last_recv_at ] || @tun_info[ :created_at ]
-              last_sent_at = @tun_info[ :last_sent_at ] || @tun_info[ :created_at ]
 
-              if @tun_info[ :srcs ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) && ( now - last_sent_at >= EXPIRE_AFTER ) then
+              if @tun_info[ :srcs ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) then
                 puts "p#{ Process.pid } #{ Time.new } expire tun"
                 set_tun_closing
-                trigger = true
+              else
+                # puts "debug1 #{ Time.new } heartbeat"
+                data = [ 0, HEARTBEAT ].pack( 'Q>C' )
+                add_ctlmsg( data )
               end
+
+              trigger = true
             end
 
             @src_infos.each do | src, src_info |
@@ -414,6 +469,30 @@ module Girl
               end
             end
 
+            @dst_infos.select{ | _, dst_info | dst_info[ :paused ] }.each do | dst, dst_info |
+              src = dst_info[ :src ]
+              src_info = @src_infos[ src ]
+
+              if src_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } src.wbuff below #{ RESUME_BELOW }, resume dst #{ dst_info[ :domain ] }"
+                dst_info[ :paused ] = false
+                add_read( dst )
+                trigger = true
+              end
+            end
+
+            @stream_infos.select{ | _, stream_info | stream_info[ :paused ] }.each do | stream, stream_info |
+              src = stream_info[ :src ]
+              src_info = @src_infos[ src ]
+
+              if src_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } src.wbuff below #{ RESUME_BELOW }, resume stream #{ stream_info[ :domain ] }"
+                stream_info[ :paused ] = false
+                add_read( stream )
+                trigger = true
+              end
+            end
+
             next_tick if trigger
           end
         end
@@ -448,7 +527,7 @@ module Girl
               next_tick
             end
 
-            sleep 1
+            sleep SEND_HELLO_INTERVAL
           end
         end
       end
@@ -469,7 +548,7 @@ module Girl
       rescue IO::WaitWritable
         # connect nonblock 必抛 wait writable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ e.class }, close src"
+        puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }, close src"
         set_src_closing( src )
         return
       end
@@ -479,11 +558,12 @@ module Girl
       dst_info = {
         local_port: local_port, # 本地端口
         src: src,               # 对应src
-        domain: domain,         # 域名
+        domain: domain,         # 目的地
         wbuff: '',              # 写前，从src读到的流量
+        paused: false,          # 是否已暂停读
         closing: false,         # 准备关闭
-        closing_read: false,    # 准备关闭读
-        closing_write: false    # 准备关闭写
+        closing_write: false,   # 准备关闭写
+        closed_write: false     # 已关闭写
       }
 
       @dst_infos[ dst ] = dst_info
@@ -540,9 +620,15 @@ module Girl
         data << @custom.encode( src_info[ :rbuff ] )
       end
 
+      domain = src_info[ :destination_domain ]
       @stream_infos[ stream ] = {
-        src: src,   # 对应src
-        wbuff: data # 写前，写往远端streamd
+        src: src,             # 对应src
+        domain: domain,       # 目的地
+        wbuff: data,          # 写前，写往远端streamd
+        paused: false,        # 是否已暂停读
+        closing: false,       # 准备关闭
+        closing_write: false, # 准备关闭写
+        closed_write: false   # 已关闭写
       }
 
       src_info[ :dst_id ] = dst_id
@@ -595,7 +681,6 @@ module Girl
         srcs: {},             # src_id => src
         created_at: Time.new, # 创建时间
         last_recv_at: nil,    # 上一次收到流量的时间
-        last_sent_at: nil,    # 上一次发出流量的时间
         closing: false        # 是否准备关闭
       }
 
@@ -621,7 +706,7 @@ module Girl
             next_tick
           end
 
-          sleep 1
+          sleep SEND_HELLO_INTERVAL
         end
       end
     end
@@ -701,8 +786,13 @@ module Girl
       return if dst.closed?
       dst_info = @dst_infos[ dst ]
       dst_info[ :closing ] = true
-      @reads.delete( dst )
-      add_write( dst )
+
+      if dst_info[ :closed_write ] then
+        add_read( dst )
+      else
+        @reads.delete( dst )
+        add_write( dst )
+      end
     end
 
     ##
@@ -710,7 +800,10 @@ module Girl
     #
     def set_dst_closing_write( dst )
       return if dst.closed?
+
       dst_info = @dst_infos[ dst ]
+      return if dst_info[ :closed_write ]
+
       dst_info[ :closing_write ] = true
       add_write( dst )
     end
@@ -720,10 +813,15 @@ module Girl
     #
     def set_src_closing( src )
       return if src.closed?
-      @reads.delete( src )
       src_info = @src_infos[ src ]
       src_info[ :closing ] = true
-      add_write( src )
+
+      if src_info[ :closed_write ] then
+        add_read( src )
+      else
+        @reads.delete( src )
+        add_write( src )
+      end
     end
 
     ##
@@ -731,7 +829,10 @@ module Girl
     #
     def set_src_closing_write( src )
       return if src.closed?
+
       src_info = @src_infos[ src ]
+      return if src_info[ :closed_write ]
+
       src_info[ :closing_write ] = true
       add_write( src )
     end
@@ -756,23 +857,15 @@ module Girl
       end
     end
 
-    ##
-    # set stream closing
-    #
-    def set_stream_closing( stream )
-      return if stream.closed?
-      stream_info = @stream_infos[ stream ]
-      stream_info[ :closing ] = true
-      @reads.delete( stream )
-      add_write( stream )
-    end
-
     ##
     # set stream closing write
     #
     def set_stream_closing_write( stream )
       return if stream.closed?
+
       stream_info = @stream_infos[ stream ]
+      return if stream_info[ :closed_write ]
+
       stream_info[ :closing_write ] = true
       add_write( stream )
     end
@@ -842,10 +935,10 @@ module Girl
         created_at: Time.new,    # 创建时间
         last_recv_at: nil,       # 上一次收到新流量（由dst收到，或者由stream收到）的时间
         last_sent_at: nil,       # 上一次发出流量（由dst发出，或者由stream发出）的时间
-        paused: false,           # 是否已暂停
+        paused: false,           # 是否已暂停读
         closing: false,          # 准备关闭
-        closing_read: false,     # 准备关闭读
-        closing_write: false     # 准备关闭写
+        closing_write: false,    # 准备关闭写
+        closed_write: false      # 已关闭写
       }
 
       add_read( src, :src )
@@ -863,10 +956,10 @@ module Girl
       end
 
       from_addr = addrinfo.to_sockaddr
-      @tun_info[ :last_recv_at ] = Time.new
       pack_id = data[ 0, 8 ].unpack( 'Q>' ).first
       return if pack_id != 0
 
+      @tun_info[ :last_recv_at ] = Time.new
       ctl_num = data[ 8 ].unpack( 'C' ).first
 
       case ctl_num
@@ -912,6 +1005,8 @@ module Girl
     # read src
     #
     def read_src( src )
+      return if src.closed?
+
       begin
         data = src.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
@@ -933,6 +1028,13 @@ module Girl
       end
 
       src_info = @src_infos[ src ]
+
+      # 处理关闭
+      if src_info[ :closing ] then
+        close_src( src )
+        return
+      end
+
       proxy_type = src_info[ :proxy_type ]
 
       case proxy_type
@@ -1065,7 +1167,7 @@ module Girl
             add_write( stream )
 
             if stream_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-              puts "p#{ Process.pid } #{ Time.new } pause tunnel src #{ src_info[ :id ] } #{ src_info[ :destination_domain ] }"
+              puts "p#{ Process.pid } #{ Time.new } pause tunnel src #{ src_info[ :destination_domain ] }"
               src_info[ :paused ] = true
               @reads.delete( src )
             end
@@ -1094,7 +1196,7 @@ module Girl
             add_write( dst )
 
             if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-              puts "p#{ Process.pid } #{ Time.new } pause direct src #{ src_info[ :id ] } #{ src_info[ :destination_domain ] }"
+              puts "p#{ Process.pid } #{ Time.new } pause direct src #{ src_info[ :destination_domain ] }"
               src_info[ :paused ] = true
               @reads.delete( src )
             end
@@ -1115,6 +1217,8 @@ module Girl
     # read dst
     #
     def read_dst( dst )
+      return if dst.closed?
+
       begin
         data = dst.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
@@ -1129,6 +1233,13 @@ module Girl
       end
 
       dst_info = @dst_infos[ dst ]
+
+      # 处理关闭
+      if dst_info[ :closing ] then
+        close_dst( dst )
+        return
+      end
+
       src = dst_info[ :src ]
       add_src_wbuff( src, data )
     end
@@ -1137,6 +1248,8 @@ module Girl
     # read stream
     #
     def read_stream( stream )
+      return if stream.closed?
+
       begin
         data = stream.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
@@ -1177,7 +1290,6 @@ module Girl
           @tun.sendmsg_nonblock( data, 0, to_addr )
         rescue IO::WaitWritable, Errno::EINTR
           puts "p#{ Process.pid } #{ Time.new } wait send ctlmsg, left #{ @tun_info[ :ctlmsgs ].size }"
-          @tun_info[ :last_sent_at ] = now
           return
         rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
           puts "p#{ Process.pid } #{ Time.new } sendmsg #{ e.class }, close tun"
@@ -1188,7 +1300,6 @@ module Girl
         @tun_info[ :ctlmsgs ].shift
       end
 
-      @tun_info[ :last_sent_at ] = now
       @writes.delete( tun )
     end
 
@@ -1203,19 +1314,6 @@ module Girl
       # 处理关闭
       if src_info[ :closing ] then
         close_src( src )
-
-        if dst then
-          close_read_dst( dst )
-          set_dst_closing_write( dst )
-        else
-          stream = src_info[ :stream ]
-
-          if stream then
-            close_read_stream( stream )
-            set_stream_closing_write( stream )
-          end
-        end
-
         return
       end
 
@@ -1269,12 +1367,6 @@ module Girl
       # 处理关闭
       if dst_info[ :closing ] then
         close_dst( dst )
-
-        if src then
-          close_read_src( src )
-          set_src_closing_write( src )
-        end
-
         return
       end
 
@@ -1324,8 +1416,6 @@ module Girl
       # 处理关闭
       if stream_info[ :closing ] then
         close_stream( stream )
-        close_read_src( src )
-        set_src_closing_write( src )
         return
       end
 

data/lib/girl/proxyd.rb

@@ -17,6 +17,7 @@ module Girl
         raise "not found config file #{ config_path }" unless File.exist?( config_path )
         conf = JSON.parse( IO.binread( config_path ), symbolize_names: true )
         proxyd_port = conf[ :proxyd_port ]
+        infod_port = conf[ :infod_port ]
         worker_count = conf[ :worker_count ]
       end
 
@@ -24,6 +25,10 @@ module Girl
         proxyd_port = 6060
       end
 
+      unless infod_port then
+        infod_port = 6070
+      end
+
       nprocessors = Etc.nprocessors
 
       if worker_count.nil? || worker_count <= 0 || worker_count > nprocessors then
@@ -33,8 +38,13 @@ module Girl
       title = "girl proxyd #{ Girl::VERSION }"
       puts title
       puts "proxyd port #{ proxyd_port }"
+      puts "infod port #{ infod_port }"
       puts "worker count #{ worker_count }"
 
+      Girl::Custom.constants.each do | name |
+        puts "#{ name } #{ Girl::Custom.const_get( name ).inspect }"
+      end
+
       len = CONSTS.map{ | name | name.size }.max
 
       CONSTS.each do | name |
@@ -47,7 +57,7 @@ module Girl
       worker_count.times do | i |
         workers << fork do
           $0 = 'girl proxyd worker'
-          worker = Girl::ProxydWorker.new( proxyd_port )
+          worker = Girl::ProxydWorker.new( proxyd_port, infod_port )
 
           Signal.trap( :TERM ) do
             puts "w#{ i } exit"

data/lib/girl/proxyd_worker.rb

@@ -4,23 +4,26 @@ module Girl
     ##
     # initialize
     #
-    def initialize( proxyd_port )
+    def initialize( proxyd_port, infod_port )
       @custom = Girl::ProxydCustom.new
       @mutex = Mutex.new
       @reads = []
       @writes = []
-      @roles = {}           # sock => :dotr / :proxyd / :dst / :tund / :tcpd / :streamd
+      @roles = {}           # sock => :dotr / :proxyd / :infod / :dst / :tund / :tcpd / :streamd
       @tund_infos = {}      # tund => {}
       @tcpd_infos = {}      # tcpd => {}
       @dst_infos = {}       # dst => {}
       @streamd_infos = {}   # streamd => {}
       @tunneling_tunds = {} # tunneling_addr => tund
       @resolv_caches = {}   # domain => [ ip, created_at ]
+      @traff_ins = {}       # im => 0
+      @traff_outs = {}      # im => 0
 
       dotr, dotw = IO.pipe
       @dotw = dotw
       add_read( dotr, :dotr )
       new_a_proxyd( proxyd_port )
+      new_a_infod( infod_port )
     end
 
     ##
@@ -30,6 +33,7 @@ module Girl
       puts "p#{ Process.pid } #{ Time.new } looping"
       loop_check_expire
       loop_check_resume
+      loop_check_traff
 
       loop do
         rs, ws = IO.select( @reads, @writes )
@@ -42,6 +46,8 @@ module Girl
               read_dotr( sock )
             when :proxyd then
               read_proxyd( sock )
+            when :infod then
+              read_infod( sock )
             when :tund then
               read_tund( sock )
             when :tcpd then
@@ -137,7 +143,13 @@ module Girl
     def close_dst( dst )
       # puts "debug1 close dst"
       close_sock( dst )
-      del_dst_info( dst )
+      dst_info = del_dst_info( dst )
+      streamd = dst_info[ :streamd ]
+
+      if streamd then
+        close_read_streamd( streamd )
+        set_streamd_closing_write( streamd )
+      end
     end
 
     ##
@@ -197,7 +209,13 @@ module Girl
     def close_streamd( streamd )
       # puts "debug1 close streamd"
       close_sock( streamd )
-      @streamd_infos.delete( streamd )
+      streamd_info = @streamd_infos.delete( streamd )
+      dst = streamd_info[ :dst ]
+
+      if dst then
+        close_read_dst( dst )
+        set_dst_closing_write( dst )
+      end
     end
 
     ##
@@ -231,6 +249,7 @@ module Girl
         dst_info = @dst_infos[ dst ]
       end
 
+      dst_info[ :closed_write ] = true
       dst_info
     end
 
@@ -251,6 +270,7 @@ module Girl
         streamd_info = @streamd_infos[ streamd ]
       end
 
+      streamd_info[ :closed_write ] = true
       streamd_info
     end
 
@@ -265,16 +285,18 @@ module Girl
         dst.connect_nonblock( destination_addr )
       rescue IO::WaitWritable
       rescue Exception => e
-        puts "p#{ Process.pid } #{ Time.new } connect destination #{ e.class }"
+        puts "p#{ Process.pid } #{ Time.new } connect destination #{ domain_port } #{ e.class }"
         return false
       end
 
       dst_id = dst.local_address.ip_port
+      tund_info = @tund_infos[ tund ]
 
       @dst_infos[ dst ] = {
         id: dst_id,               # id
         tund: tund,               # 对应tund
-        domain_port: domain_port, # 域名和端口
+        im: tund_info[ :im ],     # 标识
+        domain_port: domain_port, # 目的地和端口
         rbuff: '',                # 对应的streamd没准备好，暂存读到的流量
         streamd: nil,             # 对应的streamd
         wbuff: '',                # 从streamd读到的流量
@@ -282,15 +304,14 @@ module Girl
         created_at: Time.new,     # 创建时间
         last_recv_at: nil,        # 上一次收到新流量（由streamd收到）的时间
         last_sent_at: nil,        # 上一次发出流量（由streamd发出）的时间
-        paused: false,            # 是否已暂停
+        paused: false,            # 是否已暂停读
         closing: false,           # 准备关闭
-        closing_read: false,      # 准备关闭读
-        closing_write: false      # 准备关闭写
+        closing_write: false,     # 准备关闭写
+        closed_write: false       # 已关闭写
       }
 
       add_read( dst, :dst )
 
-      tund_info = @tund_infos[ tund ]
       tund_info[ :dst_ids ][ src_id ] = dst_id
       tund_info[ :dsts ][ dst_id ] = dst
 
@@ -330,9 +351,8 @@ module Girl
 
             @tund_infos.each do | tund, tund_info |
               last_recv_at = tund_info[ :last_recv_at ] || tund_info[ :created_at ]
-              last_sent_at = tund_info[ :last_sent_at ] || tund_info[ :created_at ]
 
-              if tund_info[ :dsts ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) && ( now - last_sent_at >= EXPIRE_AFTER ) then
+              if tund_info[ :dsts ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) then
                 puts "p#{ Process.pid } #{ Time.new } expire tund #{ tund_info[ :port ] }"
                 set_tund_closing( tund )
                 trigger = true
@@ -379,12 +399,45 @@ module Girl
               end
             end
 
+            @streamd_infos.select{ | _, streamd_info | streamd_info[ :paused ] }.each do | streamd, streamd_info |
+              dst = streamd_info[ :dst ]
+              dst_info = @dst_infos[ dst ]
+
+              if dst_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } resume streamd #{ streamd_info[ :domain_port ] }"
+                streamd_info[ :paused ] = false
+                add_read( streamd )
+                trigger = true
+              end
+            end
+
             next_tick if trigger
           end
         end
       end
     end
 
+    ##
+    # loop check traff
+    #
+    def loop_check_traff
+      if RESET_TRAFF_DAY > 0 then
+        Thread.new do
+          loop do
+            sleep CHECK_TRAFF_INTERVAL
+
+            @mutex.synchronize do
+              if Time.new.day == RESET_TRAFF_DAY then
+                puts "p#{ Process.pid } #{ Time.new } reset traffs"
+                @traff_ins.transform_values!{ | _ | 0 }
+                @traff_outs.transform_values!{ | _ | 0 }
+              end
+            end
+          end
+        end
+      end
+    end
+
     ##
     # new a proxyd
     #
@@ -402,6 +455,18 @@ module Girl
       add_read( proxyd, :proxyd )
     end
 
+    ##
+    # new a infod
+    #
+    def new_a_infod( infod_port )
+      infod = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+      infod.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+      infod.bind( Socket.sockaddr_in( infod_port, '127.0.0.1' ) )
+
+      puts "p#{ Process.pid } #{ Time.new } infod bind on #{ infod_port }"
+      add_read( infod, :infod )
+    end
+
     ##
     # next tick
     #
@@ -480,8 +545,13 @@ module Girl
       return if dst.closed?
       dst_info = @dst_infos[ dst ]
       dst_info[ :closing ] = true
-      @reads.delete( dst )
-      add_write( dst )
+
+      if dst_info[ :closed_write ] then
+        add_read( dst )
+      else
+        @reads.delete( dst )
+        add_write( dst )
+      end
     end
 
     ##
@@ -489,7 +559,10 @@ module Girl
     #
     def set_dst_closing_write( dst )
       return if dst.closed?
+
       dst_info = @dst_infos[ dst ]
+      return if dst_info[ :closed_write ]
+
       dst_info[ :closing_write ] = true
       add_write( dst )
     end
@@ -501,8 +574,13 @@ module Girl
       return if streamd.closed?
       streamd_info = @streamd_infos[ streamd ]
       streamd_info[ :closing ] = true
-      @reads.delete( streamd )
-      add_write( streamd )
+
+      if streamd_info[ :closed_write ] then
+        add_read( streamd )
+      else
+        @reads.delete( streamd )
+        add_write( streamd )
+      end
     end
 
     ##
@@ -510,7 +588,10 @@ module Girl
     #
     def set_streamd_closing_write( streamd )
       return if streamd.closed?
+
       streamd_info = @streamd_infos[ streamd ]
+      return if streamd_info[ :closed_write ]
+
       streamd_info[ :closing_write ] = true
       add_write( streamd )
     end
@@ -555,6 +636,13 @@ module Girl
         return
       end
 
+      im = data
+
+      unless @traff_ins.include?( im ) then
+        @traff_ins[ im ] = 0
+        @traff_outs[ im ] = 0
+      end
+
       tund = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       tund.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
       tund_port = tund.local_address.ip_port
@@ -568,6 +656,7 @@ module Girl
       add_read( tcpd, :tcpd )
 
       tund_info = {
+        im: im,               # 标识
         port: tund_port,      # 端口
         tcpd: tcpd,           # 对应的tcpd
         tcpd_port: tcpd_port, # tcpd端口
@@ -577,10 +666,7 @@ module Girl
         dst_ids: {},          # src_id => dst_id
         created_at: Time.new, # 创建时间
         last_recv_at: nil,    # 上一次收到流量的时间
-        last_sent_at: nil,    # 上一次发出流量的时间
         closing: false,       # 准备关闭
-        closing_read: false,  # 准备关闭读
-        closing_write: false, # 准备关闭写
         changed_tun_addr: nil # 记录到和tun addr不符的来源地址
       }
 
@@ -594,6 +680,28 @@ module Girl
       add_proxyd_ctlmsg_tund_port( tund_info )
     end
 
+    ##
+    # read infod
+    #
+    def read_infod( infod )
+      data, addrinfo, rflags, *controls = infod.recvmsg
+      ctl_num = data[ 0 ].unpack( 'C' ).first
+      # puts "debug1 infod recv #{ ctl_num } #{ addrinfo.inspect }"
+
+      case ctl_num
+      when TRAFF_INFOS then
+        data2 = [ TRAFF_INFOS ].pack( 'C' )
+
+        @traff_ins.keys.sort.each do | im |
+          traff_in = @traff_ins[ im ]
+          traff_out = @traff_outs[ im ]
+          data2 << [ [ im.bytesize ].pack( 'C' ), im, [ traff_in, traff_out ].pack( 'Q>Q>' ) ].join
+        end
+
+        send_data( infod, data2, addrinfo )
+      end
+    end
+
     ##
     # read tund
     #
@@ -616,10 +724,10 @@ module Girl
         return
       end
 
-      tund_info[ :last_recv_at ] = Time.new
       pack_id = data[ 0, 8 ].unpack( 'Q>' ).first
       return if pack_id != 0
 
+      tund_info[ :last_recv_at ] = Time.new
       ctl_num = data[ 8 ].unpack( 'C' ).first
 
       case ctl_num
@@ -665,11 +773,18 @@ module Girl
       # puts "debug1 accept a streamd"
       tcpd_info = @tcpd_infos[ tcpd ]
       tund = tcpd_info[ :tund ]
+      tund_info = @tund_infos[ tund ]
 
       @streamd_infos[ streamd ] = {
-        tund: tund, # 对应tund
-        dst: nil,   # 对应dst
-        wbuff: ''   # 写前，写往近端stream
+        tund: tund,           # 对应tund
+        im: tund_info[ :im ], # 标识
+        dst: nil,             # 对应dst
+        domain_port: nil,     # dst的目的地和端口
+        wbuff: '',            # 写前，写往近端stream
+        paused: false,        # 是否已暂停读
+        closing: false,       # 准备关闭
+        closing_write: false, # 准备关闭写
+        closed_write: false   # 已关闭写
       }
 
       add_read( streamd, :streamd )
@@ -679,6 +794,8 @@ module Girl
     # read dst
     #
     def read_dst( dst )
+      return if dst.closed?
+
       begin
         data = dst.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
@@ -693,6 +810,14 @@ module Girl
       end
 
       dst_info = @dst_infos[ dst ]
+
+      # 处理关闭
+      if dst_info[ :closing ] then
+        close_dst( dst )
+        return
+      end
+
+      @traff_ins[ dst_info[ :im ] ] += data.bytesize
       streamd = dst_info[ :streamd ]
 
       if streamd then
@@ -704,7 +829,7 @@ module Girl
           add_write( streamd )
 
           if streamd_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-            puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :id ] } #{ dst_info[ :domain_port ] }"
+            puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :domain_port ] }"
             dst_info[ :paused ] = true
             @reads.delete( dst )
           end
@@ -723,6 +848,8 @@ module Girl
     # read streamd
     #
     def read_streamd( streamd )
+      return if streamd.closed?
+
       begin
         data = streamd.read_nonblock( READ_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
@@ -737,6 +864,14 @@ module Girl
       end
 
       streamd_info = @streamd_infos[ streamd ]
+
+      # 处理关闭
+      if streamd_info[ :closing ] then
+        close_streamd( streamd )
+        return
+      end
+
+      @traff_ins[ streamd_info[ :im ] ] += data.bytesize
       dst = streamd_info[ :dst ]
 
       unless dst then
@@ -759,6 +894,7 @@ module Girl
         # puts "debug1 set streamd.dst #{ dst_id }"
         streamd_info[ :dst ] = dst
         dst_info = @dst_infos[ dst ]
+        streamd_info[ :domain_port ] = dst_info[ :domain_port ]
 
         unless dst_info[ :rbuff ].empty? then
           # puts "debug1 encode and move dst.rbuff to streamd.wbuff"
@@ -778,6 +914,12 @@ module Girl
         dst_info[ :wbuff ] << data
         dst_info[ :last_recv_at ] = Time.new
         add_write( dst )
+
+        if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+          puts "p#{ Process.pid } #{ Time.new } pause streamd #{ streamd_info[ :domain_port ] }"
+          streamd_info[ :paused ] = true
+          @reads.delete( streamd )
+        end
       end
     end
 
@@ -830,14 +972,12 @@ module Girl
           return
         elsif sent == :wait then
           puts "p#{ Process.pid } #{ Time.new } wait tund #{ tund_info[ :port ] } send ctlmsg, left #{ tund_info[ :ctlmsgs ].size }"
-          tund_info[ :last_sent_at ] = now
           return
         end
 
         tund_info[ :ctlmsgs ].shift
       end
 
-      tund_info[ :last_sent_at ] = now
       @writes.delete( tund )
     end
 
@@ -852,12 +992,6 @@ module Girl
       # 处理关闭
       if dst_info[ :closing ] then
         close_dst( dst )
-
-        if streamd then
-          close_read_streamd( streamd )
-          set_streamd_closing_write( streamd )
-        end
-
         return
       end
 
@@ -890,6 +1024,7 @@ module Girl
       # puts "debug2 written dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ :wbuff ] = data
+      @traff_outs[ dst_info[ :im ] ] += written
     end
 
     ##
@@ -903,12 +1038,6 @@ module Girl
       # 处理关闭
       if streamd_info[ :closing ] then
         close_streamd( streamd )
-
-        if dst then
-          close_read_dst( dst )
-          set_dst_closing_write( dst )
-        end
-
         return
       end
 
@@ -941,6 +1070,7 @@ module Girl
       # puts "debug2 written streamd #{ written }"
       data = data[ written..-1 ]
       streamd_info[ :wbuff ] = data
+      @traff_outs[ streamd_info[ :im ] ] += written
 
       if dst && !dst.closed? then
         dst_info = @dst_infos[ dst ]

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.90.0'.freeze
+  VERSION = '0.95.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.90.0
+  version: 0.95.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email: