p2p2 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c19c4e83055ee003d93923f5bc75aa21c2cfb8b678dd09f35405f4ccd7e93cb
-  data.tar.gz: b827a910f9dcbcf48712eb308da98d3231bf8ebe3dc66bf2a07138ef318bbea8
+  metadata.gz: 2b2e5798d8439e44d3acbb68a9a8749a1d7dc69c43a5f6effea95f6360185a0a
+  data.tar.gz: a306f7dfe4be190712e7317de0f7324135e16075a39af9d7d3408aa3ab978bd5
 SHA512:
-  metadata.gz: e1b716246402ff1f8cd6771b0607b78c3d54e754a7ea0189fb9168ad71294569943b7d641c2d3d77046d440cbd50bb22eb4f9cac092741ce6a6555ad3bcb255a
-  data.tar.gz: 730efff6c7c46ddb64d5f87196be76a47fe4aaf74a6a57bee493c76b83f9accc1c0501c4b15aa88a5bc71bdbf6f4e6441e44174fea25cb29605c474bb5641798
+  metadata.gz: 8542ffdd4ed556d9a7d0aa3fbbf3f8da180610bb6a3d8bf04567bb4bc75852f45fd6821c748490e42cf85d51fdaa0b7abf62a49eff50e38565584523de79c07a
+  data.tar.gz: a6f98e9fb4116a19e473ed46e4767e54bf4113bb7e91da6970f64ba75f0f5fbf4f1a5f2118d6dff970640aecf9ad39cc34854ed0e317ef740c77589d1b60ba21

data/lib/p2p2/p1.rb

@@ -6,7 +6,7 @@ require 'p2p2/version'
 require 'socket'
 
 ##
-# P2p2::P1 - 内网里的任意应用，访问另一个内网里的应用服务端。p1端。
+# P2p2::P1 - p2p通道，p1端。
 #
 module P2p2
   class P1

data/lib/p2p2/p1_worker.rb

@@ -374,6 +374,25 @@ module P2p2
       end
     end
 
+    ##
+    # send data
+    #
+    def send_data( tund, data, to_addr )
+      begin
+        tund.sendmsg( data, 0, to_addr )
+      rescue IO::WaitWritable, Errno::EINTR
+        return false
+      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+        puts "#{ Time.new } #{ e.class }, close tund"
+        close_tund( tund )
+        sleep HEARTBEAT_INTERVAL
+        new_a_tund
+        return false
+      end
+
+      true
+    end
+
     ##
     # close dst
     #
@@ -475,15 +494,14 @@ module P2p2
     #
     def write_dst( dst )
       dst_info = @dst_infos[ dst ]
-      data = dst_info[ :cache ]
-      from = :cache
+      from, data = :cache, dst_info[ :cache ]
 
       if data.empty?
         if dst_info[ :chunks ].any?
           path = File.join( @dst_chunk_dir, dst_info[ :chunks ].shift )
 
           begin
-            dst_info[ :cache ] = data = IO.binread( path )
+            data = dst_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "#{ Time.new } read #{ path } #{ e.class }"
@@ -491,8 +509,7 @@ module P2p2
             return
           end
         else
-          data = dst_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, dst_info[ :wbuff ]
         end
       end
 
@@ -532,19 +549,13 @@ module P2p2
         return
       end
 
+      now = Time.new
+
       # 传ctlmsg
       while @tund_info[ :ctlmsgs ].any?
         to_addr, data = @tund_info[ :ctlmsgs ].first
 
-        begin
-          tund.sendmsg( data, 0, to_addr )
-        rescue IO::WaitWritable, Errno::EINTR
-          return
-        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-          puts "#{ Time.new } #{ e.class }, close tund"
-          close_tund( tund )
-          sleep HEARTBEAT_INTERVAL
-          new_a_tund
+        unless send_data( tund, data, to_addr )
           return
         end
 
@@ -560,22 +571,15 @@ module P2p2
           data = dst_ext[ :wmems ][ pack_id ]
 
           if data
-            begin
-              tund.sendmsg( data, 0, @tund_info[ :tun_addr ] )
-            rescue IO::WaitWritable, Errno::EINTR
-              return
-            rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-              puts "#{ Time.new } #{ e.class }, close tund"
-              close_tund( tund )
-              sleep HEARTBEAT_INTERVAL
-              new_a_tund
+            unless send_data( tund, data, @tund_info[ :tun_addr ] )
               return
             end
