p2p2 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8d2cfcbc87835a4412869ae872fb7cba49c48b8e4f94c81cf5678b39f34746
-  data.tar.gz: c39358930d074c99c8260c9207d821ab6f94f6bb424cc0d32af0165c1218d196
+  metadata.gz: c0ed72836f10cc9afc6e1cadf43b2e2c817a86c4ea1c3519f1c8c028f361b792
+  data.tar.gz: f0040b2538df25c2b68d96c4341dacd984bacdf66d07f8743589bbd24b286312
 SHA512:
-  metadata.gz: 6c64ac875943bafca20918e9a44a8588ddc77cff74ce52965facf4014fa79c87e8b7fb95164419bed4c015d90765330d2f4700b04c1cafe33c08cc4483f4e482
-  data.tar.gz: ce6fe66c73e8bbc676ac8d23c1de988c89dbcead089fc6c4c7ae65845954f48306926c6beb5d6abc8d3f07bf8f8ec2c4e2ea1b0694830530887b334be14bc855
+  metadata.gz: 3bbad24d31ba85bfd00c91cedfcea41f51097bfd2e7ddb44f631605a0ac36b497432667d78d9dd12bcef886c33b9b881e941bf4357d4819cb98ecc10070fc1d0
+  data.tar.gz: a06e1edf7702560b9e5b61e59937e11ec90f89a11015d1ddfc2429d66df4f21731ab3b3c2ac1dc91ade411a0f32f3b9d94694736aace0c70d281f39632f01c66

data/lib/p2p2/p2.rb

@@ -55,7 +55,6 @@ module P2p2
       puts 'looping'
 
       new_appd
-      new_p2
 
       loop do
         rs, ws = IO.select( @reads, @writes )
@@ -134,6 +133,10 @@ module P2p2
         return
       end
 
+      if @p2.nil? || @p2.closed?
+        new_p2
+      end
+
       app_id = app.object_id
 
       @socks[ app_id ] = app
@@ -388,7 +391,8 @@ module P2p2
           info[ :fin2s ].delete( app_id )
         when P1_FIN
           return if sockaddr != info[ :p1_addr ]
-          raise "recv p1 fin #{ Time.new }"
+          puts "recv p1 fin #{ Time.new }"
+          add_closing( p2 )
         end
 
         return
@@ -511,7 +515,8 @@ module P2p2
     #
     def write_p2( p2 )
       if @closings.include?( p2 )
-        quit!
+        close_p2( p2 )
+        return
       end
 
       now = Time.new
@@ -843,6 +848,19 @@ module P2p2
       add_write( sock )
     end
 
+    def close_p2( p2 )
+      info = close_sock( p2 )
+
+      info[ :chunks ].each do | filename |
+        begin
+          File.delete( File.join( @p2_chunk_dir, filename ) )
+        rescue Errno::ENOENT
+        end
+      end
+
+      info[ :app_exts ].each{ | _, ext | add_closing( ext[ :app ] ) }
+    end
+
     def close_app( app )
       info = close_sock( app )
       p2 = info[ :p2 ]

data/lib/p2p2/p2pd.rb

@@ -88,7 +88,7 @@ module P2p2
 
     def read_p2pd( p2pd )
       data, addrinfo, rflags, *controls = p2pd.recvmsg
-      return if data.size > 255
+      return if ( data.bytesize > 255 ) || ( data =~ /\/|\.|\ / )
 
       sockaddr = addrinfo.to_sockaddr
       title_path = File.join( @p2pd_dir, data )
@@ -118,7 +118,7 @@ module P2p2
       begin
         # puts "debug write title #{ title_path } #{ Time.new }"
         IO.binwrite( title_path, sockaddr )
-      rescue Errno::ENOENT, ArgumentError => e
+      rescue Errno::EISDIR, Errno::ENAMETOOLONG, Errno::ENOENT, ArgumentError => e
         puts "binwrite #{ e.class } #{ Time.new }"
       end
     end

data/lib/p2p2/version.rb

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

metadata

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