girl 0.69.0 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b16f67f52bf05cd498b16e480ee9d29577217ef93fd8964c0256e3816eb837e6
-  data.tar.gz: 38a5178d59930baa536a2ea882b8e17d86bb5e194386bcf9fc5ef7615d8e120e
+  metadata.gz: adb4fc20afbb57a58552ce95b6580c6d743fd85a1cd7f0a20d820c9481c8d2dd
+  data.tar.gz: be27ab104fd8715186d18031999f6050eeaebeb6d8bc7c4e19b3f29ebd997928
 SHA512:
-  metadata.gz: 139f1ea8a12a8e58d236e873ef1b3cb2944768ac1f2940fc986afb3ed5095e82550235f89fa1a81981b1981d6422f5bebd7918874a8cfe2fef7ab586af1d22fa
-  data.tar.gz: 0554a3541237a4f62d838309b3ff703b18480218646bf6f3920e218d477aed0d41e21ef1cd944e4f042539c0d0d17a73a15f0fedcd4d8356d350b7052c1071a5
+  metadata.gz: 7f458ccee3db7c612f29715fa66c70e70fd3d4a8bfd4773c9590ebf830079d3d6ea3bc1daeed67d26ef70b08d7857592073602f20b0937b5f384713d15ff334f
+  data.tar.gz: 504190992e2966453ab1783f6fcccea05ac18c0a067a3b9c0372e6b097392d5b4f64c70d1ea405aa090de15408d6d9eb86a1042b6feb27ef922ca6c213bcdb80

data/girl.gemspec

@@ -19,17 +19,12 @@ girl.gemspec
 lib/girl.rb
 lib/girl/custom.rb
 lib/girl/head.rb
-lib/girl/hex.rb
 lib/girl/proxy_custom.rb
 lib/girl/proxy_worker.rb
 lib/girl/proxy.rb
 lib/girl/proxyd_custom.rb
 lib/girl/proxyd_worker.rb
 lib/girl/proxyd.rb
-lib/girl/resolv.rb
-lib/girl/resolvd.rb
-lib/girl/tun.rb
-lib/girl/tund.rb
 lib/girl/udp.rb
 lib/girl/udpd.rb
 lib/girl/version.rb

data/lib/girl/head.rb

@@ -1,18 +1,17 @@
 module Girl
-  PACK_SIZE             = 1328                   # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(pack id) - 8(src id) = 1328
-  CHUNK_SIZE            = PACK_SIZE * 1000       # 块大小
-  WBUFFS_LIMIT          = 1000                   # 写前上限，超过上限结一个块
-  WMEMS_LIMIT           = 100_000                # 写后上限，达到上限暂停写
-  RESUME_BELOW          = 50_000                 # 降到多少以下恢复写
-  EXPIRE_NEW            = 10                     # 创建之后多久没有流量进来，过期
-  EXPIRE_AFTER          = 300                    # 多久没有新流量，过期
-  CHECK_EXPIRE_INTERVAL = 30                     # 检查过期间隔
-  HEARTBEAT_INTERVAL    = 30                     # 心跳间隔
-  STATUS_INTERVAL       = 0.5                    # 发送状态间隔
-  SEND_STATUS_UNTIL     = 10                     # 持续的告之对面状态，直到没有流量往来，持续多少秒
-  BREAK_SEND_MISS       = 10_000                 # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
-  CONFUSE_UNTIL         = 5                      # 混淆前几个包
-  RESOLV_CACHE_EXPIRE   = 300                    # dns查询结果缓存多久过期
+  PACK_SIZE             = 1328             # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(pack id) - 8(src id) = 1328
+  CHUNK_SIZE            = PACK_SIZE * 1000 # 块大小
+  WBUFFS_LIMIT          = 1000             # 写前上限，超过上限结一个块
+  WMEMS_LIMIT           = 100_000          # 写后上限，达到上限暂停写
+  RESUME_BELOW          = 50_000           # 降到多少以下恢复写
+  EXPIRE_NEW            = 10               # 创建之后多久没有流量进来，过期
+  EXPIRE_AFTER          = 300              # 多久没有新流量，过期
+  CHECK_EXPIRE_INTERVAL = 30               # 检查过期间隔
+  STATUS_INTERVAL       = 0.5              # 发送状态间隔
+  SEND_STATUS_UNTIL     = 10               # 持续的告之对面状态，直到没有流量往来，持续多少秒
+  BREAK_SEND_MISS       = 10_000           # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
+  CONFUSE_UNTIL         = 5                # 混淆前几个包
+  RESOLV_CACHE_EXPIRE   = 300              # dns查询结果缓存多久过期
   TUND_PORT             = 1
   HEARTBEAT             = 2
   A_NEW_SOURCE          = 3
