p2p2 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5928f54a6129f64cc843748d5f337d9f5fdccfed90239b9a594bf6ecd577bc
-  data.tar.gz: 1ec20b3e82bf69b5e371ceb89dcc666b97f0a2407072647271e481c7a3166e4e
+  metadata.gz: 93622e13a1c4a94debd120c4295bed86f0d451f83f05ecfc4bb2b29f63320a83
+  data.tar.gz: edcf0aefb969653a5b73201722ac2ab61a24488f5124a0cba3d78f2c0fc17073
 SHA512:
-  metadata.gz: 2b35b3bc6a54ceb236aee2f9258580c381397619dcdfbe4dfd3ea61c8c6deeda1e6e188a64b6921794d801fd2838f5db3c7e00462be3cebfe5158e589356a8ff
-  data.tar.gz: 9bd26990e4e3aff5285a10b011c322251ba3c64f5379e02172d70f16d9624355c8a9ec3f194b108c3681b966b38749d4bded464a9c9588bf3aca4e7645026e3f
+  metadata.gz: 558629edb45e53c9a9d0f1ad964e91b3b89c313181e8bbce2477ad0fbdad7aae43db37f59235340e4004dd6390b555817c513b88417c9e95fa9fbcdb2083e772
+  data.tar.gz: 387354b5932fb4a7994a1970e649521d357db94e7eb6521fa33991ccd25a4436c2064e43508e51adeb5827871f309cb41dbe0caf2c22fa18a375d269e8606232

data/lib/p2p2/p1_worker.rb

@@ -99,14 +99,14 @@ module P2p2
                     else
                       @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 "#{ Time.new } expire dst ext #{ dst_local_port }"
+                          puts "#{ Time.new } expire dst ext"
                           del_dst_ext( dst_local_port )
                         end
                       end
                     end
 
                     @dst_infos.each do | dst, dst_info |
-                      if dst_info[ :last_recv_at ].nil? && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
+                      if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
                         puts "#{ Time.new } expire dst"
                         set_is_closing( dst )
                       end
@@ -519,6 +519,7 @@ module P2p2
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -673,7 +674,7 @@ module P2p2
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
 
       if @tund.closed?
         puts "#{ Time.new } tund closed, close dst"
@@ -751,8 +752,7 @@ module P2p2
               cache: '',                  # 块读出缓存
               chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
               spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-              created_at: Time.new,       # 创建时间
-              last_recv_at: nil,          # 上一次收到流量的时间，过期关闭
+              last_continue_at: Time.new, # 上一次发生流量的时间
               is_closing: false           # 是否准备关闭
             }
             add_read( dst, :dst )
@@ -769,7 +769,7 @@ module P2p2
               is_src_closed: false,      # src是否已关闭
               biggest_src_pack_id: 0,    # src最大包号码
               completed_pack_id: 0,      # 完成到几（对面收到几）
-              last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+              last_continue_at: Time.new # 上一次发生流量的时间
             }
           end
 

data/lib/p2p2/p2_worker.rb

@@ -100,14 +100,14 @@ module P2p2
                   else
                     @tun_info[ :src_exts ].each do | src_id, src_ext |
                       if src_ext[ :src ].closed? && ( now - src_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                        puts "#{ Time.new } expire src ext #{ src_id }"
+                        puts "#{ Time.new } expire src ext"
                         del_src_ext( src_id )
                       end
                     end
                   end
 
                   @src_infos.each do | src, src_info |
-                    if src_info[ :last_recv_at ].nil? && ( now - src_info[ :created_at ] > EXPIRE_NEW )
+                    if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
                       puts "#{ Time.new } expire src"
                       set_is_closing( src )
                     end
@@ -263,7 +263,7 @@ module P2p2
       @tun = tun
       @tun_info = tun_info
       add_read( tun, :tun )
-      add_tun_ctlmsg( @room, @p2pd_addr )
+      add_tun_ctlmsg( [ '2', @room ].join, @p2pd_addr )
     end
 
     ##
@@ -546,6 +546,7 @@ module P2p2
       # puts "debug2 write src #{ written }"
       data = data[ written..-1 ]
       src_info[ from ] = data
+      src_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -697,16 +698,15 @@ module P2p2
       # puts "debug1 accept a src #{ addrinfo.inspect } #{ id }"
 
       @src_infos[ src ] = {
-        id: id,                  # id
-        biggest_pack_id: 0,      # 最大包号码
-        rbuffs: [],              # p1端dst未准备好，暂存流量 [ pack_id, data ]
-        wbuff: '',               # 写前
-        cache: '',               # 块读出缓存
-        chunks: [],              # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,               # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,    # 创建时间
-        last_recv_at: nil,       # 上一次收到流量的时间，过期关闭
-        is_closing: false        # 是否准备关闭
+        id: id,                     # id
+        biggest_pack_id: 0,         # 最大包号码
+        rbuffs: [],                 # p1端dst未准备好，暂存流量 [ pack_id, data ]
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( src, :src )
@@ -726,7 +726,7 @@ module P2p2
         is_dst_closed: false,      # dst是否已关闭
         biggest_dst_pack_id: 0,    # dst最大包号码
         completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+        last_continue_at: Time.new # 上一次发生流量的时间
       }
 
       @tun_info[ :src_exts ][ id ] = src_ext
@@ -750,7 +750,7 @@ module P2p2
 
       # puts "debug2 read src #{ data.inspect }"
       src_info = @src_infos[ src ]
-      src_info[ :last_recv_at ] = Time.new
+      src_info[ :last_continue_at ] = Time.new
       src_id = src_info[ :id ]
       src_ext = @tun_info[ :src_exts ][ src_id ]
 

data/lib/p2p2/p2pd_worker.rb

@@ -32,17 +32,21 @@ module P2p2
       data, addrinfo, rflags, *controls = p2pd.recvmsg
       return if ( data.bytesize == 1 ) || ( data.bytesize > 255 ) || ( data =~ /\/|\.|\ / )
 
+      if data[0] == '2'
+        is_p2 = true
+        data = data[ 1..-1 ]
+      else
+        is_p2 = false
+      end
+
       from_addr = addrinfo.to_sockaddr
       room_path = File.join( @p2pd_tmp_dir, data.gsub( "\u0000" , '' ) )
 
-      unless File.exist?( room_path )
-        puts "#{ Time.new } create #{ room_path } #{ addrinfo.inspect }"
-        write_room( room_path, from_addr )
-        return
-      end
-
-      if Time.new - File.mtime( room_path ) > EXPIRE_AFTER
-        puts "#{ Time.new } overwrite #{ room_path } #{ addrinfo.inspect }"
+      if is_p2
+        unless File.exist?( room_path )
+          return
+        end
+      else
         write_room( room_path, from_addr )
         return
       end
@@ -50,13 +54,9 @@ module P2p2
       op_addr = IO.binread( room_path )
       op_addrinfo = Addrinfo.new( op_addr )
 
-      if ( addrinfo.ip_address == op_addrinfo.ip_address ) || ( addrinfo.ip_port == op_addrinfo.ip_port )
-        write_room( room_path, from_addr )
-      else
-        puts "#{ Time.new } paired #{ addrinfo.inspect } #{ op_addrinfo.inspect }"
-        send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), op_addr ].join, from_addr )
-        send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), from_addr ].join, op_addr )
-      end
+      puts "#{ Time.new } paired #{ addrinfo.inspect } #{ op_addrinfo.inspect }"
+      send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), op_addr ].join, from_addr )
+      send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), from_addr ].join, op_addr )
     end
 
     def write_room( room_path, data )

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = '0.22.0'.freeze
+  VERSION = '0.23.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies: []
 description: 内网里的任意应用，访问另一个内网里的应用服务端。
 email: