p2p2 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b2e5798d8439e44d3acbb68a9a8749a1d7dc69c43a5f6effea95f6360185a0a
-  data.tar.gz: a306f7dfe4be190712e7317de0f7324135e16075a39af9d7d3408aa3ab978bd5
+  metadata.gz: 8b794e3b18c3c83d28013dc743181bd0f72ff9dc1c692266f68d360ebcc3855b
+  data.tar.gz: 99ff62c980d909c10d412f076d7aac4e81afe195a824c7fd36b6ac78b2c7e777
 SHA512:
-  metadata.gz: 8542ffdd4ed556d9a7d0aa3fbbf3f8da180610bb6a3d8bf04567bb4bc75852f45fd6821c748490e42cf85d51fdaa0b7abf62a49eff50e38565584523de79c07a
-  data.tar.gz: a6f98e9fb4116a19e473ed46e4767e54bf4113bb7e91da6970f64ba75f0f5fbf4f1a5f2118d6dff970640aecf9ad39cc34854ed0e317ef740c77589d1b60ba21
+  metadata.gz: b6cf3c77031cf3f53d1f8f884daca762140f68ff40c2538618058a2ffa8747d8c722069e432c02b3165ee3451545c82cd43177ba38e80218459c91b5a37bd978
+  data.tar.gz: 177432a07d6976627d629658dd8e61ac105d538225e43af30842fe05d4378abfd2be28d47b4c2616a0e733b80228a6badcf33f21c9464cfe5ff3ce78a0c16d2a

data/lib/p2p2/p1_worker.rb

@@ -90,7 +90,7 @@ module P2p2
             now = Time.new
 
             unless @tund.closed?
-              if @tund_info[ :peer_addr ]
+              if @tund_info[ :peer_addr ] && @tund_info[ :peer_at ]
                 if @tund_info[ :tun_addr ]
                   if now - check_at >= CHECK_EXPIRE_INTERVAL
                     if now - @tund_info[ :last_recv_at ] > EXPIRE_AFTER
@@ -118,8 +118,7 @@ module P2p2
                   # puts "debug2 heartbeat"
                   add_tund_ctlmsg( pack_a_heartbeat )
                   next_tick
-                elsif now - @tund_info[ :created_at ] > EXPIRE_NEW
-                  # no tun addr
+                elsif now - @tund_info[ :peer_at ] > EXPIRE_NEW
                   puts "#{ Time.new } expire new tund"
                   set_is_closing( @tund )
                   next_tick
@@ -221,7 +220,8 @@ module P2p2
         caches: [],           # 块读出缓存 [ dst_local_port, pack_id, data ]
         chunks: [],           # 块队列 filename
         spring: 0,            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        peer_addr: nil,       # 对面地址
+        peer_addr: nil,       # 配对地址
+        peer_at: nil,         # 收到配对地址时间
         tun_addr: nil,        # 连通后的tun地址
         dst_exts: {},         # dst额外信息 dst_local_port => {}
         dst_local_ports: {},  # src_id => dst_local_port
@@ -706,6 +706,7 @@ module P2p2
           puts "#{ Time.new } got peer addr #{ Addrinfo.new( peer_addr ).inspect }"
 
           @tund_info[ :peer_addr ] = peer_addr
+          @tund_info[ :peer_at ] = now
           loop_punch_peer
         when HEARTBEAT
           from_addr = addrinfo.to_sockaddr

data/lib/p2p2/p2_worker.rb

@@ -91,7 +91,7 @@ module P2p2
           @mutex.synchronize do
             now = Time.new
 
-            if @tun && !@tun.closed? && @tun_info[ :peer_addr ]
+            if @tun && !@tun.closed? && @tun_info[ :peer_addr ] && @tun_info[ :peer_at ]
               if @tun_info[ :tund_addr ]
                 if now - check_at >= CHECK_EXPIRE_INTERVAL
                   if now - @tun_info[ :last_recv_at ] > EXPIRE_AFTER
@@ -119,8 +119,7 @@ module P2p2
                 # puts "debug2 heartbeat"
                 add_tun_ctlmsg( pack_a_heartbeat )
                 next_tick
-              elsif now - @tun_info[ :created_at ] > EXPIRE_NEW
-                # no tund addr
+              elsif now - @tun_info[ :peer_at ] > EXPIRE_NEW
                 puts "#{ Time.new } expire new tun"
                 set_is_closing( @tun )
                 next_tick
@@ -249,7 +248,8 @@ module P2p2
         caches: [],           # 块读出缓存 [ src_id, pack_id, data ]
         chunks: [],           # 块队列 filename
         spring: 0,            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        peer_addr: nil,       # 对面地址
+        peer_addr: nil,       # 配对地址
+        peer_at: nil,         # 收到配对地址时间
         tund_addr: nil,       # 连通后的tund地址
         src_exts: {},         # src额外信息 src_id => {}
         src_ids: {},          # dst_port => src_id
@@ -794,6 +794,7 @@ module P2p2
           puts "#{ Time.new } got peer addr #{ Addrinfo.new( peer_addr ).inspect }"
 
           @tun_info[ :peer_addr ] = peer_addr
+          @tun_info[ :peer_at ] = now
           loop_punch_peer
         when HEARTBEAT
           from_addr = addrinfo.to_sockaddr

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = '0.25.0'.freeze
+  VERSION = '0.26.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies: []
 description: p2p通道。nat穿透。
 email: