girl 0.73.1 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33af151d416edee9c887ce27984d09f2dd29f9ab73b2f09beac406bdde96eba4
-  data.tar.gz: bd0271ae4f10083e473ec9ec9794becccb2a24f5d2888b94c48e8402ab08f475
+  metadata.gz: cb6d635f9fb525291d4b0c32b749245255a52234ff9b850add473b430aa5e732
+  data.tar.gz: c336934bd1fd8825f72e65fdcc9dd708788f53bec7a175a37228ec724b970869
 SHA512:
-  metadata.gz: 699f24fd304267c96841c882290a47961a3fefcd21bdf8b8bef509b20eaaa7200f5292d58cc10248a251e541cf6a5bb68d43bef1ad7f4d24881b8ef8c994130a
-  data.tar.gz: 7c3e71e1c31c9e61f3584b2b1b0a78b505a7e222c61d6b5edd041f7a25a985267ec13bf1432d6bcdfc46c89d9fb0bf32678fda57b47e8a917c40f4451da93e82
+  metadata.gz: 81f96a6e78ddf2cf00ff331002b145871eca5b72653bf822d42943858f887be4e996fa47a98e18313800d2a461899280fa6db6eff3781daa3d714b5e54a489dd
+  data.tar.gz: 29aaac2d5eae5d9889dcc033048929ff8fffac95c422b5322467ba8859df664097a600e14e9c26ac30e2babadc79463b05d32969565b176f990a52c708dbda80

data/lib/girl/head.rb

@@ -30,21 +30,10 @@ module Girl
   RESERVED_ROUTE = <<EOF
 0.0.0.0/8
 10.0.0.0/8
-100.64.0.0/10
 127.0.0.0/8
 169.254.0.0/16
 172.16.0.0/12
-192.0.0.0/24
-192.0.2.0/24
-192.31.196.0/24
-192.52.193.0/24
-192.88.99.0/24
 192.168.0.0/16
-192.175.48.0/24
-198.18.0.0/15
-198.51.100.0/24
-203.0.113.0/24
-240.0.0.0/4
 255.255.255.255/32
 EOF
 end

data/lib/girl/proxy_worker.rb

@@ -113,7 +113,7 @@ module Girl
 
                 @tun_info[ :src_exts ].each do | src_id, src_ext |
                   if src_ext[ :src ].closed? && ( now - src_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                    puts "p#{ Process.pid } #{ Time.new } expire src ext #{ src_id }"
+                    puts "p#{ Process.pid } #{ Time.new } expire src ext #{ src_ext[ :destination_domain ] }"
                     del_src_ext( src_id )
                   end
                 end
@@ -124,7 +124,7 @@ module Girl
 
             @src_infos.each do | src, src_info |
               if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
-                puts "p#{ Process.pid } #{ Time.new } expire src"
+                puts "p#{ Process.pid } #{ Time.new } expire src #{ src_info[ :destination_domain ] }"
                 set_is_closing( src )
                 need_trigger = true
               end
@@ -393,27 +393,29 @@ module Girl
         new_a_tun
       end
 
+      src_info = @src_infos[ src ]
+      src_id = src_info[ :id ]
+      destination_port = src_info[ :destination_port ]
+      destination_domain = src_info[ :destination_domain ]
+
       src_ext = {
-        src: src,                  # src
-        dst_port: nil,             # 远端dst端口
-        wmems: {},                 # 写后 pack_id => data
-        send_ats: {},              # 上一次发出时间 pack_id => send_at
-        relay_pack_id: 0,          # 转发到几
-        continue_dst_pack_id: 0,   # 收到几
-        pieces: {},                # 跳号包 dst_pack_id => data
-        is_dst_closed: false,      # dst是否已关闭
-        biggest_dst_pack_id: 0,    # dst最大包号码
-        completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 上一次发生流量的时间
+        src: src,                               # src
+        dst_port: nil,                          # 远端dst端口
+        destination_domain: destination_domain, # 目的地域名
+        wmems: {},                              # 写后 pack_id => data
+        send_ats: {},                           # 上一次发出时间 pack_id => send_at
+        relay_pack_id: 0,                       # 转发到几
+        continue_dst_pack_id: 0,                # 收到几
+        pieces: {},                             # 跳号包 dst_pack_id => data
+        is_dst_closed: false,                   # dst是否已关闭
+        biggest_dst_pack_id: 0,                 # dst最大包号码
+        completed_pack_id: 0,                   # 完成到几（对面收到几）
+        last_continue_at: Time.new              # 上一次发生流量的时间
       }
 
-      src_info = @src_infos[ src ]
-      src_id = src_info[ :id ]
       @tun_info[ :src_exts ][ src_id ] = src_ext
       src_info[ :proxy_type ] = :tunnel
 
-      destination_port = src_info[ :destination_port ]
-      destination_domain = src_info[ :destination_domain ]
       destination_domain_port = [ destination_domain, destination_port ].join( ':' )
       data = [ [ 0, A_NEW_SOURCE, src_id ].pack( 'Q>CQ>' ), @custom.encode( destination_domain_port ) ].join
       loop_send_a_new_source( src_ext, data )
@@ -599,6 +601,23 @@ module Girl
       end
     end
 
+    ##
+    # send data
+    #
+    def send_data( tun, data, to_addr )
+      begin
+        tun.sendmsg( data, 0, to_addr )
+      rescue IO::WaitWritable, Errno::EINTR
+        return false
+      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+        puts "#{ Time.new } #{ e.class }, close tun"
+        close_tun( tun )
+        return false
+      end
+
+      true
+    end
+
     ##
     # close src
     #
@@ -835,13 +854,7 @@ module Girl
       while @tun_info[ :ctlmsgs ].any?
         to_addr, data = @tun_info[ :ctlmsgs ].first
 
-        begin
-          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 )
+        unless send_data( tun, data, to_addr )
           return
         end
 
@@ -857,15 +870,11 @@ module Girl
           data = src_ext[ :wmems ][ pack_id ]
 
           if data
-            begin
-              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 )
+            unless send_data( tun, data, @tun_info[ :tund_addr ] )
               return
             end
+
+            src_ext[ :last_continue_at ] = now
           end
         end
 
@@ -929,13 +938,7 @@ module Girl
 
         data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
 
-        begin
-          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 )
+        unless send_data( tun, data, @tun_info[ :tund_addr ] )
           return
         end
 
@@ -966,7 +969,7 @@ module Girl
         return
       end
 
-      id = rand( ( 2 ** 64 ) - 1 ) + 1
+      id = rand( ( 2 ** 64 ) - 2 ) + 1
       # puts "debug1 accept a src #{ addrinfo.inspect } #{ id }"
 
       @src_infos[ src ] = {

data/lib/girl/proxyd_worker.rb

@@ -112,7 +112,7 @@ module Girl
 
                   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 "p#{ Process.pid } #{ Time.new } expire dst ext #{ dst_local_port }"
+                      puts "p#{ Process.pid } #{ Time.new } expire dst ext #{ dst_ext[ :domain_port ] }"
                       del_dst_ext( tund, dst_local_port )
                     end
                   end
@@ -264,17 +264,18 @@ module Girl
       tund_info = @tund_infos[ tund ]
       tund_info[ :dst_local_ports ][ src_id ] = local_port
       tund_info[ :dst_exts ][ local_port ] = {
-        dst: dst,                  # dst
-        src_id: src_id,            # 近端src id
-        wmems: {},                 # 写后 pack_id => data
-        send_ats: {},              # 上一次发出时间 pack_id => send_at
-        relay_pack_id: 0,          # 转发到几
-        continue_src_pack_id: 0,   # 收到几
-        pieces: {},                # 跳号包 src_pack_id => data
-        is_src_closed: false,      # src是否已关闭
-        biggest_src_pack_id: 0,    # src最大包号码
-        completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 上一次发生流量的时间
+        dst: dst,                             # dst
+        src_id: src_id,                       # 近端src id
+        domain_port: destination_domain_port, # 域名和端口
+        wmems: {},                            # 写后 pack_id => data
+        send_ats: {},                         # 上一次发出时间 pack_id => send_at
+        relay_pack_id: 0,                     # 转发到几
+        continue_src_pack_id: 0,              # 收到几
+        pieces: {},                           # 跳号包 src_pack_id => data
+        is_src_closed: false,                 # src是否已关闭
+        biggest_src_pack_id: 0,               # src最大包号码
+        completed_pack_id: 0,                 # 完成到几（对面收到几）
+        last_continue_at: Time.new            # 上一次发生流量的时间
       }
 
       data = [ 0, PAIRED, src_id, local_port ].pack( 'Q>CQ>n' )
@@ -414,6 +415,23 @@ module Girl
       end
     end
 
+    ##
+    # send data
+    #
+    def send_data( tund, data, to_addr )
+      begin
+        tund.sendmsg( data, 0, to_addr )
+      rescue IO::WaitWritable, Errno::EINTR
+        return false
+      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+        puts "#{ Time.new } #{ e.class }, close tund"
+        close_tund( tund )
+        return false
+      end
+
+      true
+    end
+
     ##
     # close dst
     #
@@ -591,6 +609,7 @@ module Girl
     # write tund
     #
     def write_tund( tund )
+      now = Time.new
       tund_info = @tund_infos[ tund ]
 
       if tund_info[ :is_closing ]
@@ -602,9 +621,7 @@ module Girl
       while tund_info[ :ctlmsgs ].any?
         data = tund_info[ :ctlmsgs ].first
 
-        begin
-          tund.sendmsg( data, 0, tund_info[ :tun_addr ] )
-        rescue IO::WaitWritable, Errno::EINTR
+        unless send_data( tund, data, tund_info[ :tun_addr ] )
           return
         end
 
@@ -620,11 +637,11 @@ module Girl
           data = dst_ext[ :wmems ][ pack_id ]
 
           if data
-            begin
-              tund.sendmsg( data, 0, tund_info[ :tun_addr ] )
-            rescue IO::WaitWritable, Errno::EINTR
+            unless send_data( tund, data, tund_info[ :tun_addr ] )
               return
             end
+
+            dst_ext[ :last_continue_at ] = now
           end
         end
 
@@ -688,14 +705,11 @@ module Girl
 
         data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
 
-        begin
-          tund.sendmsg( data, 0, tund_info[ :tun_addr ] )
-        rescue IO::WaitWritable, Errno::EINTR
+        unless send_data( tund, data, tund_info[ :tun_addr ] )
           return
         end
 
         # puts "debug2 written pack #{ pack_id }"
-        now = Time.new
         dst_ext[ :relay_pack_id ] = pack_id
         dst_ext[ :wmems ][ pack_id ] = data
         dst_ext[ :send_ats ][ pack_id ] = now

data/lib/girl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.73.1
+  version: 0.78.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email:
@@ -49,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 妹子