@@ -26,8 +25,6 @@ module Girl
   GOT_FIN2              = 11
   TUND_FIN              = 12
   TUN_FIN               = 13
-  CTL_CLOSE             = 1
-  CTL_RESUME            = 2
   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

@@ -23,29 +23,37 @@ require 'socket'
 #
 # tun-tund:
 #
-# Q>: 0 ctlmsg -> C: 2 heartbeat  -> C: random char
-#                    3 a new src  -> Q>: src_id -> encoded destination address
-#                    4 paired     -> Q>: src_id -> n: dst_port
-#                    5 dst status -> n: dst_port -> Q>Q>: biggest_dst_pack_id continue_src_pack_id
-#                    6 src status -> Q>: src_id -> Q>Q>: biggest_src_pack_id continue_dst_pack_id
-#                    7 miss       -> Q>: src_id/n: dst_port -> Q>Q>: pack_id_begin pack_id_end
-#                    8 fin1       -> Q>: src_id/n: dst_port -> Q>Q>: biggest_src_pack_id continue_dst_pack_id / biggest_dst_pack_id continue_src_pack_id
+# Q>: 0 ctlmsg -> C: 2 heartbeat     -> C: random char
+#                    3 a new source  -> Q>: src id -> encoded destination address
+#                    4 paired        -> Q>: src id -> n: dst port
+#                    5 dest status   -> n: dst port -> Q>: biggest relayed dst pack id -> Q>: continue src pack id
+#                    6 source status -> Q>: src id -> Q>: biggest relayed src pack id -> Q>: continue dst pack id
+#                    7 miss          -> Q>/n: src id / dst port -> Q>: pack id begin -> Q>:  pack id end
+#                    8 fin1          -> Q>/n: src id / dst port -> Q>: biggest src pack id / biggest dst pack id -> Q>: continue dst pack id / continue src pack id
 #                    9 not use
-#                   10 fin2       -> Q>: src_id/n: dst_port
+#                   10 fin2          -> Q>/n: src id / dst port
 #                   11 not use
 #                   12 tund fin
 #                   13 tun fin
 #
-# Q>: 1+ pack_id -> Q>: src_id/n: dst_port -> traffic
+# Q>: 1+ pack_id -> Q>/n: src id / dst port -> traffic
 #
 # close logic
 # ===========
 #
 # 1-1. after close src -> dst closed ? no -> send fin1
-# 1-2. recv fin2 -> del src ext
+# 1-2. tun recv fin2 -> del src ext
 #
-# 2-1. recv traffic/fin1/dst status -> dst closed and all traffic received ? -> close src after write
-# 2-2. after close src -> dst closed ? yes -> del src ext -> send fin2
+# 2-1. tun recv fin1 -> all traffic received ? -> close src after write
+# 2-2. tun recv traffic -> dst closed and all traffic received ? -> close src after write
+# 2-3. after close src -> dst closed ? yes -> del src ext -> send fin2
+#
+# 3-1. after close dst -> src closed ? no -> send fin1
+# 3-2. tund recv fin2 -> del dst ext
+#
+# 4-1. tund recv fin1 -> all traffic received ? -> close dst after write
+# 4-2. tund recv traffic -> src closed and all traffic received ? -> close dst after write
+# 4-3. after close dst -> src closed ? yes -> del dst ext -> send fin2
 #
 module Girl
   class Proxy
@@ -121,21 +129,19 @@ module Girl
       end
 
       src_chunk_dir = File.join( proxy_tmp_dir, 'src.chunk' )
-      dst_chunk_dir = File.join( proxy_tmp_dir, 'dst.chunk' )
-      tun_chunk_dir = File.join( proxy_tmp_dir, 'tun.chunk' )
-
-      unless Dir.exist?( proxy_tmp_dir )
-        Dir.mkdir( proxy_tmp_dir )
-      end
 
       unless Dir.exist?( src_chunk_dir )
         Dir.mkdir( src_chunk_dir )
       end
 
+      dst_chunk_dir = File.join( proxy_tmp_dir, 'dst.chunk' )
+
       unless Dir.exist?( dst_chunk_dir )
         Dir.mkdir( dst_chunk_dir )
       end
 
+      tun_chunk_dir = File.join( proxy_tmp_dir, 'tun.chunk' )
+
       unless Dir.exist?( tun_chunk_dir )
         Dir.mkdir( tun_chunk_dir )
       end

data/lib/girl/proxy_worker.rb

@@ -18,7 +18,6 @@ module Girl
       @writes = []
       @roles = {}         # sock => :dotr / :proxy / :src / :dst / :tun
       @src_infos = {}     # src => {}
-      @dsts = {}          # local_port => dst
       @dst_infos = {}     # dst => {}
       @resolv_caches = {} # domain => [ ip, created_at ]
 
@@ -168,8 +167,7 @@ module Girl
 
                 @tun_info[ :src_exts ].each do | src_id, src_ext |
                   if src_ext[ :dst_port ] && ( now - src_ext[ :last_continue_at ] < SEND_STATUS_UNTIL )
-                    # puts "debug2 ctl send status biggest #{ src_ext[ :biggest_pack_id ] } continue dst #{ src_ext[ :continue_dst_pack_id ] }"
-                    data = [ 0, SOURCE_STATUS, src_id, src_ext[ :biggest_pack_id ], src_ext[ :continue_dst_pack_id ] ].pack( 'Q>CQ>Q>Q>' )
+                    data = [ 0, SOURCE_STATUS, src_id, src_ext[ :relay_pack_id ], src_ext[ :continue_dst_pack_id ] ].pack( 'Q>CQ>Q>Q>' )
                     add_tun_ctlmsg( data )
                     need_trigger = true
                   end
@@ -180,11 +178,6 @@ module Girl
                 puts "p#{ Process.pid } #{ Time.new } resume tun"
                 @tun_info[ :paused ] = false
                 add_write( @tun )
-
-                @tun_info[ :src_exts ].each do | _, src_ext |
-                  add_write( src_ext[ :src ] )
-                end
-
                 need_trigger = true
               end
 
@@ -322,8 +315,8 @@ module Girl
         port: port,           # 端口
         ctlmsg_rbuffs: [],    # 还没配上tund，暂存的ctlmsg
         ctlmsgs: [],          # [ to_addr, data ]
-        wbuffs: [],           # 写前缓存 [ src_id, data ]
-        caches: [],           # 块读出缓存 [ src_id, data ]
+        wbuffs: [],           # 写前缓存 [ src_id, pack_id, data ]
+        caches: [],           # 块读出缓存 [ src_id, pack_id, data ]
         chunks: [],           # 块队列 filename
         spring: 0,            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
         tund_addr: nil,       # tund地址
@@ -370,7 +363,6 @@ module Girl
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
       local_port = dst.local_address.ip_port
