girl 0.93.0 → 0.98.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db00d3852751d26d014f0db01a04a8a3c4d7a43681003dc7b5a61b5af3f42db7
-  data.tar.gz: 1938878b1125a8868aa1415a3c9200cf9003dc4310665ebcd7d51aba5871358a
+  metadata.gz: a0201dd1519345fc7a831c89a0a8ab139d2fa96d66da2545fcfd1de9102bbe23
+  data.tar.gz: e529faf1d41f6d80074eed26519c0fef85a092058dc74a936e17c067ce3a6f1b
 SHA512:
-  metadata.gz: 6764a6e73718d396b02bac36d0d078741a659cfa1a32de13ef41183b4ed67b98be92e60a4d284abbdc3ee7ce929e872860f9aa7eab7caf715c3371c858eb6553
-  data.tar.gz: 1945f2f6bc976654fe9542df2c8145ab983aa16ebdad0100a8893948a4cf076bf7e4851813fbfd459b78601c66bfd1e5fe120d29808b329e1558375509fe4e9c
+  metadata.gz: eec9fbcfa84d537bf1c9a301f2974ac5d2b3b3a0b6a4614d071b39c329faf8800e168afa618851a083a3bfc1df0770bb8da7252457394b6f3a1b02778fdae293
+  data.tar.gz: 37dc3789f90c73e6116a15cce0b37b1532f6c2b250996e8db0b0b1ad21ffb8d9a7909b6d06218c20574026f3730b134a0383dc348cad12c5ff56fe5897df420a

data/lib/girl/head.rb

@@ -5,6 +5,8 @@ module Girl
   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查询结果缓存多久过期
@@ -27,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

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
                    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

@@ -13,6 +13,7 @@ module Girl
       @mutex = Mutex.new
       @reads = []
       @writes = []
+      @closing_srcs = []
       @roles = {}         # sock => :dotr / :proxy / :src / :dst / :tun / :stream
       @src_infos = {}     # src => {}
       @dst_infos = {}     # dst => {}
@@ -37,7 +38,6 @@ module Girl
         rs, ws = IO.select( @reads, @writes )
 
         @mutex.synchronize do
-          # 先读，再写，避免打上关闭标记后读到
           rs.each do | sock |
             case @roles[ sock ]
             when :dotr then
@@ -108,7 +108,7 @@ module Girl
     # add read
     #
     def add_read( sock, role = nil )
-      unless @reads.include?( sock ) then
+      if !sock.closed? && !@reads.include?( sock ) then
         @reads << sock
 
         if role then
@@ -121,7 +121,7 @@ module Girl
     # add src wbuff
     #
     def add_src_wbuff( src, data )
-      return if src.closed?
+      return if src.closed? || @closing_srcs.include?( src )
       src_info = @src_infos[ src ]
       src_info[ :wbuff ] << data
       src_info[ :last_recv_at ] = Time.new
@@ -167,7 +167,7 @@ module Girl
     # add write
     #
     def add_write( sock )
-      unless @writes.include?( sock ) then
+      if !sock.closed? && !@writes.include?( sock ) then
         @writes << sock
       end
     end
@@ -188,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
 
     ##
@@ -258,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,7 +295,6 @@ module Girl
     def close_tun( tun )
       # puts "debug1 close tun"
       close_sock( tun )
-      @tun_info[ :srcs ].each{ | _, src | set_src_closing( src ) }
     end
 
     ##
@@ -372,7 +399,7 @@ module Girl
             trigger = false
             now = Time.new
 
-            if @tun && !@tun.closed? then
+            if @tun && !@tun.closed? && !@tun_info[ :closing ] then
               last_recv_at = @tun_info[ :last_recv_at ] || @tun_info[ :created_at ]
 
               if @tun_info[ :srcs ].empty? && ( now - last_recv_at >= EXPIRE_AFTER ) then
@@ -482,7 +509,7 @@ module Girl
 
         Thread.new do
           SEND_HELLO_COUNT.times do | i |
-            if @tun.nil? || @tun.closed? || src.closed? || src_info[ :stream ] then
+            if @tun.nil? || @tun.closed? || @tun_info[ :closing ] || src.closed? || src_info[ :stream ] then
               # puts "debug1 break loop send a new source #{ src_info[ :dst_port ] }"
               break
             end
