p2p2 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa63a6c12f8e8b3b84c0196b2722ec6b4180b54aab43e611523206c126cc3f2
-  data.tar.gz: 6cfa8c63577bd98a1a4384cced2e2b515cdf892c1eea205a2c14c89bd38dc37d
+  metadata.gz: 89df8a602b433ccee8fcd513d2c981f00fecec8e43fe87880b556e35f7d8501f
+  data.tar.gz: 5b038d3b9e91156b8a2daec9f8f68709c7e26f7dbbaac24fef988021402123a9
 SHA512:
-  metadata.gz: 470798efe2ac947d1315df539d6f294d6ce5145804f7791d2c1e16da2d608495301be0a8a2b8959d912d58c1c2caeeb6095ffe55ed91f3024f9e15e98f82b24b
-  data.tar.gz: 546f3e7791143b82c1583e80871832394ec1fc5e2ebd65bc3c4e29dca1358c022221c2c448a1529730140eeab0f764fcd0de4f1cdd8bdc099b4034ded342ad42
+  metadata.gz: 429c289884013dcc5c38f053bdeb1bd633717fb7693bd3338587b82bbbfb8d502d4d8796b3c3d51692a070793564604cb724be8be9af62621bff4e7c4b382496
+  data.tar.gz: 3b5a22f02861ab18197630475857722c0bc51a7ab3954b375a0e218306b3f1b6d2a1950fa2a96b47f0ee9c40b5b000b3dec4402d911c88aae9f01a34257c2957

data/lib/p2p2/p1.rb

@@ -186,6 +186,7 @@ module P2p2
           # puts "debug p2 addr #{ Addrinfo.new( info[ :p2_addr ] ).ip_unpack.inspect } #{ Time.new }"
           info[ :last_traffic_at ] = now
           loop_send_status( p1 )
+          loop_expire( p1 )
         when A_NEW_APP
           return if sockaddr != info[ :p2_addr ]
 
@@ -612,26 +613,36 @@ module P2p2
 
       send_pack( p1, @title, @p2pd_sockaddr )
       add_read( p1 )
-      loop_expire( p1 )
+      loop_send_char( p1 )
     end
 
-    def loop_expire( p1 )
+    def loop_send_char( p1 )
       Thread.new do
-        loop do
-          sleep 60
+        is_timeout = true
 
-          break if p1.closed?
+        12.times do
+          sleep 5
+
+          if p1.closed?
+            is_timeout = false
+            break
+          end
 
           p1_info = @infos[ p1 ]
 
-          if p1_info[ :p2_addr ].nil? || ( Time.new - p1_info[ :last_traffic_at ] > EXPIRE_AFTER )
-            @mutex.synchronize do
-              @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
-            end
-          else
-            @mutex.synchronize do
-              send_heartbeat( p1, p1_info[ :p2_addr ] )
-            end
+          if p1_info[ :peer_addr ]
+            is_timeout = false
+            break
+          end
+
+          @mutex.synchronize do
+            send_pack( p1, [ rand( 128 ) ].pack( 'C' ), @p2pd_sockaddr )
+          end
+        end
+
+        if is_timeout
+          @mutex.synchronize do
+            @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
           end
         end
       end
@@ -639,7 +650,7 @@ module P2p2
 
     def loop_send_heartbeat( p1 )
       Thread.new do
-        30.times do
+        20.times do
           break if p1.closed?
 
           p1_info = @infos[ p1 ]
@@ -650,6 +661,35 @@ module P2p2
 
           sleep STATUS_INTERVAL
         end
+
+        if !p1.closed?
+          p1_info = @infos[ p1 ]
+
+          unless p1_info[ :p2_addr ]
+            @mutex.synchronize do
+              @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
+            end
+          end
+        end
+      end
+    end
+
+    def loop_expire( p1 )
+      Thread.new do
+        loop do
+          sleep 5
+          break if p1.closed?
+
+          p1_info = @infos[ p1 ]
+
+          @mutex.synchronize do
+            if Time.new - p1_info[ :last_traffic_at ] > EXPIRE_AFTER
+              @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
+            else
+              send_heartbeat( p1, p1_info[ :p2_addr ] )
+            end
+          end
+        end
       end
     end
 

data/lib/p2p2/p2.rb

@@ -239,6 +239,7 @@ module P2p2
           # puts "debug p1 addr #{ Addrinfo.new( info[ :p1_addr ] ).ip_unpack.inspect } #{ Time.new }"
           info[ :last_traffic_at ] = now
           loop_send_status( p2 )
+          loop_expire( p2 )
         when PAIRED
           return if sockaddr != info[ :p1_addr ]
 
@@ -642,26 +643,36 @@ module P2p2
 
       send_pack( p2, @title, @p2pd_sockaddr )
       add_read( p2 )
-      loop_expire( p2 )
+      loop_send_char( p2 )
     end
 
-    def loop_expire( p2 )
+    def loop_send_char( p2 )
       Thread.new do
-        loop do
-          sleep 60
+        is_timeout = true
 
-          break if p2.closed?
+        12.times do
+          sleep 5
+
+          if p2.closed?
+            is_timeout = false
+            break
+          end
 
           p2_info = @infos[ p2 ]
 
-          if p2_info[ :p1_addr ].nil? || ( Time.new - p2_info[ :last_traffic_at ] > EXPIRE_AFTER )
-            @mutex.synchronize do
-              @ctlw.write( [ CTL_CLOSE, p2.object_id ].pack( 'CQ>' ) )
-            end
-          else
-            @mutex.synchronize do
-              send_heartbeat( p2, p2_info[ :p1_addr ] )
-            end
+          if p2_info[ :peer_addr ]
+            is_timeout = false
+            break
+          end
+
+          @mutex.synchronize do
+            send_pack( p2, [ rand( 128 ) ].pack( 'C' ), @p2pd_sockaddr )
+          end
+        end
+
+        if is_timeout
+          @mutex.synchronize do
+            @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
           end
         end
       end
@@ -669,7 +680,7 @@ module P2p2
 
     def loop_send_heartbeat( p2 )
       Thread.new do
-        30.times do
+        20.times do
           break if p2.closed?
 
           p2_info = @infos[ p2 ]
@@ -680,6 +691,37 @@ module P2p2
 
           sleep STATUS_INTERVAL
         end
+
+        if !p2.closed?
+          p2_info = @infos[ p2 ]
+
+          unless p2_info[ :p1_addr ]
+            @mutex.synchronize do
+              @ctlw.write( [ CTL_CLOSE, p2.object_id ].pack( 'CQ>' ) )
+            end
+          end
+        end
+      end
+    end
+
+    def loop_expire( p2 )
+      Thread.new do
+        loop do
+          sleep 5
+          break if p2.closed?
+
+          p2_info = @infos[ p2 ]
+
+          if Time.new - p2_info[ :last_traffic_at ] > EXPIRE_AFTER
+            @mutex.synchronize do
+              @ctlw.write( [ CTL_CLOSE, p2.object_id ].pack( 'CQ>' ) )
+            end
+          else
+            @mutex.synchronize do
+              send_heartbeat( p2, p2_info[ :p1_addr ] )
+            end
+          end
+        end
       end
     end
 

data/lib/p2p2/p2pd.rb

@@ -88,20 +88,18 @@ module P2p2
 
     def read_p2pd( p2pd )
       data, addrinfo, rflags, *controls = p2pd.recvmsg
-      return if ( data.bytesize > 255 ) || ( data =~ /\/|\.|\ / )
+      return if ( data.bytesize == 1 ) || ( data.bytesize > 255 ) || ( data =~ /\/|\.|\ / )
 
       sockaddr = addrinfo.to_sockaddr
       title_path = File.join( @p2pd_dir, data )
 
       unless File.exist?( title_path )
         write_title( title_path, sockaddr )
-        send_heartbeat( p2pd, sockaddr )
         return
       end
 
       if Time.new - File.mtime( title_path ) > 300
         write_title( title_path, sockaddr )
-        send_heartbeat( p2pd, sockaddr )
         return
       end
 
@@ -109,7 +107,6 @@ module P2p2
 
       if Addrinfo.new( op_sockaddr ).ip_address == addrinfo.ip_address
         write_title( title_path, sockaddr )
-        send_heartbeat( p2pd, sockaddr )
         return
       end
 
@@ -126,11 +123,6 @@ module P2p2
       end
     end
 
-    def send_heartbeat( p2pd, target_addr )
-      ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
-      send_pack( p2pd, ctlmsg, target_addr )
-    end
-
     def send_pack( sock, data, target_sockaddr )
       begin
         # puts "debug sendmsg #{ data.inspect } #{ Time.new }"

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - takafan