girl 0.70.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb6d1abdce7bdbf84b4fa3c745be76cf5a990ebc0e7533deae6a97567e043524
-  data.tar.gz: 501bf156af3a02a6ef17f98e8ea16d71c152c02da3e1eba3593e11f6dd0f1541
+  metadata.gz: d975dc92620d5ea2c27493ed0fbbb19a145fc7ecda564c2f5609eb710e06912d
+  data.tar.gz: 5c098f6b8aecc89d246e8e4b1c477eb42e86ce695b27d4329962255d380b4f09
 SHA512:
-  metadata.gz: 7485329397159e630ad15807d9d973a9080261ab44ce18a99fc0a1eb6832b70b82ff177968049b59383a79cc23db00f951d265cf22d2ad9fbdeaf1332a314185
-  data.tar.gz: b60356633483e23338e2f926905cfa0fd3d2d39e98a6b638705d26831406564082bea91ba7bab4d02b3eab77abd020854677be9597890ac070b05edd916c8081
+  metadata.gz: 326b198254e6508e42b00145e00c56214574510448ba05b852b257b44da2c54b443509d1e2af514a668b1394e27cfff2ae93cf1957526adf9315a73e32a3ebbd
+  data.tar.gz: 21e0cab87ffe323314607d74c3884eb2987208a9375b417c1158d1768e7aafcf536d7370d5fdff58b08d1d7acb95da009eba57ddcc9d9d22702e405078b2c7e5

data/lib/girl/head.rb

@@ -1,17 +1,17 @@
 module Girl
-  PACK_SIZE             = 1328                   # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(pack id) - 8(src id) = 1328
-  CHUNK_SIZE            = PACK_SIZE * 1000       # 块大小
-  WBUFFS_LIMIT          = 1000                   # 写前上限，超过上限结一个块
-  WMEMS_LIMIT           = 100_000                # 写后上限，达到上限暂停写
-  RESUME_BELOW          = 50_000                 # 降到多少以下恢复写
-  EXPIRE_NEW            = 10                     # 创建之后多久没有流量进来，过期
-  EXPIRE_AFTER          = 300                    # 多久没有新流量，过期
-  CHECK_EXPIRE_INTERVAL = 30                     # 检查过期间隔
-  STATUS_INTERVAL       = 0.5                    # 发送状态间隔
-  SEND_STATUS_UNTIL     = 10                     # 持续的告之对面状态，直到没有流量往来，持续多少秒
-  BREAK_SEND_MISS       = 10_000                 # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
-  CONFUSE_UNTIL         = 5                      # 混淆前几个包
-  RESOLV_CACHE_EXPIRE   = 300                    # dns查询结果缓存多久过期
+  PACK_SIZE             = 1328             # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(pack id) - 8(src id) = 1328
+  CHUNK_SIZE            = PACK_SIZE * 1000 # 块大小
+  WBUFFS_LIMIT          = 1000             # 写前上限，超过上限结一个块
+  WMEMS_LIMIT           = 100_000          # 写后上限，达到上限暂停写
+  RESUME_BELOW          = 50_000           # 降到多少以下恢复写
+  EXPIRE_NEW            = 10               # 创建之后多久没有流量进来，过期
+  EXPIRE_AFTER          = 300              # 多久没有新流量，过期
+  CHECK_EXPIRE_INTERVAL = 30               # 检查过期间隔
+  STATUS_INTERVAL       = 0.5              # 发送状态间隔
+  SEND_STATUS_UNTIL     = 10               # 持续的告之对面状态，直到没有流量往来，持续多少秒
+  BREAK_SEND_MISS       = 10_000           # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
+  CONFUSE_UNTIL         = 5                # 混淆前几个包
+  RESOLV_CACHE_EXPIRE   = 300              # dns查询结果缓存多久过期
   TUND_PORT             = 1
   HEARTBEAT             = 2
   A_NEW_SOURCE          = 3

data/lib/girl/proxy.rb

@@ -23,15 +23,15 @@ require 'socket'
 #
 # tun-tund:
 #