-      @dsts[ local_port ] = dst
       @dst_infos[ dst ] = {
         local_port: local_port, # 本地端口
         src: src,               # 对应src
@@ -388,17 +380,13 @@ module Girl
       src_info[ :dst ] = dst
 
       if src_info[ :proxy_proto ] == :http
-        datas = src_info[ :rbuffs ]
-
-        if datas.empty?
-          # CONNECT
+        if src_info[ :is_connect ]
           # puts "debug1 add src wbuff http ok"
           add_src_wbuff( src, HTTP_OK )
         else
-          # not CONNECT
           # puts "debug1 add src rbuffs to dst wbuff"
 
-          datas.each do | data |
+          src_info[ :rbuffs ].each do | _, data |
             add_dst_wbuff( dst, data )
           end
         end
@@ -420,11 +408,11 @@ module Girl
         dst_port: nil,             # 远端dst端口
         wmems: {},                 # 写后 pack_id => data
         send_ats: {},              # 上一次发出时间 pack_id => send_at
-        biggest_pack_id: 0,        # 发到几
+        relay_pack_id: 0,          # 转发到几
         continue_dst_pack_id: 0,   # 收到几
         pieces: {},                # 跳号包 dst_pack_id => data
-        is_dst_closed: false,      # 对面是否已关闭
-        biggest_dst_pack_id: 0,    # 对面发到几
+        is_dst_closed: false,      # dst是否已关闭
+        biggest_dst_pack_id: 0,    # dst最大包号码
         completed_pack_id: 0,      # 完成到几（对面收到几）
         last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
       }
@@ -496,17 +484,17 @@ module Girl
     ##
     # add tun wbuff
     #
-    def add_tun_wbuff( src_id, data )
-      @tun_info[ :wbuffs ] << [ src_id, data ]
+    def add_tun_wbuff( src_id, pack_id, data )
+      @tun_info[ :wbuffs ] << [ src_id, pack_id, data ]
 
       if @tun_info[ :wbuffs ].size >= WBUFFS_LIMIT
         spring = @tun_info[ :chunks ].size > 0 ? ( @tun_info[ :spring ] + 1 ) : 0
         filename = "#{ Process.pid }-#{ @tun_info[ :port ] }.#{ spring }"
         chunk_path = File.join( @tun_chunk_dir, filename )
-        wbuffs = @tun_info[ :wbuffs ].map{ | _src_id, _data | [ [ _src_id, _data.bytesize ].pack( 'Q>n' ), _data ].join }
+        datas = @tun_info[ :wbuffs ].map{ | _src_id, _pack_id, _data | [ [ _src_id, _pack_id, _data.bytesize ].pack( 'Q>Q>n' ), _data ].join }
 
         begin
-          IO.binwrite( chunk_path, wbuffs.join )
+          IO.binwrite( chunk_path, datas.join )
         rescue Errno::ENOSPC => e
           puts "p#{ Process.pid } #{ Time.new } #{ e.class }, close tun"
           set_is_closing( @tun )
@@ -645,13 +633,13 @@ module Girl
         return if src_ext.nil? || src_ext[ :dst_port ].nil?
 
         if src_ext[ :is_dst_closed ]
-          # puts "debug1 2-2. after close src -> dst closed ? yes -> del src ext -> send fin2"
+          # puts "debug1 2-3. after close src -> dst closed ? yes -> del src ext -> send fin2"
           del_src_ext( src_id )
           data = [ 0, FIN2, src_id ].pack( 'Q>CQ>' )
           add_tun_ctlmsg( data )
         else
           # puts "debug1 1-1. after close src -> dst closed ? no -> send fin1"
-          data = [ 0, FIN1, src_id, src_ext[ :biggest_pack_id ], src_ext[ :continue_dst_pack_id ] ].pack( 'Q>CQ>Q>Q>' )
+          data = [ 0, FIN1, src_id, src_info[ :biggest_pack_id ], src_ext[ :continue_dst_pack_id ] ].pack( 'Q>CQ>Q>Q>' )
           add_tun_ctlmsg( data )
         end
       elsif src_info[ :proxy_type ] == :direct
@@ -674,7 +662,6 @@ module Girl
         end
       end
 
