girl 0.50.0 → 0.50.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87247b5b83a9944f6f88ebdf162352bceb23bea3b4f4e9c2abc8dd1222fe3500
-  data.tar.gz: '085096f65188b90f9d2fd88610c9b662ba33826a98e7071f9aef7de239d000a3'
+  metadata.gz: 22404c18134e089d770eb9a3bfb48a2fcec0d8d03020deb67ddb7d4002899fa7
+  data.tar.gz: 9966cb611a97bfbd96256c35cdf819aeb5e963e03cfe4a438112ac1f6cad9be4
 SHA512:
-  metadata.gz: 700f061521d68f61ca29053e5fc5bc9c8c0a78d4bd58b80e333ed6c425c65b653381486aef2c860e44268947d94a3cc337e0af2f7be75b6cb62367c12b2a684b
-  data.tar.gz: f3916e5e99a2c13c9b5b4d3c21b5b1a3825951f7dc0d78843df7b1419da205b255ba2cf3c6b2483472f9e61b133f18644f231d26b1b4abd99f9a6640b8e78540
+  metadata.gz: bce25c7de3d0b3ed2db61fe0a187c1c557d924c7923909f7b3d07a23ed33773cb3bfef9c0c92f1c56e4ef31550450b89bdf06a0ff33e26957737da5487ee44d2
+  data.tar.gz: b75cd4e997e4e525f4e0095548c5c852f0b5070f1ff3391401654c48c7df8841ee7daf15d35c9bdcc29e84eff2028c54eee46f8d0b7f112f7039d1e65e4c6387

data/girl.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['qqtakafan@gmail.com']
 
   spec.summary       = %q{妹子}
-  spec.description   = %q{while internet is evil, here's a patch.}
+  spec.description   = %q{while internet is evil, here's a girl.}
   spec.homepage      = 'https://github.com/takafan/girl'
   spec.license       = 'MIT'
 

data/lib/girl/head.rb

@@ -1,27 +1,27 @@
-module Girl
-  PACK_SIZE             = 1328             # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(source/dest id) - 8(pack id) = 1328
-  CHUNK_SIZE            = PACK_SIZE * 1000 # 块大小
-  WBUFFS_LIMIT          = 1000             # 写前上限，超过上限结一个块
-  WMEMS_LIMIT           = 100_000          # 写后上限，达到上限暂停写
-  RESUME_BELOW          = 50_000           # 降到多少以下恢复写
-  EXPIRE_AFTER          = 1800             # 多久过期
-  HEARTBEAT_INTERVAL    = 3                # 心跳间隔
-  STATUS_INTERVAL       = 0.3              # 发送状态间隔
-  SEND_STATUS_UNTIL     = 10               # 持续的告之对面状态，直到没有流量往来，持续多少秒
-  BREAK_SEND_MISS       = 10_000           # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
-  TUND_PORT             = 1
-  HEARTBEAT             = 2
-  A_NEW_SOURCE          = 3
-  PAIRED                = 4
-  DEST_STATUS           = 5
-  SOURCE_STATUS         = 6
-  MISS                  = 7
-  FIN1                  = 8
-  GOT_FIN1              = 9
-  FIN2                  = 10
-  GOT_FIN2              = 11
-  TUND_FIN              = 12
-  TUN_FIN               = 13
-  CTL_CLOSE             = 1
-  CTL_RESUME            = 2
-end
+module Girl
+  PACK_SIZE             = 1328             # 包大小 1400(console MTU) - 8(PPPoE header) - 40(IPv6 header) - 8(UDP header) - 8(source/dest id) - 8(pack id) = 1328
+  CHUNK_SIZE            = PACK_SIZE * 1000 # 块大小
+  WBUFFS_LIMIT          = 1000             # 写前上限，超过上限结一个块
+  WMEMS_LIMIT           = 100_000          # 写后上限，达到上限暂停写
+  RESUME_BELOW          = 50_000           # 降到多少以下恢复写
+  EXPIRE_AFTER          = 1800             # 多久过期
+  HEARTBEAT_INTERVAL    = 3                # 心跳间隔
+  STATUS_INTERVAL       = 0.3              # 发送状态间隔
+  SEND_STATUS_UNTIL     = 10               # 持续的告之对面状态，直到没有流量往来，持续多少秒
+  BREAK_SEND_MISS       = 10_000           # miss包个数上限，达到上限忽略要后面的段，可控碎片缓存
+  TUND_PORT             = 1
+  HEARTBEAT             = 2
+  A_NEW_SOURCE          = 3
+  PAIRED                = 4
+  DEST_STATUS           = 5
+  SOURCE_STATUS         = 6
+  MISS                  = 7
+  FIN1                  = 8
+  GOT_FIN1              = 9
+  FIN2                  = 10
+  GOT_FIN2              = 11
+  TUND_FIN              = 12
+  TUN_FIN               = 13
+  CTL_CLOSE             = 1
+  CTL_RESUME            = 2
+end

data/lib/girl/resolv.rb

@@ -1,200 +1,200 @@
-require 'girl/hex'
-require 'girl/version'
-require 'socket'
-
-##
-# Girl::Resolv - dns查询得到正确的ip。近端。
-#
-# usage
-# =====
-#
-# Girl::Resolvd.new( 7070 ).looping # 远端
-#
-# Girl::Resolv.new( 1717, [ '114.114.114.114' ], 'your.server.ip', 7070, [ 'google.com' ] ).looping # 近端
-#
-# dig google.com @127.0.0.1 -p1717
-#
-module Girl
-  class Resolv
-
-    def initialize( port = 1717, nameservers = [], resolvd_host = nil, resolvd_port = nil, custom_domains = [] )
-      @hex = Girl::Hex.new
-      @mutex = Mutex.new
-      @reads = []
-      @writes = []
-      @roles = {} # sock => :ctlr / :redir / :resolv / :pub
-      @infos = {} # redir => {}
-      @socks = {} # sock => sock_id
-      @sock_ids = {} # sock_id => sock
-
-      redir = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      redir.bind( Socket.sockaddr_in( port, '0.0.0.0' ) )
-      puts "redir bound on #{ port } #{ Time.new }"
-
-      nameservers = nameservers.select{ | ns | Addrinfo.udp( ns, 53 ).ipv4? }
-
-      if nameservers.empty?
-        nameservers = %w[ 114.114.114.114 114.114.115.115 ]
-      end
-
-      redir_info = {
-        src_addrs: {},     # src_addr => resolv_or_pub
-        socks: {},         # resolv_or_pub => src_addr
-        last_recv_ats: {}, # resolv_or_pub => now
-        pubd_addrs: nameservers.map{ | ns | Socket.sockaddr_in( 53, ns ) },
-        resolvd_addr: ( resolvd_host && resolvd_port ) ? Socket.sockaddr_in( resolvd_port, resolvd_host ) : nil,
-        custom_qnames: custom_domains.map{ | dom | dom.split( '.' ).map{ | sub | [ sub.size ].pack( 'C' ) + sub }.join }
-      }
-
-      @redir = redir
-      @redir_info = redir_info
-      @roles[ redir ] = :redir
-      @infos[ redir ] = redir_info
-      @reads << redir
-
-      ctlr, ctlw = IO.pipe
-      @ctlw = ctlw
-      @roles[ ctlr ] = :ctlr
-      @reads << ctlr
-    end
-
-    def looping
-      loop_expire
-
-      loop do
-        rs, ws = IO.select( @reads, @writes )
-
-        @mutex.synchronize do
-          rs.each do | sock |
-            case @roles[ sock ]
-            when :ctlr
-              read_ctlr( sock )
-            when :redir
-              read_redir( sock )
-            when :resolv, :pub
-              read_sock( sock )
-            end
-          end
-
-          ws.each do | sock |
-            close_sock( sock )
-          end
-        end
-      end
-    end
-
-    def quit!
-      exit
-    end
-
-    private
-
-    def read_ctlr( ctlr )
-      sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
-      sock = @sock_ids[ sock_id ]
-
-      if sock
-        # puts "debug expire #{ @roles[ sock ] } #{ sock_id } #{ Time.new }"
-
-        unless @writes.include?( sock )
-          @writes << sock
-        end
-      end
-    end
-
-    def read_redir( redir )
-      # https://tools.ietf.org/html/rfc1035#page-26
-      data, addrinfo, rflags, *controls = redir.recvmsg
-      return if data.size <= 12
-
-      id = data[ 0, 2 ]
-      qname_len = data[ 12..-1 ].index( [ 0 ].pack( 'C' ) )
-      return unless qname_len
-
-      now = Time.new
-      info = @infos[ redir ]
-      src_addr = addrinfo.to_sockaddr
-      sock = info[ :src_addrs ][ src_addr ]
-
-      unless sock
-        sock = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-        sock.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-        sock.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
-
-        sock_id = @hex.gen_random_num
-        @socks[ sock ] = sock_id
-        @sock_ids[ sock_id ] = sock
-        qname = data[ 12, qname_len ]
-
-        if info[ :resolvd_addr ] && ( info[ :custom_qnames ].any? { | custom | qname.include?( custom ) } )
-          @roles[ sock ] = :resolv
-        else
-          @roles[ sock ] = :pub
-        end
-
-        # puts "debug a new #{ @roles[ sock ] } bound on #{ sock.local_address.ip_unpack.last } #{ Time.new }"
-
-        @reads << sock
-        info[ :src_addrs ][ src_addr ] = sock
-        info[ :socks ][ sock ] = src_addr
-        info[ :last_recv_ats ][ sock ] = now
-      end
-
-      if @roles[ sock ] == :resolv
-        data = @hex.encode( data )
-        sock.sendmsg( data, 0, info[ :resolvd_addr ] )
-      else
-        info[ :pubd_addrs ].each { | pubd_addr | sock.sendmsg( data, 0, pubd_addr ) }
-      end
-    end
-
-    def read_sock( sock )
-      data, addrinfo, rflags, *controls = sock.recvmsg
-      return if data.size <= 12
-
-      if @roles[ sock ] == :resolv
-        data = @hex.decode( data )
-      end
-
-      src_addr = @redir_info[ :socks ][ sock ]
-      return unless src_addr
-
-      @redir_info[ :last_recv_ats ][ sock ] = Time.new
-      @redir.sendmsg( data, 0, src_addr )
-    end
-
-    def close_sock( sock )
-      sock.close
-      @reads.delete( sock )
-      @writes.delete( sock )
-      @roles.delete( sock )
-      sock_id = @socks.delete( sock )
-      @sock_ids.delete( sock_id )
-      @redir_info[ :last_recv_ats ].delete( sock )
-      src_addr = @redir_info[ :socks ].delete( sock )
-      @redir_info[ :src_addrs ].delete( src_addr )
-    end
-
-    def loop_expire
-      Thread.new do
-        loop do
-          sleep 60
-
-          @mutex.synchronize do
-            now = Time.new
-            socks = @redir_info[ :socks ].keys
-
-            socks.each do | sock |
-              if now - @redir_info[ :last_recv_ats ][ sock ] > 5
-                sock_id = @socks[ sock ]
-                @ctlw.write( [ sock_id ].pack( 'Q>' ) )
-              end
-            end
-          end
-        end
-      end
-    end
-
-  end
-end
+require 'girl/hex'
+require 'girl/version'
+require 'socket'
+
+##
+# Girl::Resolv - dns查询得到正确的ip。近端。
+#
+# usage
+# =====
+#
+# Girl::Resolvd.new( 7070 ).looping # 远端
+#
+# Girl::Resolv.new( 1717, [ '114.114.114.114' ], 'your.server.ip', 7070, [ 'google.com' ] ).looping # 近端
+#
+# dig google.com @127.0.0.1 -p1717
+#
+module Girl
+  class Resolv
+
+    def initialize( port = 1717, nameservers = [], resolvd_host = nil, resolvd_port = nil, custom_domains = [] )
+      @hex = Girl::Hex.new
+      @mutex = Mutex.new
+      @reads = []
+      @writes = []
+      @roles = {} # sock => :ctlr / :redir / :resolv / :pub
+      @infos = {} # redir => {}
+      @socks = {} # sock => sock_id
+      @sock_ids = {} # sock_id => sock
+
+      redir = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+      redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+      redir.bind( Socket.sockaddr_in( port, '0.0.0.0' ) )
+      puts "redir bound on #{ port } #{ Time.new }"
+
+      nameservers = nameservers.select{ | ns | Addrinfo.udp( ns, 53 ).ipv4? }
+
+      if nameservers.empty?
+        nameservers = %w[ 114.114.114.114 114.114.115.115 ]
+      end
+
+      redir_info = {
+        src_addrs: {},     # src_addr => resolv_or_pub
+        socks: {},         # resolv_or_pub => src_addr
+        last_recv_ats: {}, # resolv_or_pub => now
+        pubd_addrs: nameservers.map{ | ns | Socket.sockaddr_in( 53, ns ) },
+        resolvd_addr: ( resolvd_host && resolvd_port ) ? Socket.sockaddr_in( resolvd_port, resolvd_host ) : nil,
+        custom_qnames: custom_domains.map{ | dom | dom.split( '.' ).map{ | sub | [ sub.size ].pack( 'C' ) + sub }.join }
+      }
+
+      @redir = redir
+      @redir_info = redir_info
+      @roles[ redir ] = :redir
+      @infos[ redir ] = redir_info
+      @reads << redir
+
+      ctlr, ctlw = IO.pipe
+      @ctlw = ctlw
+      @roles[ ctlr ] = :ctlr
+      @reads << ctlr
+    end
+
+    def looping
+      loop_expire
+
+      loop do
+        rs, ws = IO.select( @reads, @writes )
+
+        @mutex.synchronize do
+          rs.each do | sock |
+            case @roles[ sock ]
+            when :ctlr
+              read_ctlr( sock )
+            when :redir
+              read_redir( sock )
+            when :resolv, :pub
+              read_sock( sock )
+            end
+          end
+
+          ws.each do | sock |
+            close_sock( sock )
+          end
+        end
+      end
+    end
+
+    def quit!
+      exit
+    end
+
+    private
+
+    def read_ctlr( ctlr )
+      sock_id = ctlr.read( 8 ).unpack( 'Q>' ).first
+      sock = @sock_ids[ sock_id ]
+
+      if sock
+        # puts "debug expire #{ @roles[ sock ] } #{ sock_id } #{ Time.new }"
+
+        unless @writes.include?( sock )
+          @writes << sock
+        end
+      end
+    end
+
+    def read_redir( redir )
+      # https://tools.ietf.org/html/rfc1035#page-26
+      data, addrinfo, rflags, *controls = redir.recvmsg
+      return if data.size <= 12
+
+      id = data[ 0, 2 ]
+      qname_len = data[ 12..-1 ].index( [ 0 ].pack( 'C' ) )
+      return unless qname_len
+
+      now = Time.new
+      info = @infos[ redir ]
+      src_addr = addrinfo.to_sockaddr
+      sock = info[ :src_addrs ][ src_addr ]
+
+      unless sock
+        sock = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+        sock.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        sock.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
+
+        sock_id = @hex.gen_random_num
+        @socks[ sock ] = sock_id
+        @sock_ids[ sock_id ] = sock
+        qname = data[ 12, qname_len ]
+
+        if info[ :resolvd_addr ] && ( info[ :custom_qnames ].any? { | custom | qname.include?( custom ) } )
+          @roles[ sock ] = :resolv
+        else
+          @roles[ sock ] = :pub
+        end
+
+        # puts "debug a new #{ @roles[ sock ] } bound on #{ sock.local_address.ip_unpack.last } #{ Time.new }"
+
+        @reads << sock
+        info[ :src_addrs ][ src_addr ] = sock
+        info[ :socks ][ sock ] = src_addr
+        info[ :last_recv_ats ][ sock ] = now
+      end
+
+      if @roles[ sock ] == :resolv
+        data = @hex.encode( data )
+        sock.sendmsg( data, 0, info[ :resolvd_addr ] )
+      else
+        info[ :pubd_addrs ].each { | pubd_addr | sock.sendmsg( data, 0, pubd_addr ) }
+      end
+    end
+
+    def read_sock( sock )
+      data, addrinfo, rflags, *controls = sock.recvmsg
+      return if data.size <= 12
+
+      if @roles[ sock ] == :resolv
+        data = @hex.decode( data )
+      end
+
+      src_addr = @redir_info[ :socks ][ sock ]
+      return unless src_addr
+
+      @redir_info[ :last_recv_ats ][ sock ] = Time.new
+      @redir.sendmsg( data, 0, src_addr )
+    end
+
+    def close_sock( sock )
+      sock.close
+      @reads.delete( sock )
+      @writes.delete( sock )
+      @roles.delete( sock )
+      sock_id = @socks.delete( sock )
+      @sock_ids.delete( sock_id )
+      @redir_info[ :last_recv_ats ].delete( sock )
+      src_addr = @redir_info[ :socks ].delete( sock )
+      @redir_info[ :src_addrs ].delete( src_addr )
+    end
+
+    def loop_expire
+      Thread.new do
+        loop do
+          sleep 60
+
+          @mutex.synchronize do
+            now = Time.new
+            socks = @redir_info[ :socks ].keys
+
+            socks.each do | sock |
+              if now - @redir_info[ :last_recv_ats ][ sock ] > 5
+                sock_id = @socks[ sock ]
+                @ctlw.write( [ sock_id ].pack( 'Q>' ) )
+              end
+            end
+          end
+        end
+      end
+    end
+
+  end
+end