p2p2 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68069e5326b6a25498cf1dd4adb8733fe2ec2bf809126f1f500f9cb734d4ea47
-  data.tar.gz: 61610f3b5e55f3d42df523e154f277e1a22a87dad56b93d220d4f4a39190b36e
+  metadata.gz: ca925ece6d1579aa867c70dbc92911eb3c0046e855c2579115738f2688dd08c5
+  data.tar.gz: 33c156afa25319ed03758e530aab81ae1ddc2e27059ea7bc5dae463a1a14761b
 SHA512:
-  metadata.gz: a5d286c1091dab33efac9d24e9c9535835420922dba75447b38f264bf3d655cbb5fd9d5cf43a90f9af60a9b1fef63a1c47f162a083e0a67227ffafcf815606a8
-  data.tar.gz: 18bb9e9992555dc486a25d7f81b1d7e63036be78d5c8b849073a1217dbbbe67442f9486ce5984e6a937abcdf208bfce01d46c98b278c74396ae36f9332dc3367
+  metadata.gz: 8bf48c99e8242a66ec4f9774dd494ed57c9720c404e3a8cb0481c74dc3bcbd3fbf97c6cf2cfece23fdb7ad1bc5aa13cbf109baf929ef038ab756c2a3bb28a6ba
+  data.tar.gz: 3cb4955440287396afb177f13a800a67eca199531fc1956d8004a44372e8fc3a0ebd446b5ad959c271470fabda7ebbfe6358cc2dba1f6421bf55dd6caf7a2e4f

data/lib/p2p2/head.rb

@@ -2,12 +2,13 @@ module P2p2
   PACK_SIZE             = 1328             # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(app/shadow id) - 8(pack id) = 1328
   CHUNK_SIZE            = PACK_SIZE * 1000 # 块大小
   WBUFFS_LIMIT          = 1000             # 写前上限，超过上限结一个块
-  WMEMS_LIMIT           = 100_000          # 写后上限，到达上限暂停写
+  WMEMS_LIMIT           = 100_000          # 写后上限，达到上限暂停写
   RESUME_BELOW          = 50_000           # 降到多少以下恢复写
   EXPIRE_AFTER          = 1800             # 多久过期
   HEARTBEAT_INTERVAL    = 3                # 心跳间隔
   STATUS_INTERVAL       = 0.3              # 发送状态间隔
-  SEND_STATUS_UNTIL     = 20               # 持续的告之对面状态，直到没有流量往来，持续多少秒
+  SEND_STATUS_UNTIL     = 10               # 持续的告之对面状态，直到没有流量往来，持续多少秒
+  BREAK_SEND_MISS       = 10_000           # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
   PEER_ADDR             = 1
   HEARTBEAT             = 2
   A_NEW_APP             = 3

data/lib/p2p2/p1.rb

@@ -295,8 +295,14 @@ module P2p2
               ranges << [ curr_pack_id, ext[ :biggest_app_pack_id ] ]
             end
 
+            pack_count = 0
             # puts "debug #{ ext[ :continue_app_pack_id ] }/#{ ext[ :biggest_app_pack_id ] } send MISS #{ ranges.size }"
             ranges.each do | pack_id_begin, pack_id_end |
+              if pack_count >= BREAK_SEND_MISS
+                puts "break send miss at #{ pack_id_begin } #{ Time.new }"
+                break
+              end
+
               ctlmsg = [
                 0,
                 MISS,
@@ -306,6 +312,7 @@ module P2p2
               ].pack( 'Q>CQ>Q>Q>' )
 
               send_pack( p1, ctlmsg, info[ :p2_addr ] )
+              pack_count += ( pack_id_end - pack_id_begin + 1 )
             end
           end
         when MISS
@@ -530,7 +537,7 @@ module P2p2
         end
       end
 
-      # 若写后到达上限，暂停取写前
+      # 若写后达到上限，暂停取写前
       if info[ :shadow_exts ].map{ | _, ext | ext[ :wmems ].size }.sum >= WMEMS_LIMIT
         unless info[ :paused ]
           puts "pause #{ Time.new }"

data/lib/p2p2/p2.rb

@@ -314,8 +314,14 @@ module P2p2
               ranges << [ curr_pack_id, ext[ :biggest_shadow_pack_id ] ]
             end
 
+            pack_count = 0
             # puts "debug #{ ext[ :continue_shadow_pack_id ] }/#{ ext[ :biggest_shadow_pack_id ] } send MISS #{ ranges.size }"
             ranges.each do | pack_id_begin, pack_id_end |
+              if pack_count >= BREAK_SEND_MISS
+                puts "break send miss at #{ pack_id_begin } #{ Time.new }"
+                break
+              end
+
               ctlmsg = [
                 0,
                 MISS,
@@ -325,6 +331,7 @@ module P2p2
               ].pack( 'Q>CQ>Q>Q>' )
 
               send_pack( p2, ctlmsg, info[ :p1_addr ] )
+              pack_count += ( pack_id_end - pack_id_begin + 1 )
             end
           end
         when MISS
@@ -547,7 +554,7 @@ module P2p2
         end
       end
 
-      # 若写后到达上限，暂停取写前
+      # 若写后达到上限，暂停取写前
       if info[ :app_exts ].map{ | _, ext | ext[ :wmems ].size }.sum >= WMEMS_LIMIT
         unless info[ :paused ]
           puts "pause #{ Time.new }"

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.15.0'.freeze
 end

metadata

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