-      @dsts.delete( dst_info[ :local_port ] )
       set_is_closing( dst_info[ :src ] )
     end
 
@@ -768,19 +755,7 @@ module Girl
 
       if data.empty?
         if src_info[ :is_closing ]
-          if @tun
-            if @tun.closed?
-              close_src( src )
-            elsif @tun_info[ :paused ]
-              @writes.delete( src )
-            elsif !@writes.include?( @tun )
-              # 转发光了，正式关闭
-              # puts "debug2 close src after tun empty"
-              close_src( src )
-            end
-          else
-            close_src( src )
-          end
+          close_src( src )
         else
           @writes.delete( src )
         end
@@ -872,6 +847,10 @@ module Girl
           tun.sendmsg( data, 0, to_addr )
         rescue IO::WaitWritable, Errno::EINTR
           return
+        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+          puts "#{ Time.new } #{ e.class }, close tun"
+          close_tun( tun )
+          return
         end
 
         @tun_info[ :ctlmsgs ].shift
@@ -890,6 +869,10 @@ module Girl
               tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
             rescue IO::WaitWritable, Errno::EINTR
               return
+            rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+              puts "#{ Time.new } #{ e.class }, close tun"
+              close_tun( tun )
+              return
             end
           end
         end
@@ -911,7 +894,7 @@ module Girl
 
       # 取写前
       if @tun_info[ :caches ].any?
-        src_id, data = @tun_info[ :caches ].first
+        src_id, pack_id, data = @tun_info[ :caches ].first
         from = :caches
       elsif @tun_info[ :chunks ].any?
         path = File.join( @tun_chunk_dir, @tun_info[ :chunks ].shift )
@@ -928,16 +911,16 @@ module Girl
         caches = []
 
         until data.empty?
-          _src_id, pack_size = data[ 0, 10 ].unpack( 'Q>n' )
-          caches << [ _src_id, data[ 10, pack_size ] ]
-          data = data[ ( 10 + pack_size )..-1 ]
+          _src_id, _pack_id, pack_size = data[ 0, 18 ].unpack( 'Q>Q>n' )
+          caches << [ _src_id, _pack_id, data[ 18, pack_size ] ]
+          data = data[ ( 18 + pack_size )..-1 ]
         end
 
         @tun_info[ :caches ] = caches
-        src_id, data = caches.first
+        src_id, pack_id, data = caches.first
         from = :caches
       elsif @tun_info[ :wbuffs ].any?
-        src_id, data = @tun_info[ :wbuffs ].first
+        src_id, pack_id, data = @tun_info[ :wbuffs ].first
         from = :wbuffs
       else
         @writes.delete( tun )
@@ -947,8 +930,6 @@ module Girl
       src_ext = @tun_info[ :src_exts ][ src_id ]
 
       if src_ext
-        pack_id = src_ext[ :biggest_pack_id ] + 1
-
         if pack_id <= CONFUSE_UNTIL
           data = @custom.encode( data )
           # puts "debug1 encoded pack #{ pack_id }"
@@ -960,10 +941,14 @@ module Girl
           tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
         rescue IO::WaitWritable, Errno::EINTR
           return
+        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+          puts "#{ Time.new } #{ e.class }, close tun"
+          close_tun( tun )
+          return
         end
 
         # puts "debug2 written pack #{ pack_id }"
-        src_ext[ :biggest_pack_id ] = pack_id
+        src_ext[ :relay_pack_id ] = pack_id
         src_ext[ :wmems ][ pack_id ] = data
         src_ext[ :send_ats ][ pack_id ] = now
         src_ext[ :last_continue_at ] = now
@@ -999,7 +984,9 @@ module Girl
         dst: nil,                # :direct的场合，对应的dst
         destination_domain: nil, # 目的地域名
         destination_port: nil,   # 目的地端口
-        rbuffs: [],              # 非CONNECT，dst或者远端dst未准备好，暂存流量
+        biggest_pack_id: 0,      # 最大包号码
+        is_connect: true,        # 代理协议是http的场合，是否是CONNECT
+        rbuffs: [],              # 非CONNECT，dst或者远端dst未准备好，暂存流量 [ pack_id, data ]
         wbuff: '',               # 写前
         cache: '',               # 块读出缓存
         chunks: [],              # 块队列，写前达到块大小时结一个块 filename
@@ -1096,7 +1083,10 @@ module Girl
             end
           end
 
-          src_info[ :rbuffs ] << data
+          src_info[ :is_connect ] = false
+          pack_id = src_info[ :biggest_pack_id ] + 1
+          src_info[ :biggest_pack_id ] = pack_id
+          src_info[ :rbuffs ] << [ pack_id, data ]
         end
 
         domain, port = domain_and_port.split( ':' )
@@ -1109,7 +1099,9 @@ module Girl
         resolve_domain( src, domain )
       when :checking
         # puts "debug1 add src rbuff while checking #{ data.inspect }"
-        src_info[ :rbuffs ] << data
+        pack_id = src_info[ :biggest_pack_id ] + 1
+        src_info[ :biggest_pack_id ] = pack_id
+        src_info[ :rbuffs ] << [ pack_id, data ]
       when :negotiation
         # +----+-----+-------+------+----------+----------+
         # |VER | CMD |  RSV  | ATYP | DST.ADDR | DST.PORT |
@@ -1156,6 +1148,9 @@ module Girl
           return
         end
 
+        pack_id = src_info[ :biggest_pack_id ] + 1
+        src_info[ :biggest_pack_id ] = pack_id
+
         if src_ext[ :dst_port ]
           if @tun.closed?
             # puts "debug1 tun closed, close src"
@@ -1163,14 +1158,14 @@ module Girl
             return
           end
 
-          if src_info[ :rbuffs ].any?
+          unless src_info[ :is_connect ]
             data, _ = sub_http_request( data )
           end
 
-          add_tun_wbuff( src_id, data )
+          add_tun_wbuff( src_id, pack_id, data )
         else
           # puts "debug1 remote dst not ready, save data to src rbuff"
-          src_info[ :rbuffs ] << data
+          src_info[ :rbuffs ] << [ pack_id, data ]
         end
       when :direct
         dst = src_info[ :dst ]
@@ -1182,14 +1177,14 @@ module Girl
             return
           end
 
-          if src_info[ :rbuffs ].any?
+          unless src_info[ :is_connect ]
             data, _ = sub_http_request( data )
           end
 
           add_dst_wbuff( dst, data )
         else
           # puts "debug1 dst not ready, save data to src rbuff"
-          src_info[ :rbuffs ] << data
+          src_info[ :rbuffs ] << [ nil, data ]
         end
       end
     end
@@ -1275,18 +1270,14 @@ module Girl
           src_info = @src_infos[ src ]
 
           if src_info[ :proxy_proto ] == :http
-            datas = src_info[ :rbuffs ]
-
-            if datas.empty?
-              # CONNECT
+            if src_info[ :is_connect ]
               # puts "debug1 add src wbuff http ok"
               add_src_wbuff( src, HTTP_OK )
             else
-              # not CONNECT
               # puts "debug1 add src rbuffs to tun wbuffs"
 
-              datas.each do | _data |
-                add_tun_wbuff( src_id, _data )
+              src_info[ :rbuffs ].each do | pack_id, _data |
+                add_tun_wbuff( src_id, pack_id, _data )
               end
             end
           elsif src_info[ :proxy_proto ] == :socks5
@@ -1295,7 +1286,7 @@ module Girl
         when DEST_STATUS
           return if from_addr != @tun_info[ :tund_addr ]
 
-          dst_port, biggest_dst_pack_id, continue_src_pack_id = data[ 9, 18 ].unpack( 'nQ>Q>' )
+          dst_port, relay_dst_pack_id, continue_src_pack_id = data[ 9, 18 ].unpack( 'nQ>Q>' )
 
           src_id = @tun_info[ :src_ids ][ dst_port ]
           return unless src_id
@@ -1305,22 +1296,10 @@ module Girl
 
           # puts "debug2 got dest status"
 
-          # 更新对面发到几
-          if biggest_dst_pack_id > src_ext[ :biggest_dst_pack_id ]
-            # puts "debug2 update biggest dst pack #{ biggest_dst_pack_id }"
-            src_ext[ :biggest_dst_pack_id ] = biggest_dst_pack_id
-
-            # 接到对面状态，若对面已关闭，且最后一个包已经进写前，关闭src
-            if src_ext[ :is_dst_closed ] && ( biggest_dst_pack_id == src_ext[ :continue_dst_pack_id ] )
-              # puts "debug1 2-1. recv traffic/fin1/dst status -> dst closed and all traffic received ? -> close src after write"
-              set_is_closing( src_ext[ :src ] )
-            end
-          end
-
           release_wmems( src_ext, continue_src_pack_id )
 
           # 发miss
-          if !src_ext[ :src ].closed? && ( src_ext[ :continue_dst_pack_id ] < src_ext[ :biggest_dst_pack_id ] )
+          if !src_ext[ :src ].closed? && ( src_ext[ :continue_dst_pack_id ] < relay_dst_pack_id )
             ranges = []
             curr_pack_id = src_ext[ :continue_dst_pack_id ] + 1
 
@@ -1332,12 +1311,12 @@ module Girl
               curr_pack_id = pack_id + 1
             end
 
-            if curr_pack_id <= src_ext[ :biggest_dst_pack_id ]
-              ranges << [ curr_pack_id, src_ext[ :biggest_dst_pack_id ] ]
+            if curr_pack_id <= relay_dst_pack_id
+              ranges << [ curr_pack_id, relay_dst_pack_id ]
             end
 
             pack_count = 0
-            # puts "debug1 continue/biggest #{ src_ext[ :continue_dst_pack_id ] }/#{ src_ext[ :biggest_dst_pack_id ] } send MISS #{ ranges.size }"
+            # puts "debug1 continue/relay #{ src_ext[ :continue_dst_pack_id ] }/#{ relay_dst_pack_id } send MISS #{ ranges.size }"
 
             ranges.each do | pack_id_begin, pack_id_end |
               if pack_count >= BREAK_SEND_MISS
@@ -1384,9 +1363,8 @@ module Girl
           src_ext[ :biggest_dst_pack_id ] = biggest_dst_pack_id
           release_wmems( src_ext, continue_src_pack_id )
 
-          # 接到对面已关闭，若最后一个包已经进写前，关闭src
           if ( biggest_dst_pack_id == src_ext[ :continue_dst_pack_id ] )
-            # puts "debug1 2-1. recv fin1 -> set dst closed -> all traffic received ? -> close src after write"
+            # puts "debug1 2-1. tun recv fin1 -> all traffic received ? -> close src after write"
             set_is_closing( src_ext[ :src ] )
           end
         when FIN2
@@ -1397,7 +1375,7 @@ module Girl
           src_id = @tun_info[ :src_ids ][ dst_port ]
           return unless src_id
 
-          # puts "debug1 1-2. recv fin2 -> del src ext"
+          # puts "debug1 1-2. tun recv fin2 -> del src ext"
           del_src_ext( src_id )
         when TUND_FIN
           return if from_addr != @tun_info[ :tund_addr ]
@@ -1443,7 +1421,7 @@ module Girl
 
         # 接到流量，若对面已关闭，且流量正好收全，关闭src
         if src_ext[ :is_dst_closed ] && ( pack_id == src_ext[ :biggest_dst_pack_id ] )
-          # puts "debug1 2-1. recv traffic/fin1/dst status -> dst closed and all traffic received ? -> close src after write"
+          # puts "debug1 2-2. tun recv traffic -> dst closed and all traffic received ? -> close src after write"
           set_is_closing( src_ext[ :src ] )
         end
       else