p2p2 0.19.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b139ce8cd373285af412d083c4dcbe9a227d882d19d8cb5fdd1389849645c69c
-  data.tar.gz: 451f47afc5b16d62b7d1c316b00eecc49f947c333abd69e1235539b43a61c1bd
+  metadata.gz: 4c19c4e83055ee003d93923f5bc75aa21c2cfb8b678dd09f35405f4ccd7e93cb
+  data.tar.gz: b827a910f9dcbcf48712eb308da98d3231bf8ebe3dc66bf2a07138ef318bbea8
 SHA512:
-  metadata.gz: 3f504248e0c27936e246de5b90705a48d84682a858778bd7ab085f1c846375b0a249a11860a6cc0edc45f8ad7cb66cb66990d8fe3c3d91ea0a397bd40cfc67c6
-  data.tar.gz: da4849fa322f4e98aa9e44a3f185a0d694e5bbefc11009aa303b94d61ecb113b89b7fba2eb4f5014264b4674236ce863c7f83fac61f64ee8e34e78b4ad572816
+  metadata.gz: e1b716246402ff1f8cd6771b0607b78c3d54e754a7ea0189fb9168ad71294569943b7d641c2d3d77046d440cbd50bb22eb4f9cac092741ce6a6555ad3bcb255a
+  data.tar.gz: 730efff6c7c46ddb64d5f87196be76a47fe4aaf74a6a57bee493c76b83f9accc1c0501c4b15aa88a5bc71bdbf6f4e6441e44174fea25cb29605c474bb5641798

data/lib/p2p2/head.rb

@@ -6,12 +6,13 @@ module P2p2
   RESUME_BELOW          = 50_000           # 降到多少以下恢复写
   EXPIRE_NEW            = 10               # 创建之后多久没有流量进来，过期
   EXPIRE_AFTER          = 300              # 多久没有新流量，过期
-  CHECK_EXPIRE_INTERVAL = 30               # 检查过期间隔
+  CHECK_EXPIRE_INTERVAL = 60               # 检查过期间隔
   STATUS_INTERVAL       = 0.5              # 发送状态间隔
   SEND_STATUS_UNTIL     = 10               # 持续的告之对面状态，直到没有流量往来，持续多少秒
   BREAK_SEND_MISS       = 10_000           # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
   CONFUSE_UNTIL         = 5                # 混淆前几个包
-  UPDATE_ROOM_INTERVAL  = 5                # 刷新房间间隔
+  HEARTBEAT_INTERVAL    = 5                # 心跳间隔
+  UPDATE_ROOM_INTERVAL  = 60               # 刷新房间间隔
   PEER_ADDR             = 1
   HEARTBEAT             = 2
   A_NEW_SOURCE          = 3

data/lib/p2p2/p1_worker.rb

@@ -28,8 +28,7 @@ module P2p2
     #
     def looping
       puts "#{ Time.new } looping"
-      loop_update_room
-      loop_check_expire
+      loop_heartbeat
       loop_check_status
 
       loop do
@@ -80,76 +79,65 @@ module P2p2
     private
 
     ##
-    # loop update room
+    # loop heartbeat
     #
-    def loop_update_room( update_at = Time.new )
+    def loop_heartbeat( check_at = Time.new )
       Thread.new do
         loop do
-          sleep UPDATE_ROOM_INTERVAL
+          sleep HEARTBEAT_INTERVAL
 
           @mutex.synchronize do
-            if !@tund.closed? && @tund_info[ :peer_addr ].nil?
-              now = Time.new
-
-              if now - update_at >= 60
-                data = @room
-                update_at = now
-              else
-                data = [ rand( 128 ) ].pack( 'C' )
-              end
-
-              add_tund_ctlmsg( data, @p2pd_addr )
-              next_tick
-            end
-          end
-        end
-      end
-    end
-
-    ##
-    # loop check expire
-    #
-    def loop_check_expire
-      Thread.new do
-        loop do
-          sleep CHECK_EXPIRE_INTERVAL
-
-          @mutex.synchronize do
-            need_trigger = false
             now = Time.new
 
-            if !@tund.closed? && @tund_info[ :tun_addr ]
-              if now - @tund_info[ :last_recv_at ] > EXPIRE_AFTER
-                puts "#{ Time.new } expire tund"
-                set_is_closing( @tund )
-              else
-                # puts "debug1 #{ Time.new } heartbeat"
-                add_tund_ctlmsg( pack_a_heartbeat )
-
-                @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 }"
-                    del_dst_ext( dst_local_port )
+            unless @tund.closed?
+              if @tund_info[ :peer_addr ]
+                if @tund_info[ :tun_addr ]
+                  if now - check_at >= CHECK_EXPIRE_INTERVAL
+                    if now - @tund_info[ :last_recv_at ] > EXPIRE_AFTER
+                      puts "#{ Time.new } expire tund"
+                      set_is_closing( @tund )
+                    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"
+                          del_dst_ext( dst_local_port )
+                        end
+                      end
+                    end
+
+                    @dst_infos.each do | dst, dst_info |
+                      if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
+                        puts "#{ Time.new } expire dst"
+                        set_is_closing( dst )
+                      end
+                    end
+
+                    check_at = now
                   end
-                end
-              end
-
-              need_trigger = true
-            end
 
-            @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ].nil? && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
+                  # puts "debug2 heartbeat"
+                  add_tund_ctlmsg( pack_a_heartbeat )
+                  next_tick
+                elsif now - @tund_info[ :created_at ] > EXPIRE_NEW
+                  # no tun addr
+                  puts "#{ Time.new } expire new tund"
+                  set_is_closing( @tund )
+                  next_tick
+                end
+              else
+                # no peer addr
+                if now - check_at >= UPDATE_ROOM_INTERVAL
+                  data = @room
+                  check_at = now
+                else
+                  data = [ rand( 128 ) ].pack( 'C' )
+                end
 
-              if is_expired
-                puts "#{ Time.new } expire dst"
-                set_is_closing( dst )
-                need_trigger = true
+                # puts "debug2 update room"
+                add_tund_ctlmsg( data, @p2pd_addr )
+                next_tick
               end
             end
-
-            if need_trigger
-              next_tick
-            end
           end
         end
       end
@@ -531,6 +519,7 @@ module P2p2
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -551,6 +540,12 @@ module P2p2
           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
+          return
         end
 
         @tund_info[ :ctlmsgs ].shift
@@ -569,6 +564,12 @@ module P2p2
               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
             end
           end
         end
@@ -637,6 +638,12 @@ module P2p2
           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
         end
 
         # puts "debug2 written pack #{ pack_id }"
@@ -673,7 +680,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"
@@ -751,8 +758,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 )
@@ -769,7 +775,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_worker.rb

@@ -28,7 +28,7 @@ module P2p2
     #
     def looping
       puts "#{ Time.new } looping"
-      loop_check_expire
+      loop_heartbeat
       loop_check_status
 
       loop do
@@ -81,49 +81,51 @@ module P2p2
     private
 
     ##
-    # loop check expire
+    # loop heartbeat
     #
-    def loop_check_expire
+    def loop_heartbeat( check_at = Time.new )
       Thread.new do
         loop do
-          sleep CHECK_EXPIRE_INTERVAL
+          sleep HEARTBEAT_INTERVAL
 
           @mutex.synchronize do
-            need_trigger = false
             now = Time.new
 
-            if @tun && !@tun.closed? && @tun_info[ :tund_addr ]
-              if now - @tun_info[ :last_recv_at ] > EXPIRE_AFTER
-                puts "#{ Time.new } expire tun"
-                set_is_closing( @tun )
-              else
-                # puts "debug1 #{ Time.new } heartbeat"
-                add_tun_ctlmsg( pack_a_heartbeat )
-
-                @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 }"
-                    del_src_ext( src_id )
+            if @tun && !@tun.closed? && @tun_info[ :peer_addr ]
+              if @tun_info[ :tund_addr ]
+                if now - check_at >= CHECK_EXPIRE_INTERVAL
+                  if now - @tun_info[ :last_recv_at ] > EXPIRE_AFTER
+                    puts "#{ Time.new } expire tun"
+                    set_is_closing( @tun )
+                  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"
+                        del_src_ext( src_id )
+                      end
+                    end
                   end
-                end
-              end
 
-              need_trigger = true
-            end
+                  @src_infos.each do | src, src_info |
+                    if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
+                      puts "#{ Time.new } expire src"
+                      set_is_closing( src )
+                    end
+                  end
 
-            @src_infos.each do | src, src_info |
-              is_expired = src_info[ :last_recv_at ].nil? && ( now - src_info[ :created_at ] > EXPIRE_NEW )
+                  check_at = now
+                end
 
-              if is_expired
-                puts "#{ Time.new } expire src"
-                set_is_closing( src )
-                need_trigger = true
+                # puts "debug2 heartbeat"
+                add_tun_ctlmsg( pack_a_heartbeat )
+                next_tick
+              elsif now - @tun_info[ :created_at ] > EXPIRE_NEW
+                # no tund addr
+                puts "#{ Time.new } expire new tun"
+                set_is_closing( @tun )
+                next_tick
               end
             end
-
-            if need_trigger
-              next_tick
-            end
           end
         end
       end
@@ -261,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
 
     ##
@@ -544,6 +546,7 @@ module P2p2
       # puts "debug2 write src #{ written }"
       data = data[ written..-1 ]
       src_info[ from ] = data
+      src_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -563,6 +566,10 @@ module P2p2
           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 )
+          return
         end
 
         @tun_info[ :ctlmsgs ].shift
@@ -581,6 +588,10 @@ module P2p2
               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
             end
           end
         end
@@ -649,6 +660,10 @@ module P2p2
           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
         end
 
         # puts "debug2 written pack #{ pack_id }"
@@ -683,16 +698,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 )
@@ -712,7 +726,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
@@ -736,7 +750,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_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.19.0'.freeze
+  VERSION = '0.24.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.24.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies: []
 description: 内网里的任意应用，访问另一个内网里的应用服务端。
 email:
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: p2p