p2p2 0.17.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca6aa5bbfa64978db926f846e6dce0c55124dc82b1b4930b9eb30959c5023cc7
-  data.tar.gz: a246104c3a8a738fd0056aea6698220b3b4ffe0f0b343114123cdba2eba07752
+  metadata.gz: ed5928f54a6129f64cc843748d5f337d9f5fdccfed90239b9a594bf6ecd577bc
+  data.tar.gz: 1ec20b3e82bf69b5e371ceb89dcc666b97f0a2407072647271e481c7a3166e4e
 SHA512:
-  metadata.gz: da481b7d08c79145f2fa340d753be73e3a67f3867aab76719e0823c7d13ed42cb4bb097a3056419b9fc2bc2ddd951a9cc3cfd9930eaca6e3c4571a1c29cd5288
-  data.tar.gz: 4ababd5dc972ba2012e20fc653eef308f35111b48e0e3b57e3dd82641ef58b1585469b693f03c9faff0c435fed525d3a826ad0c8c8054333c1dde321bdfeb230
+  metadata.gz: 2b35b3bc6a54ceb236aee2f9258580c381397619dcdfbe4dfd3ea61c8c6deeda1e6e188a64b6921794d801fd2838f5db3c7e00462be3cebfe5158e589356a8ff
+  data.tar.gz: 9bd26990e4e3aff5285a10b011c322251ba3c64f5379e02172d70f16d9624355c8a9ec3f194b108c3681b966b38749d4bded464a9c9588bf3aca4e7645026e3f

data/lib/p2p2/head.rb

@@ -6,11 +6,12 @@ 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                # 混淆前几个包
+  HEARTBEAT_INTERVAL    = 5                # 心跳间隔
   UPDATE_ROOM_INTERVAL  = 60               # 刷新房间间隔
   PEER_ADDR             = 1
   HEARTBEAT             = 2

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,67 +79,65 @@ module P2p2
     private
 
     ##
-    # loop update room
+    # loop heartbeat
     #
-    def loop_update_room
+    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?
-              add_tund_ctlmsg( @room, @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 #{ dst_local_port }"
+                          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 )
+                        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
@@ -252,6 +249,8 @@ module P2p2
     # is match tun addr
     #
     def is_match_tun_addr( addrinfo )
+      return false unless @tund_info[ :tun_addr ]
+
       from_addr = addrinfo.to_sockaddr
 
       if from_addr != @tund_info[ :tun_addr ]
@@ -260,6 +259,7 @@ module P2p2
       end
 
       @tund_info[ :last_recv_at ] = Time.new
+
       true
     end
 
@@ -539,6 +539,10 @@ 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 )
+          return
         end
 
         @tund_info[ :ctlmsgs ].shift
@@ -557,6 +561,10 @@ 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 )
+              return
             end
           end
         end
@@ -625,6 +633,10 @@ 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 )
+          return
         end
 
         # puts "debug2 written pack #{ pack_id }"

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 #{ src_id }"
+                        del_src_ext( src_id )
+                      end
+                    end
                   end
-                end
-              end
 
-              need_trigger = true
-            end
+                  @src_infos.each do | src, src_info |
+                    if src_info[ :last_recv_at ].nil? && ( now - src_info[ :created_at ] > EXPIRE_NEW )
+                      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
@@ -275,6 +277,8 @@ module P2p2
     # is match tund addr
     #
     def is_match_tund_addr( addrinfo )
+      return false unless @tun_info[ :tund_addr ]
+
       from_addr = addrinfo.to_sockaddr
 
       if from_addr != @tun_info[ :tund_addr ]
@@ -283,6 +287,7 @@ module P2p2
       end
 
       @tun_info[ :last_recv_at ] = Time.new
+
       true
     end
 
@@ -560,6 +565,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
@@ -578,6 +587,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
@@ -646,6 +659,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 }"

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = '0.17.0'.freeze
+  VERSION = '0.22.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.22.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies: []
 description: 内网里的任意应用，访问另一个内网里的应用服务端。
 email: