p2p2 0.20.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5621af269a434cac452523cfccd1816c1246b37936296df09e5db7a28ed0701b
-  data.tar.gz: 718b2f29404d97724b21638fcdd8f683ac1e987cc94b482e38252dc5485afd8e
+  metadata.gz: 2b2e5798d8439e44d3acbb68a9a8749a1d7dc69c43a5f6effea95f6360185a0a
+  data.tar.gz: a306f7dfe4be190712e7317de0f7324135e16075a39af9d7d3408aa3ab978bd5
 SHA512:
-  metadata.gz: 680e7ad7a8fbbaf4f5d020d6cbf988db7ba225ff38fce951069c9bbb211923ed54165a05440842ce929861ea32d94caa4683b424a51cedade77ff9bb2ade2d6a
-  data.tar.gz: 9a188e36e5f5fa650b8074d263dcc16a7578ea6b9a5135faf9fb73af17695f2c9af33f14d1aaed81fe113b55f37f3653d325826bfb32c3cbfed8797e096d41dc
+  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

@@ -99,14 +99,14 @@ module P2p2
                     else
                       @tund_info[ :dst_exts ].each do | dst_local_port, dst_ext |
                         if dst_ext[ :dst ].closed? && ( now - dst_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                          puts "#{ Time.new } expire dst ext #{ dst_local_port }"
+                          puts "#{ Time.new } expire dst ext"
                           del_dst_ext( dst_local_port )
                         end
                       end
                     end
 
                     @dst_infos.each do | dst, dst_info |
-                      if dst_info[ :last_recv_at ].nil? && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
+                      if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
                         puts "#{ Time.new } expire dst"
                         set_is_closing( dst )
                       end
@@ -118,7 +118,7 @@ module P2p2
                   # puts "debug2 heartbeat"
                   add_tund_ctlmsg( pack_a_heartbeat )
                   next_tick
-                elsif now - @tund_info[ :last_recv_at ] > EXPIRE_NEW
+                elsif now - @tund_info[ :created_at ] > EXPIRE_NEW
                   # no tun addr
                   puts "#{ Time.new } expire new tund"
                   set_is_closing( @tund )
@@ -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
 
@@ -519,6 +536,7 @@ module P2p2
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -531,13 +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
+        unless send_data( tund, data, to_addr )
           return
         end
 
@@ -553,16 +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
+            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
 
       # 若写后达到上限，暂停取写前
@@ -578,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 )
 
@@ -600,42 +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
+          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
 
     ##
@@ -661,7 +674,7 @@ module P2p2
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
 
       if @tund.closed?
         puts "#{ Time.new } tund closed, close dst"
@@ -739,8 +752,7 @@ module P2p2
               cache: '',                  # 块读出缓存
               chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
               spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-              created_at: Time.new,       # 创建时间
-              last_recv_at: nil,          # 上一次收到流量的时间，过期关闭
+              last_continue_at: Time.new, # 上一次发生流量的时间
               is_closing: false           # 是否准备关闭
             }
             add_read( dst, :dst )
@@ -757,7 +769,7 @@ module P2p2
               is_src_closed: false,      # src是否已关闭
               biggest_src_pack_id: 0,    # src最大包号码
               completed_pack_id: 0,      # 完成到几（对面收到几）
-              last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+              last_continue_at: Time.new # 上一次发生流量的时间
             }
           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

@@ -100,14 +100,14 @@ module P2p2
                   else
                     @tun_info[ :src_exts ].each do | src_id, src_ext |
                       if src_ext[ :src ].closed? && ( now - src_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                        puts "#{ Time.new } expire src ext #{ src_id }"
+                        puts "#{ Time.new } expire src ext"
                         del_src_ext( src_id )
                       end
                     end
                   end
 
                   @src_infos.each do | src, src_info |
-                    if src_info[ :last_recv_at ].nil? && ( now - src_info[ :created_at ] > EXPIRE_NEW )
+                    if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
                       puts "#{ Time.new } expire src"
                       set_is_closing( src )
                     end
@@ -119,7 +119,7 @@ module P2p2
                 # puts "debug2 heartbeat"
                 add_tun_ctlmsg( pack_a_heartbeat )
                 next_tick
-              elsif now - @tun_info[ :last_recv_at ] > EXPIRE_NEW
+              elsif now - @tun_info[ :created_at ] > EXPIRE_NEW
                 # no tund addr
                 puts "#{ Time.new } expire new tun"
                 set_is_closing( @tun )
@@ -263,7 +263,7 @@ module P2p2
       @tun = tun
       @tun_info = tun_info
       add_read( tun, :tun )
-      add_tun_ctlmsg( @room, @p2pd_addr )
+      add_tun_ctlmsg( [ '2', @room ].join, @p2pd_addr )
     end
 
     ##
@@ -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
 
@@ -546,6 +561,7 @@ module P2p2
       # puts "debug2 write src #{ written }"
       data = data[ written..-1 ]
       src_info[ from ] = data
+      src_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -557,13 +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
+        unless send_data( tun, data, to_addr )
           return
         end
 
@@ -579,16 +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
+            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
 
       # 若写后达到上限，暂停取写前
@@ -604,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 )
 