-# Q>: 0 ctlmsg -> C: 2 heartbeat  -> C: random char
-#                    3 a new src  -> Q>: src id -> encoded destination address
-#                    4 paired     -> Q>: src id -> n: dst port
-#                    5 dst status -> n: dst port -> Q>: biggest relayed dst pack id -> Q>: continue src pack id
-#                    6 src status -> Q>: src id -> Q>: biggest relayed src pack id -> Q>: continue dst pack id
-#                    7 miss       -> Q>/n: src id / dst port -> Q>: pack id begin -> Q>:  pack id end
-#                    8 fin1       -> Q>/n: src id / dst port -> Q>: biggest src pack id / biggest dst pack id -> Q>: continue dst pack id / continue src pack id
+# Q>: 0 ctlmsg -> C: 2 heartbeat     -> C: random char
+#                    3 a new source  -> Q>: src id -> encoded destination address
+#                    4 paired        -> Q>: src id -> n: dst port
+#                    5 dest status   -> n: dst port -> Q>: biggest relayed dst pack id -> Q>: continue src pack id
+#                    6 source status -> Q>: src id -> Q>: biggest relayed src pack id -> Q>: continue dst pack id
+#                    7 miss          -> Q>/n: src id / dst port -> Q>: pack id begin -> Q>:  pack id end
+#                    8 fin1          -> Q>/n: src id / dst port -> Q>: biggest src pack id / biggest dst pack id -> Q>: continue dst pack id / continue src pack id
 #                    9 not use
-#                   10 fin2       -> Q>/n: src id / dst port
+#                   10 fin2          -> Q>/n: src id / dst port
 #                   11 not use
 #                   12 tund fin
 #                   13 tun fin
@@ -129,21 +129,19 @@ module Girl
       end
 
       src_chunk_dir = File.join( proxy_tmp_dir, 'src.chunk' )
-      dst_chunk_dir = File.join( proxy_tmp_dir, 'dst.chunk' )
-      tun_chunk_dir = File.join( proxy_tmp_dir, 'tun.chunk' )
-
-      unless Dir.exist?( proxy_tmp_dir )
-        Dir.mkdir( proxy_tmp_dir )
-      end
 
       unless Dir.exist?( src_chunk_dir )
         Dir.mkdir( src_chunk_dir )
       end
 
+      dst_chunk_dir = File.join( proxy_tmp_dir, 'dst.chunk' )
+
       unless Dir.exist?( dst_chunk_dir )
         Dir.mkdir( dst_chunk_dir )
       end
 
+      tun_chunk_dir = File.join( proxy_tmp_dir, 'tun.chunk' )
+
       unless Dir.exist?( tun_chunk_dir )
         Dir.mkdir( tun_chunk_dir )
       end

data/lib/girl/proxy_worker.rb

@@ -18,7 +18,6 @@ module Girl
       @writes = []
       @roles = {}         # sock => :dotr / :proxy / :src / :dst / :tun
       @src_infos = {}     # src => {}
-      @dsts = {}          # local_port => dst
       @dst_infos = {}     # dst => {}
       @resolv_caches = {} # domain => [ ip, created_at ]
 
@@ -192,15 +191,31 @@ module Girl
     end
 
     ##
-    # resolve domain
+    # loop send a new source
     #
-    def resolve_domain( src, domain )
-      if ( /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ domain ) && domain.split( '.' ).all? { | part | part.to_i < 256 }
-        # puts "debug1 #{ domain } is a ip"
-        deal_with_destination_ip( src, domain )
-        return
+    def loop_send_a_new_source( src_ext, data )
+      Thread.new do
+        EXPIRE_NEW.times do
+          if src_ext[ :src ].closed? || src_ext[ :dst_port ]
+            # puts "debug1 break loop send a new source #{ src_ext[ :dst_port ] }"
+            break
+          end
+
+          @mutex.synchronize do
+            # puts "debug1 send a new source #{ data.inspect }"
+            add_tun_ctlmsg( data )
+            next_tick
+          end
+
+          sleep 1
+        end
       end
+    end
 
+    ##
+    # resolve domain
+    #
+    def resolve_domain( src, domain )
       if @remotes.any? { | remote | ( domain.size >= remote.size ) && ( domain[ ( remote.size * -1 )..-1 ] == remote ) }
         # puts "debug1 #{ domain } hit remotes"
         new_a_src_ext( src )
@@ -210,11 +225,11 @@ module Girl
       resolv_cache = @resolv_caches[ domain ]
 
       if resolv_cache
-        destination_ip, created_at = resolv_cache
+        ip_info, created_at = resolv_cache
 
         if Time.new - created_at < RESOLV_CACHE_EXPIRE
-          # puts "debug1 #{ domain } hit resolv cache #{ destination_ip }"
-          deal_with_destination_ip( src, destination_ip )
+          # puts "debug1 #{ domain } hit resolv cache #{ ip_info.inspect }"
+          deal_with_destination_ip( src, ip_info )
           return
         end
 
@@ -234,12 +249,11 @@ module Girl
 
         @mutex.synchronize do
           if ip_info
-            destination_ip = ip_info.ip_address
-            # puts "debug1 resolved #{ domain } #{ destination_ip }"
-            @resolv_caches[ domain ] = [ destination_ip, Time.new ]
+            @resolv_caches[ domain ] = [ ip_info, Time.new ]
 
             unless src.closed?
-              deal_with_destination_ip( src, destination_ip )
+              puts "p#{ Process.pid } #{ Time.new } resolved #{ domain } #{ ip_info.ip_address }"
+              deal_with_destination_ip( src, ip_info )
             end
           else
             set_is_closing( src )
@@ -253,11 +267,11 @@ module Girl
     ##
     # deal with destination ip
     #
-    def deal_with_destination_ip( src, destination_ip )
-      if @directs.any? { | direct | direct.include?( destination_ip ) }
+    def deal_with_destination_ip( src, ip_info )
+      if @directs.any? { | direct | direct.include?( ip_info.ip_address ) }
         # ip命中直连列表，直连
-        # puts "debug1 #{ destination_ip } hit directs"
-        new_a_dst( src, destination_ip )
+        # puts "debug1 #{ ip_info.inspect } hit directs"
+        new_a_dst( src, ip_info )
       else
         # 走远端
         new_a_src_ext( src )
@@ -321,10 +335,10 @@ module Girl
     ##
     # new a dst
     #
-    def new_a_dst( src, destination_ip )
+    def new_a_dst( src, ip_info )
       src_info = @src_infos[ src ]
-      destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], destination_ip )
-      dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      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 )
 
       if RUBY_PLATFORM.include?( 'linux' )
         dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
@@ -342,7 +356,6 @@ module Girl
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
       local_port = dst.local_address.ip_port
-      @dsts[ local_port ] = dst
       @dst_infos[ dst ] = {
         local_port: local_port, # 本地端口
         src: src,               # 对应src
@@ -361,11 +374,9 @@ module Girl
 
       if src_info[ :proxy_proto ] == :http
         if src_info[ :is_connect ]
-          # CONNECT
           # puts "debug1 add src wbuff http ok"
           add_src_wbuff( src, HTTP_OK )
         else
-          # not CONNECT
           # puts "debug1 add src rbuffs to dst wbuff"
 
           src_info[ :rbuffs ].each do | _, data |
@@ -408,7 +419,7 @@ module Girl
       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
-      add_tun_ctlmsg( data )
+      loop_send_a_new_source( src_ext, data )
     end
 
     ##
@@ -644,7 +655,6 @@ module Girl
         end
       end
 
-      @dsts.delete( dst_info[ :local_port ] )
       set_is_closing( dst_info[ :src ] )
     end
 
@@ -830,6 +840,10 @@ module Girl
           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 )
+          return
         end
 
         @tun_info[ :ctlmsgs ].shift
@@ -848,6 +862,10 @@ module Girl
               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 )
+              return
             end
           end
         end
@@ -916,6 +934,10 @@ module Girl
           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 )
+          return
         end
 
         # puts "debug2 written pack #{ pack_id }"
@@ -1093,7 +1115,7 @@ module Girl
             src_info[ :destination_domain ] = destination_ip
             src_info[ :destination_port ] = destination_port
             # puts "debug1 IP V4 address #{ destination_addrinfo.inspect }"
-            deal_with_destination_ip( src, destination_ip )
+            deal_with_destination_ip( src, destination_addrinfo )
           elsif atyp == 3
             domain_len = data[ 4 ].unpack( 'C' ).first
 
@@ -1242,11 +1264,9 @@ module Girl
 
           if src_info[ :proxy_proto ] == :http
             if src_info[ :is_connect ]
-              # CONNECT
               # puts "debug1 add src wbuff http ok"
               add_src_wbuff( src, HTTP_OK )
             else
-              # not CONNECT
               # puts "debug1 add src rbuffs to tun wbuffs"
 
               src_info[ :rbuffs ].each do | pack_id, _data |
@@ -1336,7 +1356,6 @@ module Girl
           src_ext[ :biggest_dst_pack_id ] = biggest_dst_pack_id
           release_wmems( src_ext, continue_src_pack_id )
 
-          # 接到对面已关闭，若最后一个包已经进写前，关闭src
           if ( biggest_dst_pack_id == src_ext[ :continue_dst_pack_id ] )
             # puts "debug1 2-1. tun recv fin1 -> all traffic received ? -> close src after write"
             set_is_closing( src_ext[ :src ] )

data/lib/girl/proxyd.rb

@@ -37,16 +37,13 @@ module Girl
       end
 
       dst_chunk_dir = File.join( proxyd_tmp_dir, 'dst.chunk' )
-      tund_chunk_dir = File.join( proxyd_tmp_dir, 'tund.chunk' )
-
-      unless Dir.exist?( proxyd_tmp_dir )
-        Dir.mkdir( proxyd_tmp_dir )
-      end
 
       unless Dir.exist?( dst_chunk_dir )
         Dir.mkdir( dst_chunk_dir )
       end
 
+      tund_chunk_dir = File.join( proxyd_tmp_dir, 'tund.chunk' )
+
       unless Dir.exist?( tund_chunk_dir )
         Dir.mkdir( tund_chunk_dir )
       end

data/lib/girl/proxyd_worker.rb

@@ -204,13 +204,17 @@ module Girl
       end
 
       Thread.new do
-        destination_domain, destination_port = destination_domain_port.split( ':' )
-        destination_port = destination_port.to_i
+        colon_idx = destination_domain_port.rindex( ':' )
 
-        begin
-          destination_addr = Socket.sockaddr_in( destination_port, destination_domain )
-        rescue Exception => e
-          puts "p#{ Process.pid } #{ Time.new } sockaddr in #{ destination_domain_port } #{ e.class }"
+        if colon_idx
+          destination_domain = destination_domain_port[ 0...colon_idx ]
+          destination_port = destination_domain_port[ ( colon_idx + 1 )..-1 ].to_i
+
+          begin
+            destination_addr = Socket.sockaddr_in( destination_port, destination_domain )
+          rescue Exception => e
+            puts "p#{ Process.pid } #{ Time.new } sockaddr in #{ destination_domain_port } #{ e.class }"
+          end
         end
 
         @mutex.synchronize do
@@ -232,7 +236,7 @@ module Girl
     # deal with destination addr
     #
     def deal_with_destination_addr( tund, src_id, destination_addr )
-      dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      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 )
 
       begin
@@ -814,7 +818,6 @@ module Girl
         when A_NEW_SOURCE
           src_id = data[ 9, 8 ].unpack( 'Q>' ).first
           dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
-          # puts "debug1 got a new source #{ src_id }"
 
           if dst_local_port
             dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
@@ -831,8 +834,8 @@ module Girl
           end
 
           data = data[ 17..-1 ]
-          # puts "debug1 #{ data }"
           destination_domain_port = @custom.decode( data )
+          puts "p#{ Process.pid } #{ Time.new } a new source #{ src_id } #{ destination_domain_port }"
           resolve_domain( tund, src_id, destination_domain_port )
         when SOURCE_STATUS
           src_id, relay_src_pack_id, continue_dst_pack_id  = data[ 9, 24 ].unpack( 'Q>Q>Q>' )
@@ -908,7 +911,6 @@ module Girl
           dst_ext[ :biggest_src_pack_id ] = biggest_src_pack_id
           release_wmems( dst_ext, continue_dst_pack_id )
 
-          # 接到对面已关闭，若最后一个包已经进写前，关闭dst
           if biggest_src_pack_id == dst_ext[ :continue_src_pack_id ]
             # puts "debug1 4-1. tund recv fin1 -> all traffic received ? -> close dst after write"
             set_is_closing( dst_ext[ :dst ] )

data/lib/girl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.73.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: