girl 0.73.0 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d975dc92620d5ea2c27493ed0fbbb19a145fc7ecda564c2f5609eb710e06912d
-  data.tar.gz: 5c098f6b8aecc89d246e8e4b1c477eb42e86ce695b27d4329962255d380b4f09
+  metadata.gz: 67fe23b6655278a6589fda1afc4ae23af79dfb0f25d023cd357b4722e07fb1a2
+  data.tar.gz: af7f01bb573014f78d4ecbc06926749d2326c74862b02b53b2f300fd2a927cd0
 SHA512:
-  metadata.gz: 326b198254e6508e42b00145e00c56214574510448ba05b852b257b44da2c54b443509d1e2af514a668b1394e27cfff2ae93cf1957526adf9315a73e32a3ebbd
-  data.tar.gz: 21e0cab87ffe323314607d74c3884eb2987208a9375b417c1158d1768e7aafcf536d7370d5fdff58b08d1d7acb95da009eba57ddcc9d9d22702e405078b2c7e5
+  metadata.gz: 5f5ef13b0650eb3c289de191f8aeabfd1e288b58a6fbd680ced51c027cd43d9a4bc7ad988398e611a0dd3cc88ddd894e87dc7252b03b24e8a1e7dd5464d81b73
+  data.tar.gz: '094ee98b813b04ec12b8a1ea9181c6353cf69eb69ecc595bbbe1f326f1cf6a70b9a11778cfc4d0eee84f59308a0b5ec4f556bab8982befd0d5a1a51b4e850ba3'

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
@@ -123,20 +123,16 @@ module Girl
             end
 
             @src_infos.each do | src, src_info |
-              is_expired = src_info[ :last_recv_at ].nil? && ( now - src_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire src"
+              if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire src #{ src_info[ :destination_domain ] }"
                 set_is_closing( src )
                 need_trigger = true
               end
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ].nil?  && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire dst"
+              if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain ] }"
                 set_is_closing( dst )
                 need_trigger = true
               end
@@ -337,6 +333,7 @@ module Girl
     #
     def new_a_dst( src, ip_info )
       src_info = @src_infos[ src ]
+      domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
 
@@ -357,15 +354,15 @@ module Girl
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
       local_port = dst.local_address.ip_port
       @dst_infos[ dst ] = {
-        local_port: local_port, # 本地端口
-        src: src,               # 对应src
-        wbuff: '',              # 写前
-        cache: '',              # 块读出缓存
-        chunks: [],             # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,              # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,   # 创建时间
-        last_recv_at: nil,      # 上一次收到流量的时间，过期关闭
-        is_closing: false       # 是否准备关闭
+        local_port: local_port,     # 本地端口
+        src: src,                   # 对应src
+        domain: domain,             # 域名
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( dst, :dst )
@@ -396,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 )
@@ -602,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
     #
@@ -768,6 +784,7 @@ module Girl
       # puts "debug2 write src #{ written }"
       data = data[ written..-1 ]
       src_info[ from ] = data
+      src_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -819,6 +836,7 @@ module Girl
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -836,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
 
@@ -858,13 +870,7 @@ 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
           end
@@ -930,13 +936,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
 
@@ -967,26 +967,25 @@ 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 ] = {
-        id: id,                  # id
-        proxy_proto: :uncheck,   # :uncheck / :http / :socks5
-        proxy_type: :uncheck,    # :uncheck / :checking / :direct / :tunnel / :negotiation
-        dst: nil,                # :direct的场合，对应的dst
-        destination_domain: nil, # 目的地域名
-        destination_port: nil,   # 目的地端口
-        biggest_pack_id: 0,      # 最大包号码
-        is_connect: true,        # 代理协议是http的场合，是否是CONNECT
-        rbuffs: [],              # 非CONNECT，dst或者远端dst未准备好，暂存流量 [ pack_id, data ]
-        wbuff: '',               # 写前
-        cache: '',               # 块读出缓存
-        chunks: [],              # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,               # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,    # 创建时间
-        last_recv_at: nil,       # 上一次收到流量的时间，过期关闭
-        is_closing: false        # 是否准备关闭
+        id: id,                     # id
+        proxy_proto: :uncheck,      # :uncheck / :http / :socks5
+        proxy_type: :uncheck,       # :uncheck / :checking / :direct / :tunnel / :negotiation
+        dst: nil,                   # :direct的场合，对应的dst
+        destination_domain: nil,    # 目的地域名
+        destination_port: nil,      # 目的地端口
+        biggest_pack_id: 0,         # 最大包号码
+        is_connect: true,           # 代理协议是http的场合，是否是CONNECT
+        rbuffs: [],                 # 非CONNECT，dst或者远端dst未准备好，暂存流量 [ pack_id, data ]
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( src, :src )
@@ -1008,7 +1007,7 @@ module Girl
 
       # puts "debug2 read src #{ data.inspect }"
       src_info = @src_infos[ src ]
-      src_info[ :last_recv_at ] = Time.new
+      src_info[ :last_continue_at ] = Time.new
       proxy_type = src_info[ :proxy_type ]
 
       case proxy_type
@@ -1198,7 +1197,7 @@ module Girl
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
       src = dst_info[ :src ]
 
       if src.closed?

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
@@ -123,10 +123,8 @@ module Girl
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ].nil? && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire dst"
+              if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain_port ] }"
                 set_is_closing( dst )
                 need_trigger = true
               end
@@ -195,7 +193,7 @@ module Girl
 
         if Time.new - created_at < RESOLV_CACHE_EXPIRE
           # puts "debug1 #{ destination_domain_port } hit resolv cache #{ Addrinfo.new( destination_addr ).inspect }"
-          deal_with_destination_addr( tund, src_id, destination_addr )
+          deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
           return
         end
 
@@ -223,7 +221,7 @@ module Girl
             @resolv_caches[ destination_domain_port ] = [ destination_addr, Time.new ]
 
             unless tund.closed?
-              if deal_with_destination_addr( tund, src_id, destination_addr )
+              if deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
                 next_tick
               end
             end
@@ -235,7 +233,7 @@ module Girl
     ##
     # deal with destination addr
     #
-    def deal_with_destination_addr( tund, src_id, destination_addr )
+    def deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
       dst = Socket.new( Addrinfo.new( destination_addr ).ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
       dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
 
@@ -250,33 +248,34 @@ module Girl
       local_port = dst.local_address.ip_port
 
       @dst_infos[ dst ] = {
-        local_port: local_port, # 本地端口
-        tund: tund,             # 对应tund
-        biggest_pack_id: 0,     # 最大包号码
-        wbuff: '',              # 写前
-        cache: '',              # 块读出缓存
-        chunks: [],             # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,              # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,   # 创建时间
-        last_recv_at: nil,      # 上一次收到流量的时间，过期关闭
-        is_closing: false       # 是否准备关闭
+        local_port: local_port,               # 本地端口
+        tund: tund,                           # 对应tund
+        domain_port: destination_domain_port, # 域名和端口
+        biggest_pack_id: 0,                   # 最大包号码
+        wbuff: '',                            # 写前
+        cache: '',                            # 块读出缓存
+        chunks: [],                           # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new,           # 上一次发生流量的时间
+        is_closing: false                     # 是否准备关闭
       }
       add_read( dst, :dst )
 
       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' )
@@ -416,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
     #
@@ -586,6 +602,7 @@ module Girl
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -603,9 +620,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
 
@@ -621,9 +636,7 @@ 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
           end
@@ -689,9 +702,7 @@ 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
 
@@ -775,7 +786,7 @@ module Girl
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
       tund = dst_info[ :tund ]
 
       if tund.closed?

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.73.0'.freeze
+  VERSION = '0.77.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.73.0
+  version: 0.77.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-26 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: 妹子