@@ -626,42 +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
+          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
 
     ##
@@ -685,16 +696,15 @@ module P2p2
       # puts "debug1 accept a src #{ addrinfo.inspect } #{ id }"
 
       @src_infos[ src ] = {
-        id: id,                  # id
-        biggest_pack_id: 0,      # 最大包号码
-        rbuffs: [],              # p1端dst未准备好，暂存流量 [ pack_id, data ]
-        wbuff: '',               # 写前
-        cache: '',               # 块读出缓存
-        chunks: [],              # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,               # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,    # 创建时间
-        last_recv_at: nil,       # 上一次收到流量的时间，过期关闭
-        is_closing: false        # 是否准备关闭
+        id: id,                     # id
+        biggest_pack_id: 0,         # 最大包号码
+        rbuffs: [],                 # p1端dst未准备好，暂存流量 [ pack_id, data ]
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( src, :src )
@@ -714,7 +724,7 @@ module P2p2
         is_dst_closed: false,      # dst是否已关闭
         biggest_dst_pack_id: 0,    # dst最大包号码
         completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+        last_continue_at: Time.new # 上一次发生流量的时间
       }
 
       @tun_info[ :src_exts ][ id ] = src_ext
@@ -738,7 +748,7 @@ module P2p2
 
       # puts "debug2 read src #{ data.inspect }"
       src_info = @src_infos[ src ]
-      src_info[ :last_recv_at ] = Time.new
+      src_info[ :last_continue_at ] = Time.new
       src_id = src_info[ :id ]
       src_ext = @tun_info[ :src_exts ][ src_id ]
 

data/lib/p2p2/p2pd.rb

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

data/lib/p2p2/p2pd_worker.rb

@@ -32,17 +32,21 @@ module P2p2
       data, addrinfo, rflags, *controls = p2pd.recvmsg
       return if ( data.bytesize == 1 ) || ( data.bytesize > 255 ) || ( data =~ /\/|\.|\ / )
 
+      if data[0] == '2'
+        is_p2 = true
+        data = data[ 1..-1 ]
+      else
+        is_p2 = false
+      end
+
       from_addr = addrinfo.to_sockaddr
       room_path = File.join( @p2pd_tmp_dir, data.gsub( "\u0000" , '' ) )
 
-      unless File.exist?( room_path )
-        puts "#{ Time.new } create #{ room_path } #{ addrinfo.inspect }"
-        write_room( room_path, from_addr )
-        return
-      end
-
-      if Time.new - File.mtime( room_path ) > EXPIRE_AFTER
-        puts "#{ Time.new } overwrite #{ room_path } #{ addrinfo.inspect }"
+      if is_p2
+        unless File.exist?( room_path )
+          return
+        end
+      else
         write_room( room_path, from_addr )
         return
       end
@@ -50,13 +54,9 @@ module P2p2
       op_addr = IO.binread( room_path )
       op_addrinfo = Addrinfo.new( op_addr )
 
-      if ( addrinfo.ip_address == op_addrinfo.ip_address ) || ( addrinfo.ip_port == op_addrinfo.ip_port )
-        write_room( room_path, from_addr )
-      else
-        puts "#{ Time.new } paired #{ addrinfo.inspect } #{ op_addrinfo.inspect }"
-        send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), op_addr ].join, from_addr )
-        send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), from_addr ].join, op_addr )
-      end
+      puts "#{ Time.new } paired #{ addrinfo.inspect } #{ op_addrinfo.inspect }"
+      send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), op_addr ].join, from_addr )
+      send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), from_addr ].join, op_addr )
     end
 
     def write_room( room_path, data )

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = '0.20.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.20.0
+  version: 0.25.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 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.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: p2p