girl 0.87.0 → 0.87.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 590ceead2e46e0803325aff199ec4fa4610a554f873ad58e91f83e8cba7bd4a9
-  data.tar.gz: 3034b02ee1ddf592a67446d82a3f974f2439aef9f380f20b39c96aa943a4a7ab
+  metadata.gz: ff8fb468e18a12b716f36ad839823c2725a590cc162f896ed43b199297262c01
+  data.tar.gz: 657e28910c1e4303896b7f728760bedf2ba4d23dd1ed021b325cc6545b0050ac
 SHA512:
-  metadata.gz: 27d1dd5ef6d6f4d29c1916af5c10c8eb694e7cbf11f2f8518a6d4a3ebd0d368aa92518a9c5c0f91079f9291c67b1050be16db3f0154d7fb710f55d818ca75576
-  data.tar.gz: ae5ab8293caf167146784342a93e059ef03a201dbd1a1a3df6bbe206321f95b13526e78713ca77903e3be44873ce02474c4d3260187fcd85c993206401fef586
+  metadata.gz: 1c29c0ee44eacc07c1deea70df4433083c45fde0f932c540831a52c0c39e539401b79cd3249190563db3dfc4f33a8b7ac336f95420038ed612abdbe5e3d8a42d
+  data.tar.gz: 72c4374a80e9eb93139cff701436536e99d8843c80a866494d42aee10ff64619b82e4d19b8a0660f44bd1a3b516657221e60d72227a005f96c8410a729eb919e

data/lib/girl/proxy_worker.rb

@@ -197,6 +197,9 @@ module Girl
       end
     end
 
+    ##
+    # loop send hello
+    #
     def loop_send_hello
       data = @custom.hello
 
@@ -355,8 +358,6 @@ module Girl
         tund_addr: nil,       # tund地址
         srcs: {},             # src_id => src
         src_ids: {},          # dst_id => src_id
-        paused: false,        # 是否暂停写
-        resendings: [],       # 重传队列 [ src_id, pack_id ]
         created_at: Time.new, # 创建时间
         last_recv_at: nil,    # 上一次收到流量的时间，过期关闭
         is_closing: false     # 是否准备关闭
@@ -1310,7 +1311,7 @@ module Girl
           # puts "debug1 2-2. tun recv traffic -> dst closed and all traffic received ? -> close src after write"
           set_is_closing( src )
         end
-      elsif !src_info[ :pieces ].include?( pack_id )
+      else
         src_info[ :pieces ][ pack_id ] = data
         src_info[ :last_continue_at ] = now
       end

data/lib/girl/proxyd_worker.rb

@@ -483,7 +483,7 @@ module Girl
     end
 
     ##
-    # close tun
+    # close tund
     #
     def close_tund( tund )
       # puts "debug1 close tund"
@@ -640,7 +640,7 @@ module Girl
         wbuffs: [],           # 写前 [ dst_id, pack_id, data ]
         wmems: {},            # 写后 [ dst_id, pack_id ] => data
         tun_addr: from_addr,  # tun地址
-        dsts: {},             # dst额外信息 dst_id => dst
+        dsts: {},             # dst_id => dst
         dst_ids: {},          # src_id => dst_id
         created_at: Time.new, # 创建时间
         last_recv_at: nil,    # 上一次收到流量的时间，过期关闭
@@ -905,7 +905,7 @@ module Girl
           # puts "debug1 4-2. tund recv traffic -> src closed and all traffic received ? -> close dst after write"
           set_is_closing( dst )
         end
-      elsif !dst_info[ :pieces ].include?( pack_id )
+      else
         dst_info[ :pieces ][ pack_id ] = data
         dst_info[ :last_continue_at ] = now
       end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.87.0'.freeze
+  VERSION = '0.87.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.87.0
+  version: 0.87.1
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email: