p2p2 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a5f46d1721cdfa12068de247463e0b44225c073d236928a30ffe726b81ad341
-  data.tar.gz: e53f2852e23d3e6679c1c961fdac1189663fa840729a9dc7bbac812c27fdbbf6
+  metadata.gz: 3a8d2cfcbc87835a4412869ae872fb7cba49c48b8e4f94c81cf5678b39f34746
+  data.tar.gz: c39358930d074c99c8260c9207d821ab6f94f6bb424cc0d32af0165c1218d196
 SHA512:
-  metadata.gz: d378a5d52df695c89a77ae9532c75bb19cf3c4b3a3de765e480f6ae8a7f09bfe3d77e8e7686a71e825a6ba7207061a9a467df758b21283f73f3056b7b0a4e0d3
-  data.tar.gz: 668f2a7d06f4e07dd0ad5adcd22a7fbc4bbd3c0bc7931fa4e0fa801c62b197fbefd52a13532feed14e877d36e9b047008033243f8dc682853cb03aeaa2dcdd9a
+  metadata.gz: 6c64ac875943bafca20918e9a44a8588ddc77cff74ce52965facf4014fa79c87e8b7fb95164419bed4c015d90765330d2f4700b04c1cafe33c08cc4483f4e482
+  data.tar.gz: ce6fe66c73e8bbc676ac8d23c1de988c89dbcead089fc6c4c7ae65845954f48306926c6beb5d6abc8d3f07bf8f8ec2c4e2ea1b0694830530887b334be14bc855

data/lib/p2p2/p1.rb

@@ -173,15 +173,19 @@ module P2p2
       if app_id == 0
         case data[ 8 ].unpack( 'C' ).first
         when PEER_ADDR
-          return if sockaddr != @p2pd_sockaddr
-
-          unless info[ :p2_addr ]
-            info[ :p2_addr ] = data[ 9..-1 ]
-            # puts "debug peer addr #{ Addrinfo.new( info[ :p2_addr ] ).ip_unpack.inspect } #{ Time.new }"
-            info[ :last_traffic_at ] = now
-            send_heartbeat( p1 )
-            loop_send_status( p1 )
-          end
+          return if info[ :peer_addr ] || ( sockaddr != @p2pd_sockaddr )
+
+          peer_addr = data[ 9..-1 ]
+          info[ :peer_addr ] = data[ 9..-1 ]
+          # puts "debug peer addr #{ Addrinfo.new( info[ :peer_addr ] ).ip_unpack.inspect } #{ Time.new }"
+          loop_send_heartbeat( p1 )
+        when HEARTBEAT
+          return if info[ :p2_addr ] || ( sockaddr != info[ :peer_addr ] )
+
+          info[ :p2_addr ] = sockaddr
+          # puts "debug p2 addr #{ Addrinfo.new( info[ :p2_addr ] ).ip_unpack.inspect } #{ Time.new }"
+          info[ :last_traffic_at ] = now
+          loop_send_status( p1 )
         when A_NEW_APP
           return if sockaddr != info[ :p2_addr ]
 
@@ -588,7 +592,8 @@ module P2p2
         caches: [],          # 块读出缓存 [ shadow_id, data ]
         chunks: [],          # 块队列 filename
         spring: 0,           # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        p2_addr: nil,        # 远端地址
+        peer_addr: nil,      # 对面地址，连发心跳包打洞，离p2pd近的一方通常会撞死几个直到对面出来
+        p2_addr: nil,        # p2地址
         shadow_exts: {},     # 长命信息 shadow_id => {}
         shadow_ids: {},      # shadow_id => app_id
         app_ids: {},         # app_id => shadow_id
@@ -613,7 +618,7 @@ module P2p2
     def loop_expire( p1 )
       Thread.new do
         loop do
-          sleep 30
+          sleep 60
 
           break if p1.closed?
 
@@ -625,13 +630,29 @@ module P2p2
             end
           else
             @mutex.synchronize do
-              send_heartbeat( p1 )
+              send_heartbeat( p1, p1_info[ :p2_addr ] )
             end
           end
         end
       end
     end
 
+    def loop_send_heartbeat( p1 )
+      Thread.new do
+        30.times do
+          break if p1.closed?
+
+          p1_info = @infos[ p1 ]
+
+          @mutex.synchronize do
+            send_heartbeat( p1, p1_info[ :peer_addr ] )
+          end
+
+          sleep STATUS_INTERVAL
+        end
+      end
+    end
+
     def loop_send_status( p1 )
       Thread.new do
         loop do
@@ -732,10 +753,9 @@ module P2p2
       end
     end
 
-    def send_heartbeat( p1 )
-      info = @infos[ p1 ]
+    def send_heartbeat( p1, target_addr )
       ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
-      send_pack( p1, ctlmsg, info[ :p2_addr ] )
+      send_pack( p1, ctlmsg, target_addr )
     end
 
     def send_pack( sock, data, target_sockaddr )

data/lib/p2p2/p2.rb

@@ -211,8 +211,6 @@ module P2p2
       end
     end
 
-
-
     ##
     # read p2
     #
@@ -226,15 +224,18 @@ module P2p2
       if shadow_id == 0
         case data[ 8 ].unpack( 'C' ).first
         when PEER_ADDR
-          return if sockaddr != @p2pd_sockaddr
-
-          unless info[ :p1_addr ]
-            info[ :p1_addr ] = data[ 9..-1 ]
-            # puts "debug peer addr #{ Addrinfo.new( info[ :p1_addr ] ).ip_unpack.inspect } #{ Time.new }"
-            info[ :last_traffic_at ] = now
-            send_heartbeat( p2 )
-            loop_send_status( p2 )
-          end
+          return if info[ :peer_addr ] || ( sockaddr != @p2pd_sockaddr )
+
+          info[ :peer_addr ] = data[ 9..-1 ]
+          # puts "debug peer addr #{ Addrinfo.new( info[ :peer_addr ] ).ip_unpack.inspect } #{ Time.new }"
+          loop_send_heartbeat( p2 )
+        when HEARTBEAT
+          return if info[ :p1_addr ] || ( sockaddr != info[ :peer_addr ] )
+
+          info[ :p1_addr ] = sockaddr
+          # puts "debug p1 addr #{ Addrinfo.new( info[ :p1_addr ] ).ip_unpack.inspect } #{ Time.new }"
+          info[ :last_traffic_at ] = now
+          loop_send_status( p2 )
         when PAIRED
           return if sockaddr != info[ :p1_addr ]
 
@@ -616,7 +617,8 @@ module P2p2
         caches: [],          # 块读出缓存 [ app_id, data ]
         chunks: [],          # 块队列 filename
         spring: 0,           # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        p1_addr: nil,        # 远端地址
+        peer_addr: nil,      # 对面地址，连发心跳包打洞，离p2pd近的一方通常会撞死几个直到对面出来
+        p1_addr: nil,        # p1地址
         app_exts: {},        # 传输相关 app_id => {}
         app_ids: {},         # app_id => shadow_id
         shadow_ids: {},      # shadow_id => app_id
@@ -641,7 +643,7 @@ module P2p2
     def loop_expire( p2 )
       Thread.new do
         loop do
-          sleep 30
+          sleep 60
 
           break if p2.closed?
 
@@ -653,13 +655,29 @@ module P2p2
             end
           else
             @mutex.synchronize do
-              send_heartbeat( p2 )
+              send_heartbeat( p2, p2_info[ :p1_addr ] )
             end
           end
         end
       end
     end
 
+    def loop_send_heartbeat( p2 )
+      Thread.new do
+        30.times do
+          break if p2.closed?
+
+          p2_info = @infos[ p2 ]
+
+          @mutex.synchronize do
+            send_heartbeat( p2, p2_info[ :peer_addr ] )
+          end
+
+          sleep STATUS_INTERVAL
+        end
+      end
+    end
+
     def loop_send_status( p2 )
       Thread.new do
         loop do
@@ -792,10 +810,9 @@ module P2p2
       end
     end
 
-    def send_heartbeat( p2 )
-      info = @infos[ p2 ]
+    def send_heartbeat( p2, target_addr )
       ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
-      send_pack( p2, ctlmsg, info[ :p1_addr ] )
+      send_pack( p2, ctlmsg, target_addr )
     end
 
     def send_pack( sock, data, target_sockaddr )

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

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