girl 0.90.0 → 0.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e1916068595360e4ab83189c93759e2c6ed05979d4a4128ff83f95390e91dce
-  data.tar.gz: 9f39d67731002186f66f04e4bb463834980a243fc0d6322b5e35f749fa356f95
+  metadata.gz: 2314c2bce1ab734d24fa40a8709c61af56cb35558652a4d25ba958c71b3a3bf3
+  data.tar.gz: 964ca3642b80f790b444d55db3869109fbb1c746953d2b7777d87f8eb0e17ad0
 SHA512:
-  metadata.gz: 18e61543e05ae79c31ee76a8504cfcfef1271aa1419430ae667b46c8291dcc790630aa1123bc662ce817117a26b68ac343f5c7679134a3205548f32ba28cfb31
-  data.tar.gz: 797fa163ab50c3ace753ac833381bdeb040876c12de7d2b5570dbe0f3a799a91b18fa220ca5ea4ecbc8cfad69aabbd1dd245ad1bcd404b92423020890f5d38d1
+  metadata.gz: db5de1552c3841bf2f34c47c58e0f2c9789a6ed4101e3733654b1da9c557fccd97af0fb2f5c83212c3aa06ffc34630d7ab9e7798a0ebc41c6e41d32c0d742977
+  data.tar.gz: 3ea63129204abcadec92f7d77c7fa7222f700a819a9602c0a03e93134fbb86d3716a24dfbe387bb3e4e2b400fcb80af4c3cd92693ecec07b047c95d402a92ac2

data/lib/girl/head.rb

@@ -1,6 +1,6 @@
 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最多发几次
   EXPIRE_AFTER          = 300               # 多久没有新流量，过期

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
 
     ##
@@ -414,6 +434,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
@@ -469,7 +513,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,8 +523,9 @@ 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    # 准备关闭写
@@ -540,9 +585,12 @@ 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   # 是否已暂停读
       }
 
       src_info[ :dst_id ] = dst_id
@@ -842,7 +890,7 @@ 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     # 准备关闭写
@@ -863,10 +911,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
@@ -1065,7 +1113,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 +1142,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

data/lib/girl/proxyd_worker.rb

@@ -265,7 +265,7 @@ 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
 
@@ -274,7 +274,7 @@ module Girl
       @dst_infos[ dst ] = {
         id: dst_id,               # id
         tund: tund,               # 对应tund
-        domain_port: domain_port, # 域名和端口
+        domain_port: domain_port, # 目的地和端口
         rbuff: '',                # 对应的streamd没准备好，暂存读到的流量
         streamd: nil,             # 对应的streamd
         wbuff: '',                # 从streamd读到的流量
@@ -282,7 +282,7 @@ 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      # 准备关闭写
@@ -379,6 +379,18 @@ 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
@@ -616,10 +628,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
@@ -667,9 +679,11 @@ module Girl
       tund = tcpd_info[ :tund ]
 
       @streamd_infos[ streamd ] = {
-        tund: tund, # 对应tund
-        dst: nil,   # 对应dst
-        wbuff: ''   # 写前，写往近端stream
+        tund: tund,       # 对应tund
+        dst: nil,         # 对应dst
+        domain_port: nil, # dst的目的地和端口
+        wbuff: '',        # 写前，写往近端stream
+        paused: false     # 是否已暂停读
       }
 
       add_read( streamd, :streamd )
@@ -704,7 +718,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
@@ -759,6 +773,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 +793,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
 

data/lib/girl/version.rb

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

metadata

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