+
+            dst_ext[ :last_continue_at ] = now
           end
         end
 
         @tund_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -591,8 +595,7 @@ module P2p2
 
       # 取写前
       if @tund_info[ :caches ].any?
-        dst_local_port, pack_id, data = @tund_info[ :caches ].first
-        from = :caches
+        datas = @tund_info[ :caches ]
       elsif @tund_info[ :chunks ].any?
         path = File.join( @tund_chunk_dir, @tund_info[ :chunks ].shift )
 
@@ -613,48 +616,39 @@ module P2p2
           data = data[ ( 12 + pack_size )..-1 ]
         end
 
-        @tund_info[ :caches ] = caches
-        dst_local_port, pack_id, data = caches.first
-        from = :caches
+        datas = @tund_info[ :caches ] = caches
       elsif @tund_info[ :wbuffs ].any?
-        dst_local_port, pack_id, data = @tund_info[ :wbuffs ].first
-        from = :wbuffs
+        datas = @tund_info[ :wbuffs ]
       else
         @writes.delete( tund )
         return
       end
 
-      dst_ext = @tund_info[ :dst_exts ][ dst_local_port ]
+      while datas.any?
+        dst_local_port, pack_id, data = datas.first
+        dst_ext = @tund_info[ :dst_exts ][ dst_local_port ]
 
-      if dst_ext
-        if pack_id <= CONFUSE_UNTIL
-          data = @custom.encode( data )
-          # puts "debug1 encoded pack #{ pack_id }"
-        end
+        if dst_ext
+          if pack_id <= CONFUSE_UNTIL
+            data = @custom.encode( data )
+            # puts "debug1 encoded pack #{ pack_id }"
+          end
 
-        data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
+          data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
 
-        begin
-          tund.sendmsg( data, 0, @tund_info[ :tun_addr ] )
-        rescue IO::WaitWritable, Errno::EINTR
-          return
-        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-          puts "#{ Time.new } #{ e.class }, close tund"
-          close_tund( tund )
-          sleep HEARTBEAT_INTERVAL
-          new_a_tund
-          return
+          unless send_data( tund, data, @tund_info[ :tun_addr ] )
+            return
+          end
+
+          # puts "debug2 written pack #{ pack_id }"
+          dst_ext[ :relay_pack_id ] = pack_id
+          dst_ext[ :wmems ][ pack_id ] = data
+          dst_ext[ :send_ats ][ pack_id ] = now
+          dst_ext[ :last_continue_at ] = now
         end
 
-        # puts "debug2 written pack #{ pack_id }"
-        now = Time.new
-        dst_ext[ :relay_pack_id ] = pack_id
-        dst_ext[ :wmems ][ pack_id ] = data
-        dst_ext[ :send_ats ][ pack_id ] = now
-        dst_ext[ :last_continue_at ] = now
+        datas.shift
       end
-
-      @tund_info[ from ].shift
     end
 
     ##

data/lib/p2p2/p2.rb

@@ -6,7 +6,7 @@ require 'p2p2/version'
 require 'socket'
 
 ##
-# P2p2::P2 - 内网里的任意应用，访问另一个内网里的应用服务端。p2端。
+# P2p2::P2 - p2p通道，p2端。
 #
 module P2p2
   class P2

data/lib/p2p2/p2_worker.rb

@@ -402,6 +402,23 @@ module P2p2
       end
     end
 
+    ##
+    # send data
+    #
+    def send_data( tun, data, to_addr )
+      begin
+        tun.sendmsg( data, 0, to_addr )
+      rescue IO::WaitWritable, Errno::EINTR
+        return false
+      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+        puts "#{ Time.new } #{ e.class }, close tun"
+        close_tun( tun )
+        return false
+      end
+
+      true
+    end
+
     ##
     # close src
     #
@@ -503,15 +520,14 @@ module P2p2
     #
     def write_src( src )
       src_info = @src_infos[ src ]
-      data = src_info[ :cache ]
-      from = :cache
+      from, data = :cache, src_info[ :cache ]
 
       if data.empty?
         if src_info[ :chunks ].any?
           path = File.join( @src_chunk_dir, src_info[ :chunks ].shift )
 
           begin
-            src_info[ :cache ] = data = IO.binread( path )
+            data = src_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "#{ Time.new } read #{ path } #{ e.class }"
@@ -519,8 +535,7 @@ module P2p2
             return
           end
         else
-          data = src_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, src_info[ :wbuff ]
         end
       end
 
@@ -558,17 +573,13 @@ module P2p2
         return
       end
 
+      now = Time.new
+
       # 传ctlmsg
       while @tun_info[ :ctlmsgs ].any?
         to_addr, data = @tun_info[ :ctlmsgs ].first
 
-        begin
-          tun.sendmsg( data, 0, to_addr )
-        rescue IO::WaitWritable, Errno::EINTR
-          return
-        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-          puts "#{ Time.new } #{ e.class }, close tun"
-          close_tun( tun )
+        unless send_data( tun, data, to_addr )
           return
         end
 
@@ -584,20 +595,15 @@ module P2p2
           data = src_ext[ :wmems ][ pack_id ]
 
           if data
-            begin
-              tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
-            rescue IO::WaitWritable, Errno::EINTR
-              return
-            rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-              puts "#{ Time.new } #{ e.class }, close tun"
-              close_tun( tun )
+            unless send_data( tun, data, @tun_info[ :tund_addr ] )
               return
             end
+
+            src_ext[ :last_continue_at ] = now
           end
         end
 
         @tun_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -613,8 +619,7 @@ module P2p2
 
       # 取写前
       if @tun_info[ :caches ].any?
-        src_id, pack_id, data = @tun_info[ :caches ].first
-        from = :caches
+        datas = @tun_info[ :caches ]
       elsif @tun_info[ :chunks ].any?
         path = File.join( @tun_chunk_dir, @tun_info[ :chunks ].shift )
 
@@ -635,46 +640,39 @@ module P2p2
           data = data[ ( 18 + pack_size )..-1 ]
         end
 
-        @tun_info[ :caches ] = caches
-        src_id, pack_id, data = caches.first
-        from = :caches
+        datas = @tun_info[ :caches ] = caches
       elsif @tun_info[ :wbuffs ].any?
-        src_id, pack_id, data = @tun_info[ :wbuffs ].first
-        from = :wbuffs
+        datas = @tun_info[ :wbuffs ]
       else
         @writes.delete( tun )
         return
       end
 
-      src_ext = @tun_info[ :src_exts ][ src_id ]
+      while datas.any?
+        src_id, pack_id, data = datas.first
+        src_ext = @tun_info[ :src_exts ][ src_id ]
 
-      if src_ext
-        if pack_id <= CONFUSE_UNTIL
-          data = @custom.encode( data )
-          # puts "debug1 encoded pack #{ pack_id }"
-        end
+        if src_ext
+          if pack_id <= CONFUSE_UNTIL
+            data = @custom.encode( data )
+            # puts "debug1 encoded pack #{ pack_id }"
+          end
 
-        data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
+          data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
 
-        begin
-          tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
-        rescue IO::WaitWritable, Errno::EINTR
-          return
-        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-          puts "#{ Time.new } #{ e.class }, close tun"
-          close_tun( tun )
-          return
+          unless send_data( tun, data, @tun_info[ :tund_addr ] )
+            return
+          end
+
+          # puts "debug2 written pack #{ pack_id }"
+          src_ext[ :relay_pack_id ] = pack_id
+          src_ext[ :wmems ][ pack_id ] = data
+          src_ext[ :send_ats ][ pack_id ] = now
+          src_ext[ :last_continue_at ] = now
         end
 
-        # puts "debug2 written pack #{ pack_id }"
-        now = Time.new
-        src_ext[ :relay_pack_id ] = pack_id
-        src_ext[ :wmems ][ pack_id ] = data
-        src_ext[ :send_ats ][ pack_id ] = now
-        src_ext[ :last_continue_at ] = now
+        datas.shift
       end
-
-      @tun_info[ from ].shift
     end
 
     ##

data/lib/p2p2/p2pd.rb

@@ -5,7 +5,7 @@ require 'p2p2/version'
 require 'socket'
 
 ##
-# P2p2::P2pd - 内网里的任意应用，访问另一个内网里的应用服务端。配对服务器端。
+# P2p2::P2pd - 配对服务。
 #
 # 包结构
 # ======

data/lib/p2p2/version.rb

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

data/p2p2.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["qqtakafan@gmail.com"]
 
   spec.summary       = %q{p2p}
-  spec.description   = %q{内网里的任意应用，访问另一个内网里的应用服务端。}
+  spec.description   = %q{p2p通道。nat穿透。}
   spec.homepage      = "https://github.com/takafan/p2p2"
   spec.license       = "MIT"
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies: []
-description: 内网里的任意应用，访问另一个内网里的应用服务端。
+description: p2p通道。nat穿透。
 email:
 - qqtakafan@gmail.com
 executables: []
@@ -49,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: p2p