girl 0.78.0 → 0.79.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6d635f9fb525291d4b0c32b749245255a52234ff9b850add473b430aa5e732
-  data.tar.gz: c336934bd1fd8825f72e65fdcc9dd708788f53bec7a175a37228ec724b970869
+  metadata.gz: d0715fdbe86cdb5337e31fc9fb79d110468d8d041a34806a8d75eeb5a235b723
+  data.tar.gz: 839d97ba88a903a3950082b8ed68ce8a9d03f1870bd910307bdbf76ac9057f48
 SHA512:
-  metadata.gz: 81f96a6e78ddf2cf00ff331002b145871eca5b72653bf822d42943858f887be4e996fa47a98e18313800d2a461899280fa6db6eff3781daa3d714b5e54a489dd
-  data.tar.gz: 29aaac2d5eae5d9889dcc033048929ff8fffac95c422b5322467ba8859df664097a600e14e9c26ac30e2babadc79463b05d32969565b176f990a52c708dbda80
+  metadata.gz: 7bec7fd4e3de14f55c88cc1adff7f0f51e5f154601322c55e391d7401290a34455d547dc5fc38fa0fbc2cfe5abb77d1feb53acc6225d3202d945c4a4ea803e8c
+  data.tar.gz: f3df7300a53d259ad6c5a91c67edd7d2b7a160fd1c33700266377e6e075c31cc6522c5af3765700d35f2b8db13ac012c74d674655b4bfab988b5f579deb30d0a

data/lib/girl/proxy_worker.rb

@@ -741,15 +741,14 @@ module Girl
     #
     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 "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -757,8 +756,7 @@ module Girl
             return
           end
         else
-          data = src_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, src_info[ :wbuff ]
         end
       end
 
@@ -792,15 +790,14 @@ module Girl
     #
     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 "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -808,8 +805,7 @@ module Girl
             return
           end
         else
-          data = dst_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, dst_info[ :wbuff ]
         end
       end
 
@@ -879,7 +875,6 @@ module Girl
         end
 
         @tun_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -895,8 +890,7 @@ module Girl
 
       # 取写前
       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 )
 
@@ -917,39 +911,39 @@ module Girl
           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
 
-        unless send_data( tun, data, @tun_info[ :tund_addr ] )
-          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 }"
-        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
 
     ##

data/lib/girl/proxyd_worker.rb

@@ -558,15 +558,14 @@ module Girl
     #
     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 "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -574,8 +573,7 @@ module Girl
             return
           end
         else
-          data = dst_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, dst_info[ :wbuff ]
         end
       end
 
@@ -646,7 +644,6 @@ module Girl
         end
 
         tund_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -662,8 +659,7 @@ module Girl
 
       # 取写前
       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 )
 
@@ -684,39 +680,39 @@ module Girl
           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
 
-        unless send_data( tund, data, tund_info[ :tun_addr ] )
-          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 }"
-        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
 
     ##

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.78.0'.freeze
+  VERSION = '0.79.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.78.0
+  version: 0.79.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: