girl 0.62.0 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3597360a30c0ba1226ed9fdeef1faf10687bbfc48ac58c07c063c5e6888dd50
-  data.tar.gz: 7d7429c890f3090c53b57c61587a4f03351d4e68775e310acd174baf91adfa74
+  metadata.gz: 1b2ece41d566cc27562dff36a48b1c53c53000390587b5e424bc38e78636e74c
+  data.tar.gz: c3d80d9b98804d0f1f37cf479052fc5c68b7cf907c800813cf3dd0d9a1691855
 SHA512:
-  metadata.gz: f0e09919d82be7c07a3342199af626487cdde4527e799609ec561fc9bef29929a616a075dbc10ce31656c00c7c5aab4311223edbf7ea45cf70e9798f0bc5f20e
-  data.tar.gz: 979e305bb9c5f9e846271ff9d9c1bb01438ca6714e96a95ab7b588493968aa5d25dccfda5ee4d36d288570034e655ac0c113a4e935fcc3410be23d091d74ea56
+  metadata.gz: c2c0d92f7dbd582f04a8d49e5285d863e790070a3ffd2c08313695f66388df436fa59441b9fef992600e1611a39053ea3df8b3f453004e2bcbc0ad126c4e257e
+  data.tar.gz: e4baabb1843d03f27101e43407927febdf0dd3a1917a30ae017297c75cb5336a32f1fb033bc484ffc0f6cf053a4b3ea63ed8726b4aece5ae662bd72767ff730d

data/lib/girl/head.rb

@@ -1,16 +1,14 @@
 module Girl
-  PACK_SIZE             = 1328                   # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(source/dest id) - 8(pack id) = 1328
+  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       # 块大小
-  PROXY_PACK_SIZE       = 1320                   # 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(pack id) - 16(src_addr) = 1320
-  PROXY_CHUNK_SIZE      = PROXY_PACK_SIZE * 1000 # proxy块大小
   WBUFFS_LIMIT          = 1000                   # 写前上限，超过上限结一个块
   WMEMS_LIMIT           = 100_000                # 写后上限，达到上限暂停写
   RESUME_BELOW          = 50_000                 # 降到多少以下恢复写
   EXPIRE_NEW            = 10                     # 创建之后多久没有流量进来，过期
-  EXPIRE_AFTER          = 900                    # 多久没有新流量进来，过期
+  EXPIRE_AFTER          = 300                    # 多久没有新流量，过期
   CHECK_EXPIRE_INTERVAL = 30                     # 检查过期间隔
   HEARTBEAT_INTERVAL    = 30                     # 心跳间隔
-  STATUS_INTERVAL       = 0.3                    # 发送状态间隔
+  STATUS_INTERVAL       = 0.5                    # 发送状态间隔
   SEND_STATUS_UNTIL     = 10                     # 持续的告之对面状态，直到没有流量往来，持续多少秒
   BREAK_SEND_MISS       = 10_000                 # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
   CONFUSE_UNTIL         = 5                      # 混淆前几个包

data/lib/girl/proxy.rb

@@ -24,19 +24,19 @@ require 'socket'
 # tun-tund:
 #
 # Q>: 0 ctlmsg -> C: 2 heartbeat  -> C: random char
-#                    3 a new src  -> src_addr -> encoded destination address
-#                    4 paired     -> src_addr -> n: dst_port
+#                    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 -> src_addr -> Q>Q>: biggest_src_pack_id continue_dst_pack_id
-#                    7 miss       -> src_addr/n: dst_port -> Q>Q>: pack_id_begin pack_id_end
-#                    8 fin1       -> src_addr/n: dst_port -> Q>Q>: biggest_src_pack_id continue_dst_pack_id / 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
 #                    9 not use
-#                   10 fin2       -> src_addr/n: dst_port
+#                   10 fin2       -> Q>: src_id/n: dst_port
 #                   11 not use
 #                   12 tund fin
 #                   13 tun fin
 #
-# Q>: 1+ pack_id -> src_addr/n: dst_port -> traffic
+# Q>: 1+ pack_id -> Q>: src_id/n: dst_port -> traffic
 #
 # close logic
 # ===========

data/lib/girl/proxy_worker.rb

@@ -109,12 +109,13 @@ module Girl
                 set_is_closing( @tun )
               else
                 data = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
+                # puts "debug1 #{ Time.new } heartbeat"
                 add_tun_ctlmsg( data )
 
-                @tun_info[ :src_exts ].each do | src_addr, src_ext |
+                @tun_info[ :src_exts ].each do | src_id, src_ext |
                   if src_ext[ :src ].closed? && ( now - src_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                    puts "p#{ Process.pid } #{ Time.new } expire src_ext"
-                    del_src_ext( src_addr )
+                    puts "p#{ Process.pid } #{ Time.new } expire src ext #{ src_id }"
+                    del_src_ext( src_id )
                   end
                 end
               end
@@ -165,10 +166,10 @@ module Girl
               if @tun_info[ :src_exts ].any?
                 now = Time.new
 
-                @tun_info[ :src_exts ].each do | src_addr, src_ext |
+                @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 ].pack( 'Q>C' ), src_addr, [ src_ext[ :biggest_pack_id ], src_ext[ :continue_dst_pack_id ] ].pack( 'Q>Q>' ) ].join
+                    data = [ 0, SOURCE_STATUS, src_id, src_ext[ :biggest_pack_id ], src_ext[ :continue_dst_pack_id ] ].pack( 'Q>CQ>Q>Q>' )
                     add_tun_ctlmsg( data )
                     need_trigger = true
                   end
@@ -311,20 +312,20 @@ module Girl
     def new_a_tun
       tun = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       tun.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