@@ -523,15 +550,12 @@ module Girl
       end
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
-      local_port = dst.local_address.ip_port
       dst_info = {
-        local_port: local_port, # 本地端口
-        src: src,               # 对应src
-        domain: domain,         # 目的地
-        wbuff: '',              # 写前，从src读到的流量
-        paused: false,          # 是否已暂停读
-        closing: false,         # 准备关闭
-        closing_write: false    # 准备关闭写
+        src: src,            # 对应src
+        domain: domain,      # 目的地
+        wbuff: '',           # 写前，从src读到的流量
+        paused: false,       # 是否已暂停读
+        closing_write: false # 准备关闭写
       }
 
       @dst_infos[ dst ] = dst_info
@@ -590,10 +614,11 @@ module Girl
 
       domain = src_info[ :destination_domain ]
       @stream_infos[ stream ] = {
-        src: src,       # 对应src
-        domain: domain, # 目的地
-        wbuff: data,    # 写前，写往远端streamd
-        paused: false   # 是否已暂停读
+        src: src,             # 对应src
+        domain: domain,       # 目的地
+        wbuff: data,          # 写前，写往远端streamd
+        paused: false,        # 是否已暂停读
+        closing_write: false  # 准备关闭写
       }
 
       src_info[ :dst_id ] = dst_id
@@ -657,7 +682,7 @@ module Girl
 
       Thread.new do
         SEND_HELLO_COUNT.times do | i |
-          if @tun.nil? || @tun.closed? || @tun_info[ :tund_addr ] then
+          if @tun.nil? || @tun.closed? || @tun_info[ :closing ] || @tun_info[ :tund_addr ] then
             # puts "debug1 break loop send hello"
             break
           end
@@ -725,12 +750,12 @@ module Girl
             unless src.closed? then
               puts "p#{ Process.pid } #{ Time.new } resolved #{ domain } #{ ip_info.ip_address }"
               deal_with_destination_ip( src, ip_info )
+              next_tick
             end
           else
             set_src_closing( src )
+            next_tick
           end
-
-          next_tick
         end
       end
     end
@@ -744,23 +769,15 @@ module Girl
       add_read( src )
     end
 
-    ##
-    # set dst closing
-    #
-    def set_dst_closing( dst )
-      return if dst.closed?
-      dst_info = @dst_infos[ dst ]
-      dst_info[ :closing ] = true
-      @reads.delete( dst )
-      add_write( dst )
-    end
-
     ##
     # set dst closing write
     #
     def set_dst_closing_write( dst )
       return if dst.closed?
+
       dst_info = @dst_infos[ dst ]
+      return if dst_info[ :closing_write ]
+
       dst_info[ :closing_write ] = true
       add_write( dst )
     end
@@ -769,19 +786,22 @@ module Girl
     # set src is closing
     #
     def set_src_closing( src )
-      return if src.closed?
+      return if src.closed? || @closing_srcs.include?( src )
       @reads.delete( src )
-      src_info = @src_infos[ src ]
-      src_info[ :closing ] = true
-      add_write( src )
+      @writes.delete( src )
+      @closing_srcs << src
+      add_write( @tun ) if @tun
     end
 
     ##
     # set src closing write
     #
     def set_src_closing_write( src )
-      return if src.closed?
+      return if src.closed? || @closing_srcs.include?( src )
+
       src_info = @src_infos[ src ]
+      return if src_info[ :closing_write ]
+
       src_info[ :closing_write ] = true
       add_write( src )
     end
@@ -790,10 +810,6 @@ module Girl
     # set src proxy type tunnel
     #
     def set_src_proxy_type_tunnel( src )
-      if @tun.nil? || @tun.closed? then
-        new_a_tun
-      end
-
       src_info = @src_infos[ src ]
       src_info[ :proxy_type ] = :tunnel
       src_id = src_info[ :id ]
@@ -806,23 +822,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[ :closing_write ]
+
       stream_info[ :closing_write ] = true
       add_write( stream )
     end
@@ -831,10 +839,11 @@ module Girl
     # set tun is closing
     #
     def set_tun_closing
-      return if @tun.closed?
+      return if @tun.closed? || @tun_info[ :closing ]
       @tun_info[ :closing ] = true
       @reads.delete( @tun )
       add_write( @tun )
+      @tun_info[ :srcs ].each{ | _, src | set_src_closing( src ) }
     end
 
     ##
@@ -893,11 +902,14 @@ module Girl
         last_recv_at: nil,       # 上一次收到新流量（由dst收到，或者由stream收到）的时间
         last_sent_at: nil,       # 上一次发出流量（由dst发出，或者由stream发出）的时间
         paused: false,           # 是否已暂停读
-        closing: false,          # 准备关闭
         closing_write: false     # 准备关闭写
       }
 
       add_read( src, :src )
+
+      if @tun.nil? || @tun.closed? then
+        new_a_tun
+      end
     end
 
     ##
@@ -961,6 +973,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
@@ -1164,6 +1178,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
@@ -1186,6 +1202,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
@@ -1211,6 +1229,11 @@ module Girl
     #
     def write_tun( tun )
       # 处理关闭
+      if @closing_srcs.any? then
+        @closing_srcs.each{ | src | close_src( src ) }
+        @closing_srcs.clear
+      end
+
       if @tun_info[ :closing ] then
         close_tun( tun )
         return
@@ -1246,27 +1269,6 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
       dst = src_info[ :dst ]
-
-      # 处理关闭
-      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
-
-      # 处理wbuff
       data = src_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -1312,19 +1314,6 @@ module Girl
       return if dst.closed?
       dst_info = @dst_infos[ dst ]
       src = dst_info[ :src ]
-
-      # 处理关闭
-      if dst_info[ :closing ] then
-        close_dst( dst )
-
-        if src then
-          close_read_src( src )
-          set_src_closing_write( src )
-        end
-
-        return
-      end
-
       data = dst_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -1367,15 +1356,6 @@ module Girl
       return if stream.closed?
       stream_info = @stream_infos[ stream ]
       src = stream_info[ :src ]
-
-      # 处理关闭
-      if stream_info[ :closing ] then
-        close_stream( stream )
-        close_read_src( src )
-        set_src_closing_write( src )
-        return
-      end
-
       data = stream_info[ :wbuff ]
 
       # 写前为空，处理关闭写

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,28 @@ 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
+      @closing_dsts = []
+      @closing_streamds = []
+      @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,18 +35,20 @@ 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 )
 
         @mutex.synchronize do
-          # 先读，再写，避免打上关闭标记后读到
           rs.each do | sock |
             case @roles[ sock ]
             when :dotr then
               read_dotr( sock )
             when :proxyd then
               read_proxyd( sock )
+            when :infod then
+              read_infod( sock )
             when :tund then
               read_tund( sock )
             when :tcpd then
@@ -113,7 +120,7 @@ module Girl
     # add read
     #
     def add_read( sock, role = nil )
-      unless @reads.include?( sock ) then
+      if !sock.closed? && !@reads.include?( sock ) then
         @reads << sock
 
         if role then
@@ -122,11 +129,32 @@ module Girl
       end
     end
 
+    ##
+    # add streamd wbuff
+    #
+    def add_streamd_wbuff( streamd, data )
+      return if streamd.closed? || @closing_streamds.include?( streamd )
+      streamd_info = @streamd_infos[ streamd ]
+      streamd_info[ :wbuff ] << data
+      add_write( streamd )
+
+      if streamd_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        dst = streamd_info[ :dst ]
+        dst_info = @dst_infos[ dst ]
+
+        unless dst_info[ :paused ] then
+          puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :domain_port ] }"
+          dst_info[ :paused ] = true
+          @reads.delete( dst )
+        end
+      end
+    end
+
     ##
     # add write
     #
     def add_write( sock )
-      unless @writes.include?( sock ) then
+      if !sock.closed? && !@writes.include?( sock ) then
         @writes << sock
       end
     end
@@ -137,7 +165,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 +231,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
 
     ##
@@ -210,7 +250,6 @@ module Girl
       tcpd = tund_info[ :tcpd ]
       close_sock( tcpd )
       @tcpd_infos.delete( tcpd )
-      tund_info[ :dsts ].each{ | _, dst | set_dst_closing( dst ) }
       @tunneling_tunds.delete( tund_info[ :tun_addr ] )
     end
 
@@ -270,10 +309,12 @@ module Girl
       end
 
       dst_id = dst.local_address.ip_port
+      tund_info = @tund_infos[ tund ]
 
       @dst_infos[ dst ] = {
         id: dst_id,               # id
         tund: tund,               # 对应tund
+        im: tund_info[ :im ],     # 标识
         domain_port: domain_port, # 目的地和端口
         rbuff: '',                # 对应的streamd没准备好，暂存读到的流量
         streamd: nil,             # 对应的streamd
@@ -283,13 +324,11 @@ module Girl
         last_recv_at: nil,        # 上一次收到新流量（由streamd收到）的时间
         last_sent_at: nil,        # 上一次发出流量（由streamd发出）的时间
         paused: false,            # 是否已暂停读
-        closing: false,           # 准备关闭
         closing_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
 
@@ -328,12 +367,14 @@ module Girl
             now = Time.new
 
             @tund_infos.each do | tund, tund_info |
-              last_recv_at = tund_info[ :last_recv_at ] || tund_info[ :created_at ]
-
-              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
+              unless tund_info[ :closing ] then
+                last_recv_at = tund_info[ :last_recv_at ] || tund_info[ :created_at ]
+
+                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
+                end
               end
             end
 
@@ -395,6 +436,27 @@ module Girl
       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
     #
@@ -412,6 +474,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
     #
@@ -487,19 +561,23 @@ module Girl
     # set dst closing
     #
     def set_dst_closing( dst )
-      return if dst.closed?
-      dst_info = @dst_infos[ dst ]
-      dst_info[ :closing ] = true
+      return if dst.closed? || @closing_dsts.include?( dst )
       @reads.delete( dst )
-      add_write( dst )
+      @writes.delete( dst )
+      @closing_dsts << dst
+      dst_info = @dst_infos[ dst ]
+      add_write( dst_info[ :tund ] )
     end
 
     ##
     # set dst closing write
     #
     def set_dst_closing_write( dst )
-      return if dst.closed?
+      return if dst.closed? || @closing_dsts.include?( dst )
+
       dst_info = @dst_infos[ dst ]
+      return if dst_info[ :closing_write ]
+
       dst_info[ :closing_write ] = true
       add_write( dst )
     end
@@ -508,19 +586,23 @@ module Girl
     # set streamd closing
     #
     def set_streamd_closing( streamd )
-      return if streamd.closed?
-      streamd_info = @streamd_infos[ streamd ]
-      streamd_info[ :closing ] = true
+      return if streamd.closed? || @closing_streamds.include?( streamd )
       @reads.delete( streamd )
-      add_write( streamd )
+      @writes.delete( streamd )
+      @closing_streamds << streamd
+      streamd_info = @streamd_infos[ streamd ]
+      add_write( streamd_info[ :tund ] )
     end
 
     ##
     # set streamd closing write
     #
     def set_streamd_closing_write( streamd )
-      return if streamd.closed?
+      return if streamd.closed? || @closing_streamds.include?( streamd )
+
       streamd_info = @streamd_infos[ streamd ]
+      return if streamd_info[ :closing_write ]
+
       streamd_info[ :closing_write ] = true
       add_write( streamd )
     end
@@ -530,10 +612,14 @@ module Girl
     #
     def set_tund_closing( tund )
       return if tund.closed?
+
       tund_info = @tund_infos[ tund ]
+      return if tund_info[ :closing ]
+
       tund_info[ :closing ] = true
       @reads.delete( tund )
       add_write( tund )
+      tund_info[ :dsts ].each{ | _, dst | set_dst_closing( dst ) }
     end
 
     ##
@@ -565,6 +651,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
@@ -578,6 +671,7 @@ module Girl
       add_read( tcpd, :tcpd )
 
       tund_info = {
+        im: im,               # 标识
         port: tund_port,      # 端口
         tcpd: tcpd,           # 对应的tcpd
         tcpd_port: tcpd_port, # tcpd端口
@@ -601,6 +695,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
     #
@@ -662,6 +778,8 @@ module Girl
     # read tcpd
     #
     def read_tcpd( tcpd )
+      return if tcpd.closed?
+
       begin
         streamd, addrinfo = tcpd.accept_nonblock
       rescue IO::WaitReadable, Errno::EINTR
@@ -672,13 +790,16 @@ 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
-        domain_port: nil, # dst的目的地和端口
-        wbuff: '',        # 写前，写往近端stream
-        paused: false     # 是否已暂停读
+        tund: tund,           # 对应tund
+        im: tund_info[ :im ], # 标识
+        dst: nil,             # 对应dst
+        domain_port: nil,     # dst的目的地和端口
+        wbuff: '',            # 写前，写往近端stream
+        paused: false,        # 是否已暂停读
+        closing_write: false  # 准备关闭写
       }
 
       add_read( streamd, :streamd )
@@ -688,6 +809,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
@@ -702,6 +825,7 @@ module Girl
       end
 
       dst_info = @dst_infos[ dst ]
+      @traff_ins[ dst_info[ :im ] ] += data.bytesize
       streamd = dst_info[ :streamd ]
 
       if streamd then
@@ -709,14 +833,7 @@ module Girl
           streamd_info = @streamd_infos[ streamd ]
           data = @custom.encode( data )
           # puts "debug2 add streamd.wbuff encoded #{ data.bytesize }"
-          streamd_info[ :wbuff ] << data
-          add_write( streamd )
-
-          if streamd_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-            puts "p#{ Process.pid } #{ Time.new } pause dst #{ dst_info[ :domain_port ] }"
-            dst_info[ :paused ] = true
-            @reads.delete( dst )
-          end
+          add_streamd_wbuff( streamd, data )
         end
       else
         dst_info[ :rbuff ] << data
@@ -732,6 +849,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
@@ -746,6 +865,7 @@ module Girl
       end
 
       streamd_info = @streamd_infos[ streamd ]
+      @traff_ins[ streamd_info[ :im ] ] += data.bytesize
       dst = streamd_info[ :dst ]
 
       unless dst then
@@ -772,7 +892,8 @@ module Girl
 
         unless dst_info[ :rbuff ].empty? then
           # puts "debug1 encode and move dst.rbuff to streamd.wbuff"
-          streamd_info[ :wbuff ] << @custom.encode( dst_info[ :rbuff ] )
+          data2 = @custom.encode( dst_info[ :rbuff ] )
+          add_streamd_wbuff( streamd, data2 )
         end
 
         dst_info[ :streamd ] = streamd
@@ -781,7 +902,7 @@ module Girl
         return if data.empty?
       end
 
-      unless dst.closed? then
+      if !dst.closed? && !@closing_dsts.include?( dst ) then
         dst_info = @dst_infos[ dst ]
         data = @custom.decode( data )
         # puts "debug2 add dst.wbuff decoded #{ data.bytesize }"
@@ -824,6 +945,16 @@ module Girl
       tund_info = @tund_infos[ tund ]
 
       # 处理关闭
+      if @closing_dsts.any? then
+        @closing_dsts.each{ | dst | close_dst( dst ) }
+        @closing_dsts.clear
+      end
+
+      if @closing_streamds.any? then
+        @closing_streamds.each{ | streamd | close_streamd( streamd ) }
+        @closing_streamds.clear
+      end
+
       if tund_info[ :closing ] then
         if tund_info[ :changed_tun_addr ] then
           data = [ 0, IP_CHANGED ].pack( 'Q>C' )
@@ -862,19 +993,6 @@ module Girl
       return if dst.closed?
       dst_info = @dst_infos[ dst ]
       streamd = dst_info[ :streamd ]
-
-      # 处理关闭
-      if dst_info[ :closing ] then
-        close_dst( dst )
-
-        if streamd then
-          close_read_streamd( streamd )
-          set_streamd_closing_write( streamd )
-        end
-
-        return
-      end
-
       data = dst_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -904,6 +1022,7 @@ module Girl
       # puts "debug2 written dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ :wbuff ] = data
+      @traff_outs[ dst_info[ :im ] ] += written
     end
 
     ##
@@ -913,19 +1032,6 @@ module Girl
       return if streamd.closed?
       streamd_info = @streamd_infos[ streamd ]
       dst = streamd_info[ :dst ]
-
-      # 处理关闭
-      if streamd_info[ :closing ] then
-        close_streamd( streamd )
-
-        if dst then
-          close_read_dst( dst )
-          set_dst_closing_write( dst )
-        end
-
-        return
-      end
-
       data = streamd_info[ :wbuff ]
 
       # 写前为空，处理关闭写
@@ -955,6 +1061,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.93.0'.freeze
+  VERSION = '0.98.0'.freeze
 end

metadata

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