-      port = tun.local_address.ip_unpack.last
+      port = tun.local_address.ip_port
       tun_info = {
         port: port,           # 端口
         ctlmsg_rbuffs: [],    # 还没配上tund，暂存的ctlmsg
         ctlmsgs: [],          # [ to_addr, data ]
-        wbuffs: [],           # 写前缓存 [ src_addr, data ]
-        caches: [],           # 块读出缓存 [ src_addr, data ]
+        wbuffs: [],           # 写前缓存 [ src_id, data ]
+        caches: [],           # 块读出缓存 [ src_id, data ]
         chunks: [],           # 块队列 filename
         spring: 0,            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
         tund_addr: nil,       # tund地址
-        src_exts: {},         # src额外信息 src_addr => {}
-        src_addrs: {},        # dst_port => src_addr
+        src_exts: {},         # src额外信息 src_id => {}
+        src_ids: {},          # dst_port => src_id
         paused: false,        # 是否暂停写
-        resendings: [],       # 重传队列 [ src_addr, pack_id ]
+        resendings: [],       # 重传队列 [ src_id, pack_id ]
         created_at: Time.new, # 创建时间
         last_recv_at: nil,    # 上一次收到流量的时间，过期关闭
         is_closing: false     # 是否准备关闭
@@ -363,7 +364,7 @@ module Girl
       end
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
-      local_port = dst.local_address.ip_unpack
+      local_port = dst.local_address.ip_port
       @dsts[ local_port ] = dst
       @dst_infos[ dst ] = {
         local_port: local_port, # 本地端口
@@ -424,14 +425,14 @@ module Girl
       }
 
       src_info = @src_infos[ src ]
-      src_addr = src_info[ :src_addr ]
-      @tun_info[ :src_exts ][ src_addr ] = src_ext
+      src_id = src_info[ :id ]
+      @tun_info[ :src_exts ][ src_id ] = src_ext
       src_info[ :proxy_type ] = :tunnel
 
       destination_port = src_info[ :destination_port ]
       destination_domain = src_info[ :destination_domain ]
       destination_domain_port = [ destination_domain, destination_port ].join( ':' )
-      data = [ [ 0, A_NEW_SOURCE ].pack( 'Q>C' ), src_addr, @custom.encode( destination_domain_port ) ].join
+      data = [ [ 0, A_NEW_SOURCE, src_id ].pack( 'Q>CQ>' ), @custom.encode( destination_domain_port ) ].join
       loop_send_a_new_source( src_ext, data )
     end
 
@@ -490,14 +491,14 @@ module Girl
     ##
     # add tun wbuff
     #
-    def add_tun_wbuff( src_addr, data )
-      @tun_info[ :wbuffs ] << [ src_addr, data ]
+    def add_tun_wbuff( src_id, data )
+      @tun_info[ :wbuffs ] << [ src_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_addr, _data | [ _src_addr, [ _data.bytesize ].pack( 'n' ), _data ].join }
+        wbuffs = @tun_info[ :wbuffs ].map{ | _src_id, _data | [ [ _src_id, _data.bytesize ].pack( 'Q>n' ), _data ].join }
 
         begin
           IO.binwrite( chunk_path, wbuffs.join )
@@ -522,9 +523,9 @@ module Girl
       src_info = @src_infos[ src ]
       src_info[ :wbuff ] << data
 
-      if src_info[ :wbuff ].bytesize >= PROXY_CHUNK_SIZE
+      if src_info[ :wbuff ].bytesize >= CHUNK_SIZE
         spring = src_info[ :chunks ].size > 0 ? ( src_info[ :spring ] + 1 ) : 0
-        filename = "#{ Process.pid }-#{ Addrinfo.new( src_info[ :src_addr ] ).ip_unpack.join( '-' ) }.#{ spring }"
+        filename = "#{ Process.pid }-#{ src_info[ :id ] }.#{ spring }"
         chunk_path = File.join( @src_chunk_dir, filename )
 
         begin
@@ -550,7 +551,7 @@ module Girl
       dst_info = @dst_infos[ dst ]
       dst_info[ :wbuff ] << data
 
-      if dst_info[ :wbuff ].bytesize >= PROXY_CHUNK_SIZE
+      if dst_info[ :wbuff ].bytesize >= CHUNK_SIZE
         spring = dst_info[ :chunks ].size > 0 ? ( dst_info[ :spring ] + 1 ) : 0
         filename = "#{ Process.pid }-#{ dst_info[ :local_port ] }.#{ spring }"
         chunk_path = File.join( @dst_chunk_dir, filename )
@@ -630,22 +631,22 @@ module Girl
         end
       end
 
-      src_addr = src_info[ :src_addr ]
+      src_id = src_info[ :id ]
 
       if src_info[ :proxy_type ] == :tunnel
         return if @tun.closed?
 
-        src_ext = @tun_info[ :src_exts ][ src_addr ]
+        src_ext = @tun_info[ :src_exts ][ src_id ]
         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"
-          del_src_ext( src_addr )
-          data = [ [ 0, FIN2 ].pack( 'Q>C' ), src_addr ].join
+          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 ].pack( 'Q>C' ), src_addr, [ src_ext[ :biggest_pack_id ], src_ext[ :continue_dst_pack_id ] ].pack( 'Q>Q>' ) ].join
+          data = [ 0, FIN1, src_id, src_ext[ :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
@@ -702,11 +703,11 @@ module Girl
     ##
     # del src ext
     #
-    def del_src_ext( src_addr )
-      src_ext = @tun_info[ :src_exts ].delete( src_addr )
+    def del_src_ext( src_id )
+      src_ext = @tun_info[ :src_exts ].delete( src_id )
 
       if src_ext
-        @tun_info[ :src_addrs ].delete( src_ext[ :dst_port ] )
+        @tun_info[ :src_ids ].delete( src_ext[ :dst_port ] )
       end
     end
 
@@ -861,8 +862,8 @@ module Girl
 
       # 重传
       while @tun_info[ :resendings ].any?
-        src_addr, pack_id = @tun_info[ :resendings ].first
-        src_ext = @tun_info[ :src_exts ][ src_addr ]
+        src_id, pack_id = @tun_info[ :resendings ].first
+        src_ext = @tun_info[ :src_exts ][ src_id ]
 
         if src_ext
           data = src_ext[ :wmems ][ pack_id ]
@@ -893,7 +894,7 @@ module Girl
 
       # 取写前
       if @tun_info[ :caches ].any?
-        src_addr, data = @tun_info[ :caches ].first
+        src_id, data = @tun_info[ :caches ].first
         from = :caches
       elsif @tun_info[ :chunks ].any?
         path = File.join( @tun_chunk_dir, @tun_info[ :chunks ].shift )
@@ -910,24 +911,23 @@ module Girl
         caches = []
 
         until data.empty?
-          _src_addr = data[ 0, 16 ]
-          pack_size = data[ 16, 2 ].unpack( 'n' ).first
-          caches << [ _src_addr, data[ 18, pack_size ] ]
-          data = data[ ( 18 + pack_size )..-1 ]
+          _src_id, pack_size = data[ 0, 10 ].unpack( 'Q>n' )
+          caches << [ _src_id, data[ 10, pack_size ] ]
+          data = data[ ( 10 + pack_size )..-1 ]
         end
 
         @tun_info[ :caches ] = caches
-        src_addr, data = caches.first
+        src_id, data = caches.first
         from = :caches
       elsif @tun_info[ :wbuffs ].any?
-        src_addr, data = @tun_info[ :wbuffs ].first
+        src_id, data = @tun_info[ :wbuffs ].first
         from = :wbuffs
       else
         @writes.delete( tun )
         return
       end
 
-      src_ext = @tun_info[ :src_exts ][ src_addr ]
+      src_ext = @tun_info[ :src_exts ][ src_id ]
 
       if src_ext
         pack_id = src_ext[ :biggest_pack_id ] + 1
@@ -937,7 +937,7 @@ module Girl
           # puts "debug1 encoded pack #{ pack_id }"
         end
 
-        data = [ [ pack_id ].pack( 'Q>' ), src_addr, data ].join
+        data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
 
         begin
           tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
@@ -972,10 +972,11 @@ module Girl
         return
       end
 
-      # puts "debug1 accept a src #{ addrinfo.inspect }"
-      src_addr = addrinfo.to_sockaddr
+      id = rand( ( 2 ** 64 ) - 1 ) + 1
+      # puts "debug1 accept a src #{ addrinfo.inspect } #{ id }"
+
       @src_infos[ src ] = {
-        src_addr: src_addr,      # src地址
+        id: id,                  # id
         proxy_proto: :uncheck,   # :uncheck / :http / :socks5
         proxy_type: :uncheck,    # :uncheck / :checking / :direct / :tunnel / :negotiation
         dst: nil,                # :direct的场合，对应的dst
@@ -999,7 +1000,7 @@ module Girl
     #
     def read_src( src )
       begin
-        data = src.read_nonblock( PROXY_PACK_SIZE )
+        data = src.read_nonblock( PACK_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
         return
       rescue Exception => e
@@ -1129,8 +1130,8 @@ module Girl
           puts "p#{ Process.pid } #{ Time.new } socks5 cmd #{ cmd } not implement"
         end
       when :tunnel
-        src_addr = src_info[ :src_addr ]
-        src_ext = @tun_info[ :src_exts ][ src_addr ]
+        src_id = src_info[ :id ]
+        src_ext = @tun_info[ :src_exts ][ src_id ]
 
         unless src_ext
           # puts "debug1 not found src ext"
@@ -1149,7 +1150,7 @@ module Girl
             data, _ = sub_http_request( data )
           end
 
-          add_tun_wbuff( src_addr, data )
+          add_tun_wbuff( src_id, data )
         else
           # puts "debug1 remote dst not ready, save data to src rbuff"
           src_info[ :rbuffs ] << data
@@ -1181,7 +1182,7 @@ module Girl
     #
     def read_dst( dst )
       begin
-        data = dst.read_nonblock( PROXY_PACK_SIZE )
+        data = dst.read_nonblock( PACK_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
         return
       rescue Exception => e
@@ -1211,6 +1212,7 @@ module Girl
       data, addrinfo, rflags, *controls = tun.recvmsg
       from_addr = addrinfo.to_sockaddr
       now = Time.new
+      @tun_info[ :last_recv_at ] = now
       pack_id = data[ 0, 8 ].unpack( 'Q>' ).first
 
       if pack_id == 0
@@ -1220,7 +1222,6 @@ module Girl
         when TUND_PORT
           return if ( from_addr != @proxyd_addr ) || @tun_info[ :tund_addr ]
 
-          @tun_info[ :last_recv_at ] = now
           tund_port = data[ 9, 2 ].unpack( 'n' ).first
 
           # puts "debug1 got tund port #{ tund_port }"
@@ -1236,18 +1237,15 @@ module Girl
         when PAIRED
           return if from_addr != @tun_info[ :tund_addr ]
 
-          src_addr = data[ 9, 16 ]
-          dst_port = data[ 25, 2 ].unpack( 'n' ).first
+          src_id, dst_port = data[ 9, 10 ].unpack( 'Q>n' )
 
-          src_ext = @tun_info[ :src_exts ][ src_addr ]
+          src_ext = @tun_info[ :src_exts ][ src_id ]
           return if src_ext.nil? || src_ext[ :dst_port ]
 
           src = src_ext[ :src ]
           return if src.closed?
 
-          @tun_info[ :last_recv_at ] = now
-
-          # puts "debug1 got paired #{ Addrinfo.new( src_addr ).inspect } #{ dst_port }"
+          # puts "debug1 got paired #{ src_id } #{ dst_port }"
 
           if dst_port == 0
             set_is_closing( src )
@@ -1255,7 +1253,7 @@ module Girl
           end
 
           src_ext[ :dst_port ] = dst_port
-          @tun_info[ :src_addrs ][ dst_port ] = src_addr
+          @tun_info[ :src_ids ][ dst_port ] = src_id
 
           src_info = @src_infos[ src ]
 
@@ -1271,7 +1269,7 @@ module Girl
               # puts "debug1 add src rbuffs to tun wbuffs"
 
               datas.each do | _data |
-                add_tun_wbuff( src_addr, _data )
+                add_tun_wbuff( src_id, _data )
               end
             end
           elsif src_info[ :proxy_proto ] == :socks5
@@ -1282,14 +1280,13 @@ module Girl
 
           dst_port, biggest_dst_pack_id, continue_src_pack_id = data[ 9, 18 ].unpack( 'nQ>Q>' )
 
-          src_addr = @tun_info[ :src_addrs ][ dst_port ]
-          return unless src_addr
+          src_id = @tun_info[ :src_ids ][ dst_port ]
+          return unless src_id
 
-          src_ext = @tun_info[ :src_exts ][ src_addr ]
+          src_ext = @tun_info[ :src_exts ][ src_id ]
           return unless src_ext
 
           # puts "debug2 got dest status"
-          @tun_info[ :last_recv_at ] = now
 
           # 更新对面发到几
           if biggest_dst_pack_id > src_ext[ :biggest_dst_pack_id ]
@@ -1339,20 +1336,17 @@ module Girl
         when MISS
           return if from_addr != @tun_info[ :tund_addr ]
 
-          src_addr = data[ 9, 16 ]
-          pack_id_begin, pack_id_end = data[ 25, 16 ].unpack( 'Q>Q>' )
+          src_id, pack_id_begin, pack_id_end = data[ 9, 24 ].unpack( 'Q>Q>Q>' )
 
-          src_ext = @tun_info[ :src_exts ][ src_addr ]
+          src_ext = @tun_info[ :src_exts ][ src_id ]
           return unless src_ext
 
-          @tun_info[ :last_recv_at ] = now
-
           ( pack_id_begin..pack_id_end ).each do | pack_id |
             send_at = src_ext[ :send_ats ][ pack_id ]
 
             if send_at
               break if now - send_at < STATUS_INTERVAL
-              @tun_info[ :resendings ] << [ src_addr, pack_id ]
+              @tun_info[ :resendings ] << [ src_id, pack_id ]
             end
           end
 
@@ -1362,14 +1356,12 @@ module Girl
 
           dst_port, biggest_dst_pack_id, continue_src_pack_id = data[ 9, 18 ].unpack( 'nQ>Q>' )
 
-          src_addr = @tun_info[ :src_addrs ][ dst_port ]
-          return unless src_addr
+          src_id = @tun_info[ :src_ids ][ dst_port ]
+          return unless src_id
 
-          src_ext = @tun_info[ :src_exts ][ src_addr ]
+          src_ext = @tun_info[ :src_exts ][ src_id ]
           return unless src_ext
 
-          @tun_info[ :last_recv_at ] = now
-
           # puts "debug1 got fin1 #{ dst_port } biggest dst pack #{ biggest_dst_pack_id } completed src pack #{ continue_src_pack_id }"
           src_ext[ :is_dst_closed ] = true
           src_ext[ :biggest_dst_pack_id ] = biggest_dst_pack_id
@@ -1385,18 +1377,14 @@ module Girl
 
           dst_port = data[ 9, 2 ].unpack( 'n' ).first
 
-          src_addr = @tun_info[ :src_addrs ][ dst_port ]
-          return unless src_addr
-
-          @tun_info[ :last_recv_at ] = now
+          src_id = @tun_info[ :src_ids ][ dst_port ]
+          return unless src_id
 
           # puts "debug1 1-2. recv fin2 -> del src ext"
-          del_src_ext( src_addr )
+          del_src_ext( src_id )
         when TUND_FIN
           return if from_addr != @tun_info[ :tund_addr ]
 
-          @tun_info[ :last_recv_at ] = now
-
           puts "p#{ Process.pid } #{ Time.new } recv tund fin"
           set_is_closing( tun )
         end
@@ -1408,15 +1396,13 @@ module Girl
 
       dst_port = data[ 8, 2 ].unpack( 'n' ).first
 
-      src_addr = @tun_info[ :src_addrs ][ dst_port ]
-      return unless src_addr
+      src_id = @tun_info[ :src_ids ][ dst_port ]
+      return unless src_id
 
-      src_ext = @tun_info[ :src_exts ][ src_addr ]
+      src_ext = @tun_info[ :src_exts ][ src_id ]
       return if src_ext.nil? || src_ext[ :src ].closed?
       return if ( pack_id <= src_ext[ :continue_dst_pack_id ] ) || src_ext[ :pieces ].include?( pack_id )
 
-      @tun_info[ :last_recv_at ] = now
-
       data = data[ 10..-1 ]
       # puts "debug2 got pack #{ pack_id }"
 

data/lib/girl/proxyd_worker.rb

@@ -103,23 +103,27 @@ module Girl
                 is_expired = tund_info[ :last_recv_at ] ? ( now - tund_info[ :last_recv_at ] > EXPIRE_AFTER ) : ( now - tund_info[ :created_at ] > EXPIRE_NEW )
 
                 if is_expired
-                  puts "p#{ Process.pid } #{ Time.new } expire tund"
+                  puts "p#{ Process.pid } #{ Time.new } expire tund #{ tund_info[ :port ] }"
                   set_is_closing( tund )
-                  need_trigger = true
                 else
+                  data = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
+                  # puts "debug1 #{ Time.new } #{ tund_info[ :port ] } heartbeat"
+                  add_tund_ctlmsg( tund, data )
+
                   tund_info[ :dst_exts ].each do | dst_local_port, dst_ext |
                     if dst_ext[ :dst ].closed? && ( now - dst_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                      puts "p#{ Process.pid } #{ Time.new } expire dst_ext #{ dst_local_port }"
+                      puts "p#{ Process.pid } #{ Time.new } expire dst ext #{ dst_local_port }"
                       del_dst_ext( tund, dst_local_port )
-                      need_trigger = true
                     end
                   end
                 end
+
+                need_trigger = true
               end
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ] ? ( now - dst_info[ :last_recv_at ] > EXPIRE_AFTER ) : ( now - dst_info[ :created_at ] > EXPIRE_NEW )
+              is_expired = dst_info[ :last_recv_at ].nil? && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
 
               if is_expired
                 puts "p#{ Process.pid } #{ Time.new } expire dst"
@@ -183,7 +187,7 @@ module Girl
     ##
     # resolve domain
     #
-    def resolve_domain( tund, src_addr, destination_domain_port )
+    def resolve_domain( tund, src_id, destination_domain_port )
       resolv_cache = @resolv_caches[ destination_domain_port ]
 
       if resolv_cache
@@ -191,7 +195,7 @@ module Girl
 
         if Time.new - created_at < RESOLV_CACHE_EXPIRE
           # puts "debug1 #{ destination_domain_port } hit resolv cache #{ Addrinfo.new( destination_addr ).inspect }"
-          deal_with_destination_addr( tund, src_addr, destination_addr )
+          deal_with_destination_addr( tund, src_id, destination_addr )
           return
         end
 
@@ -215,7 +219,7 @@ module Girl
             @resolv_caches[ destination_domain_port ] = [ destination_addr, Time.new ]
 
             unless tund.closed?
-              if deal_with_destination_addr( tund, src_addr, destination_addr )
+              if deal_with_destination_addr( tund, src_id, destination_addr )
                 next_tick
               end
             end
@@ -227,7 +231,7 @@ module Girl
     ##
     # deal with destination addr
     #
-    def deal_with_destination_addr( tund, src_addr, destination_addr )
+    def deal_with_destination_addr( tund, src_id, destination_addr )
       dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
 
@@ -239,7 +243,7 @@ module Girl
         return false
       end
 
-      local_port = dst.local_address.ip_unpack.last
+      local_port = dst.local_address.ip_port
 
       @dst_infos[ dst ] = {
         local_port: local_port, # 本地端口
@@ -255,10 +259,10 @@ module Girl
       add_read( dst, :dst )
 
       tund_info = @tund_infos[ tund ]
-      tund_info[ :dst_local_ports ][ src_addr ] = local_port
+      tund_info[ :dst_local_ports ][ src_id ] = local_port
       tund_info[ :dst_exts ][ local_port ] = {
         dst: dst,                  # dst
-        src_addr: src_addr,        # 近端src地址
+        src_id: src_id,            # 近端src id
         wmems: {},                 # 写后 pack_id => data
         send_ats: {},              # 上一次发出时间 pack_id => send_at
         biggest_pack_id: 0,        # 发到几
@@ -270,7 +274,7 @@ module Girl
         last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
       }
 
-      data = [ [ 0, PAIRED ].pack( 'Q>C' ), src_addr, [ local_port ].pack( 'n' ) ].join
+      data = [ 0, PAIRED, src_id, local_port ].pack( 'Q>CQ>n' )
       # puts "debug1 add ctlmsg paired #{ data.inspect }"
       add_tund_ctlmsg( tund, data )
 
@@ -344,7 +348,7 @@ module Girl
       dst_info = @dst_infos[ dst ]
       dst_info[ :wbuff ] << data
 
-      if dst_info[ :wbuff ].bytesize >= PROXY_CHUNK_SIZE
+      if dst_info[ :wbuff ].bytesize >= CHUNK_SIZE
         spring = dst_info[ :chunks ].size > 0 ? ( dst_info[ :spring ] + 1 ) : 0
         filename = "#{ Process.pid }-#{ dst_info[ :local_port ] }.#{ spring }"
         chunk_path = File.join( @dst_chunk_dir, filename )
@@ -480,7 +484,7 @@ module Girl
       dst_ext = tund_info[ :dst_exts ].delete( dst_local_port )
 
       if dst_ext
-        tund_info[ :dst_local_ports ].delete( dst_ext[ :src_addr ] )
+        tund_info[ :dst_local_ports ].delete( dst_ext[ :src_id ] )
       end
     end
 
@@ -724,7 +728,7 @@ module Girl
 
       tund = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       tund.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
-      port = tund.local_address.ip_unpack.last
+      port = tund.local_address.ip_port
 
       @tunneling_tunds[ from_addr ] = tund
       @tunds[ port ] = tund
@@ -736,9 +740,8 @@ module Girl
         chunks: [],           # 块队列 filename
         spring: 0,            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
         tun_addr: from_addr,  # tun地址
-        is_tunneled: false,   # 是否已和tun打通
         dst_exts: {},         # dst额外信息 dst_addr => {}
-        dst_local_ports: {},  # src_addr => dst_local_port
+        dst_local_ports: {},  # src_id => dst_local_port
         paused: false,        # 是否暂停写
         resendings: [],       # 重传队列 [ dst_addr, pack_id ]
         created_at: Time.new, # 创建时间
@@ -758,7 +761,7 @@ module Girl
     #
     def read_dst( dst )
       begin
-        data = dst.read_nonblock( PROXY_PACK_SIZE )
+        data = dst.read_nonblock( PACK_SIZE )
       rescue IO::WaitReadable, Errno::EINTR
         return
       rescue Exception => e
@@ -791,11 +794,16 @@ module Girl
       tund_info = @tund_infos[ tund ]
 
       if from_addr != tund_info[ :tun_addr ]
-        puts "p#{ Process.pid } #{ Time.new } #{ addrinfo.inspect } not match #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
-        return
+        if addrinfo.ip_port == Addrinfo.new( tund_info[ :tun_addr ] ).ip_port
+          puts "p#{ Process.pid } #{ Time.new } tun ip changed #{ addrinfo.inspect }"
+          tund_info[ :tun_addr ] = from_addr
+        else
+          puts "p#{ Process.pid } #{ Time.new } #{ addrinfo.inspect } not match #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
+          return
+        end
       end
 
-      tund_info[ :is_tunneled ] = true
+      tund_info[ :last_recv_at ] = now
       pack_id = data[ 0, 8 ].unpack( 'Q>' ).first
 
       if pack_id == 0
@@ -803,9 +811,9 @@ module Girl
 
         case ctl_num
         when A_NEW_SOURCE
-          src_addr = data[ 9, 16 ]
-          dst_local_port = tund_info[ :dst_local_ports ][ src_addr ]
-          # puts "debug1 got a new source #{ Addrinfo.new( src_addr ).inspect }"
+          src_id = data[ 9, 8 ].unpack( 'Q>' ).first
+          dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
+          # puts "debug1 got a new source #{ src_id }"
 
           if dst_local_port
             dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
@@ -816,29 +824,25 @@ module Girl
             end
 
             # puts "debug1 readd ctlmsg paired #{ dst_local_port }"
-            data2 = [ [ 0, PAIRED ].pack( 'Q>C' ), src_addr, [ dst_local_port ].pack( 'n' ) ].join
+            data2 = [ 0, PAIRED, src_id, dst_local_port ].pack( 'Q>CQ>n' )
             add_tund_ctlmsg( tund, data2 )
             return
           end
 
-          tund_info[ :last_recv_at ] = now
-
-          data = data[ 25..-1 ]
+          data = data[ 17..-1 ]
           # puts "debug1 #{ data }"
           destination_domain_port = @custom.decode( data )
-          resolve_domain( tund, src_addr, destination_domain_port )
+          resolve_domain( tund, src_id, destination_domain_port )
         when SOURCE_STATUS
-          src_addr = data[ 9, 16 ]
-          biggest_src_pack_id, continue_dst_pack_id  = data[ 25, 16 ].unpack( 'Q>Q>' )
+          src_id, biggest_src_pack_id, continue_dst_pack_id  = data[ 9, 24 ].unpack( 'Q>Q>Q>' )
 
-          dst_local_port = tund_info[ :dst_local_ports ][ src_addr ]
+          dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
           return unless dst_local_port
 
           dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
           return unless dst_ext
 
           # puts "debug2 got source status"
-          tund_info[ :last_recv_at ] = now
 
           # 更新对面发到几
           if biggest_src_pack_id > dst_ext[ :biggest_src_pack_id ]
@@ -880,7 +884,7 @@ module Girl
                 break
               end
 
-              data2 = [ [ 0, MISS ].pack( 'Q>C' ), src_addr, [ pack_id_begin, pack_id_end ].pack( 'Q>Q>' ) ].join
+              data2 = [ 0, MISS, src_id, pack_id_begin, pack_id_end ].pack( 'Q>CQ>Q>Q>' )
               add_tund_ctlmsg( tund, data2 )
               pack_count += ( pack_id_end - pack_id_begin + 1 )
             end
@@ -891,8 +895,6 @@ module Girl
           dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
           return unless dst_ext
 
-          tund_info[ :last_recv_at ] = now
-
           ( pack_id_begin..pack_id_end ).each do | pack_id |
             send_at = dst_ext[ :send_ats ][ pack_id ]
 
@@ -904,18 +906,15 @@ module Girl
 
           add_write( tund )
         when FIN1
-          src_addr = data[ 9, 16 ]
-          biggest_src_pack_id, continue_dst_pack_id = data[ 25, 16 ].unpack( 'Q>Q>' )
+          src_id, biggest_src_pack_id, continue_dst_pack_id = data[ 9, 24 ].unpack( 'Q>Q>Q>' )
 
-          dst_local_port = tund_info[ :dst_local_ports ][ src_addr ]
+          dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
           return unless dst_local_port
 
           dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
           return unless dst_ext
 
-          tund_info[ :last_recv_at ] = now
-
-          # puts "debug1 got fin1 #{ Addrinfo.new( src_addr ).inspect } biggest src pack #{ biggest_src_pack_id } completed dst pack #{ continue_dst_pack_id }"
+          # puts "debug1 got fin1 #{ src_id } biggest src pack #{ biggest_src_pack_id } completed dst pack #{ continue_dst_pack_id }"
           dst_ext[ :is_src_closed ] = true
           dst_ext[ :biggest_src_pack_id ] = biggest_src_pack_id
           release_wmems( dst_ext, continue_dst_pack_id )
@@ -926,36 +925,31 @@ module Girl
             set_is_closing( dst_ext[ :dst ] )
           end
         when FIN2
-          src_addr = data[ 9, 16 ]
+          src_id = data[ 9, 8 ].unpack( 'Q>' ).first
 
-          dst_local_port = tund_info[ :dst_local_ports ][ src_addr ]
+          dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
           return unless dst_local_port
 
-          tund_info[ :last_recv_at ] = now
-
           # puts "debug1 1-2. recv fin2 -> del dst ext"
           del_dst_ext( tund, dst_local_port )
         when TUN_FIN
           puts "p#{ Process.pid } #{ Time.new } recv tun fin"
-          tund_info[ :last_recv_at ] = now
           set_is_closing( tund )
         end
 
         return
       end
 
-      src_addr = data[ 8, 16 ]
+      src_id = data[ 8, 8 ].unpack( 'Q>' ).first
 
-      dst_local_port = tund_info[ :dst_local_ports ][ src_addr ]
+      dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
       return unless dst_local_port
 
       dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
       return if dst_ext.nil? || dst_ext[ :dst ].closed?
       return if ( pack_id <= dst_ext[ :continue_src_pack_id ] ) || dst_ext[ :pieces ].include?( pack_id )
 
-      tund_info[ :last_recv_at ] = now
-
-      data = data[ 24..-1 ]
+      data = data[ 16..-1 ]
       # puts "debug2 got pack #{ pack_id }"
 
       if pack_id <= CONFUSE_UNTIL

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.62.0'.freeze
+  VERSION = '0.66.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.66.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: