girl 0.99.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9256dd41425122dd6c8f579d7821c70213b042090c2ce3320b20931c6aa9f8e
-  data.tar.gz: 7af6d01468ee207a768d52ecaf96b3baadb89bb81130f37850776b4ed6bf0393
+  metadata.gz: 0c0254d6f9509721f13f14148087071820ae5ad13a3a7a87884d5372e7d93035
+  data.tar.gz: 2e718e248d7b3967e350a0dd4b6266c2a396a7eb5193a2fcd419222606b9ac19
 SHA512:
-  metadata.gz: ff1e09096efc25f66473d85e34652b76841ffa533a538c75f63562c3593afd48089d40398f74abebd40338f4af12bfc2277669ec9550f0b599b30437b681ed51
-  data.tar.gz: 95c954a9651bc636c20298a94a39a1ec334867283bd24d0b53423528d0047a82e0a89ea6764015d6d0cfc1598210aba586ef9fdf7e75ceea4a50e3797f85f356
+  metadata.gz: f9546abfd9b420cf80fa128670ba0db60e95bf54ed88466e1309820bb247ced3e7aa552d6afb93db12388a35b3d432d6994dfe2ea9a5f80580c82dce8655ff66
+  data.tar.gz: 7e3b2c573cd03bb284cc5d51a44b0c4aa882f7c069759f63075216759cf5abdab44f80babe5f3dbe81c126a05d9e1449c9e65bab0d34e3a9f184a417e922d326

data/girl.gemspec

@@ -25,8 +25,6 @@ lib/girl/proxy.rb
 lib/girl/proxyd_custom.rb
 lib/girl/proxyd_worker.rb
 lib/girl/proxyd.rb
-lib/girl/udp.rb
-lib/girl/udpd.rb
 lib/girl/version.rb
   ]
 

data/lib/girl/proxy_worker.rb

@@ -121,12 +121,17 @@ module Girl
     end
 
     ##
-    # add paused src
+    # add dst wbuff
     #
-    def add_paused_src( src )
-      return if src.closed? || @paused_srcs.include?( src )
-      @reads.delete( src )
-      @paused_srcs << src
+    def add_dst_wbuff( dst, data )
+      dst_info = @dst_infos[ dst ]
+      dst_info[ :wbuff ] << data
+      add_write( dst )
+
+      if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        puts "p#{ Process.pid } #{ Time.new } pause direct src #{ dst_info[ :domain ] }"
+        add_paused_src( dst_info[ :src ] )
+      end
     end
 
     ##
@@ -138,6 +143,15 @@ module Girl
       @paused_dsts << dst
     end
 
+    ##
+    # add paused src
+    #
+    def add_paused_src( src )
+      return if src.closed? || @paused_srcs.include?( src )
+      @reads.delete( src )
+      @paused_srcs << src
+    end
+
     ##
     # add paused stream
     #
@@ -161,20 +175,20 @@ module Girl
     end
 
     ##
-    # add resume src
+    # add resume dst
     #
-    def add_resume_src( src )
-      return if @resume_srcs.include?( src )
-      @resume_srcs << src
+    def add_resume_dst( dst )
+      return if @resume_dsts.include?( dst )
+      @resume_dsts << dst
       next_tick
     end
 
     ##
-    # add resume dst
+    # add resume src
     #
-    def add_resume_dst( dst )
-      return if @resume_dsts.include?( dst )
-      @resume_dsts << dst
+    def add_resume_src( src )
+      return if @resume_srcs.include?( src )
+      @resume_srcs << src
       next_tick
     end
 
@@ -187,20 +201,6 @@ module Girl
       next_tick
     end
 
-    ##
-    # add dst wbuff
-    #
-    def add_dst_wbuff( dst, data )
-      dst_info = @dst_infos[ dst ]
-      dst_info[ :wbuff ] << data
-      add_write( dst )
-
-      if dst_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-        puts "p#{ Process.pid } #{ Time.new } pause direct src #{ dst_info[ :domain ] }"
-        add_paused_src( dst_info[ :src ] )
-      end
-    end
-
     ##
     # add src rbuff
     #
@@ -241,20 +241,6 @@ module Girl
       end
     end
 
-    ##
-    # add stream wbuff
-    #
-    def add_stream_wbuff( stream, data )
-      stream_info = @stream_infos[ stream ]
-      stream_info[ :wbuff ] << data
-      add_write( stream )
-
-      if stream_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
-        puts "p#{ Process.pid } #{ Time.new } pause tunnel src #{ stream_info[ :domain ] }"
-        add_paused_src( stream_info[ :src ] )
-      end
-    end
-
     ##
     # add src wbuff socks5 conn reply
     #
@@ -270,6 +256,20 @@ module Girl
       add_src_wbuff( src, data )
     end
 
+    ##
+    # add stream wbuff
+    #
+    def add_stream_wbuff( stream, data )
+      stream_info = @stream_infos[ stream ]
+      stream_info[ :wbuff ] << data
+      add_write( stream )
+
+      if stream_info[ :wbuff ].bytesize >= WBUFF_LIMIT then
+        puts "p#{ Process.pid } #{ Time.new } pause tunnel src #{ stream_info[ :domain ] }"
+        add_paused_src( stream_info[ :src ] )
+      end
+    end
+
     ##
     # add write
     #
@@ -280,13 +280,23 @@ module Girl
     end
 
     ##
-    # close sock
+    # close read dst
     #
-    def close_sock( sock )
-      sock.close
-      @reads.delete( sock )
-      @writes.delete( sock )
-      @roles.delete( sock )
+    def close_read_dst( dst )
+      return if dst.closed?
+      # puts "debug1 close read dst"
+      dst.close_read
+      @reads.delete( dst )
+
+      if dst.closed? then
+        # puts "debug1 delete dst info"
+        @roles.delete( dst )
+        dst_info = @dst_infos.delete( dst )
+      else
+        dst_info = @dst_infos[ dst ]
+      end
+
+      dst_info
     end
 
     ##
@@ -309,26 +319,6 @@ module Girl
       src_info
     end
 
-    ##
-    # close read dst
-    #
-    def close_read_dst( dst )
-      return if dst.closed?
-      # puts "debug1 close read dst"
-      dst.close_read
-      @reads.delete( dst )
-
-      if dst.closed? then
-        # puts "debug1 delete dst info"
-        @roles.delete( dst )
-        dst_info = @dst_infos.delete( dst )
-      else
-        dst_info = @dst_infos[ dst ]
-      end
-
-      dst_info
-    end
-
     ##
     # close read stream
     #
@@ -349,6 +339,16 @@ module Girl
       stream_info
     end
 
+    ##
+    # close sock
+    #
+    def close_sock( sock )
+      sock.close
+      @reads.delete( sock )
+      @writes.delete( sock )
+      @roles.delete( sock )
+    end
+
     ##
     # close src
     #
@@ -360,14 +360,14 @@ module Girl
       dst = src_info[ :dst ]
 
       if dst then
-        close_read_dst( dst )
-        set_dst_closing_write( dst )
+        close_sock( dst )
+        @dst_infos.delete( dst )
       else
         stream = src_info[ :stream ]
 
         if stream then
-          close_read_stream( stream )
-          set_stream_closing_write( stream )
+          close_sock( stream )
+          @stream_infos.delete( stream )
         end
       end
     end
@@ -382,26 +382,6 @@ module Girl
       @tun_info[ :srcs ].each{ | _, src | close_src( src ) }
     end
 
-    ##
-    # close write src
-    #
-    def close_write_src( src )
-      return if src.closed?
-      # puts "debug1 close write src"
-      src.close_write
-      @writes.delete( src )
-
-      if src.closed? then
-        # puts "debug1 delete src info"
-        @roles.delete( src )
-        src_info = del_src_info( src )
-      else
-        src_info = @src_infos[ src ]
-      end
-
-      src_info
-    end
-
     ##
     # close write dst
     #
@@ -422,6 +402,26 @@ module Girl
       dst_info
     end
 
+    ##
+    # close write src
+    #
+    def close_write_src( src )
+      return if src.closed?
+      # puts "debug1 close write src"
+      src.close_write
+      @writes.delete( src )
+
+      if src.closed? then
+        # puts "debug1 delete src info"
+        @roles.delete( src )
+        src_info = del_src_info( src )
+      else
+        src_info = @src_infos[ src ]
+      end
+
+      src_info
+    end
+
     ##
     # close write stream
     #
@@ -628,6 +628,7 @@ module Girl
         # connect nonblock 必抛 wait writable
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } dst connect destination #{ domain } #{ src_info[ :destination_port ] } #{ ip_info.ip_address } #{ e.class }, close src"
+        dst.close
         add_closing_src( src )
         return
       end
@@ -659,6 +660,25 @@ module Girl
       end
     end
 
+    ##
+    # new a proxy
+    #
+    def new_a_proxy( proxy_port )
+      proxy = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+
+      if RUBY_PLATFORM.include?( 'linux' ) then
+        proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      end
+
+      proxy.bind( Socket.sockaddr_in( proxy_port, '0.0.0.0' ) )
+      proxy.listen( 127 )
+      puts "p#{ Process.pid } #{ Time.new } proxy listen on #{ proxy_port }"
+      add_read( proxy, :proxy )
+      @proxy_local_address = proxy.local_address
+    end
+
     ##
     # new a stream
     #
@@ -683,6 +703,7 @@ module Girl
       rescue IO::WaitWritable
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } connect tcpd #{ e.class }"
+        stream.close
         return
       end
 
@@ -717,25 +738,6 @@ module Girl
       end
     end
 
-    ##
-    # new a proxy
-    #
-    def new_a_proxy( proxy_port )
-      proxy = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-
-      if RUBY_PLATFORM.include?( 'linux' ) then
-        proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-        proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      end
-
-      proxy.bind( Socket.sockaddr_in( proxy_port, '0.0.0.0' ) )
-      proxy.listen( 127 )
-      puts "p#{ Process.pid } #{ Time.new } proxy listen on #{ proxy_port }"
-      add_read( proxy, :proxy )
-      @proxy_local_address = proxy.local_address
-    end
-
     ##
     # new a tun
     #
@@ -793,7 +795,7 @@ module Girl
     #
     def resolve_domain( src, domain )
       if @remotes.any? { | remote | ( domain.size >= remote.size ) && ( domain[ ( remote.size * -1 )..-1 ] == remote ) } then
-        # puts "debug1 #{ domain } hit remotes"
+        puts "p#{ Process.pid } #{ Time.new } #{ domain } hit remotes"
         set_src_proxy_type_tunnel( src )
         return
       end
@@ -1012,7 +1014,7 @@ module Girl
     #
     def read_tun( tun )
       return if tun.closed?
-      
+
       begin
         data, addrinfo, rflags, *controls = tun.recvmsg_nonblock
       rescue IO::WaitReadable, Errno::EINTR

data/lib/girl/proxyd_worker.rb

@@ -262,8 +262,8 @@ module Girl
       streamd = dst_info[ :streamd ]
 
       if streamd then
-        close_read_streamd( streamd )
-        set_streamd_closing_write( streamd )
+        close_sock( streamd )
+        @streamd_infos.delete( streamd )
       end
     end
 
@@ -328,8 +328,8 @@ module Girl
       dst = streamd_info[ :dst ]
 
       if dst then
-        close_read_dst( dst )
-        set_dst_closing_write( dst )
+        close_sock( dst )
+        del_dst_info( dst )
       end
     end
 
@@ -399,6 +399,7 @@ module Girl
       rescue IO::WaitWritable
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } connect destination #{ domain_port } #{ e.class }"
+        dst.close
         return false
       end
 
@@ -443,7 +444,7 @@ module Girl
         tund_info[ :dsts ].delete( dst_info[ :id ] )
         tund_info[ :dst_ids ].delete( dst_info[ :src_id ] )
       end
-      
+
       dst_info
     end
 

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.99.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.99.0
+  version: 1.0.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-11-21 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email:
@@ -27,8 +27,6 @@ files:
 - lib/girl/proxyd.rb
 - lib/girl/proxyd_custom.rb
 - lib/girl/proxyd_worker.rb
-- lib/girl/udp.rb
-- lib/girl/udpd.rb
 - lib/girl/version.rb
 homepage: https://github.com/takafan/girl
 licenses:

data/lib/girl/udp.rb

@@ -1,326 +0,0 @@
-require 'girl/version'
-require 'socket'
-
-##
-# Girl::Udp - udp透明转发，近端。
-#
-# usage
-# ======
-#
-# Girl::Udpd.new( 3030 ).looping # 远端
-#
-# Girl::Udp.new( 'your.server.ip', 3030, 1313 ).looping # 近端
-#
-# iptables -t nat -A PREROUTING -p udp -d game.server.ip -j REDIRECT --to-ports 1313
-#
-module Girl
-  class Udp
-
-    def initialize( udpd_host, udpd_port = 3030, redir_port = 1313 )
-      @udpd_host = udpd_host
-      @udpd_addr = Socket.sockaddr_in( udpd_port, udpd_host )
-      @mutex = Mutex.new
-      @reads = []
-      @writes = []
-      @roles = {}        # :dotr / :redir / :tun
-      @redir_wbuffs = [] # [ src_addr data ] ...
-      @tuns = {}         # [ orig_src_addr dst_addr ]=> tun
-      @mappings = {}     # src_addr => [ orig_src_addr dst_addr ]
-      @tun_infos = {}    # tun => {}
-                         #   orig_src_addr: sockaddr
-                         #   dst_addr: sockaddr
-                         #   src_addr: sockaddr
-                         #   tund_addr: sockaddr
-                         #   rbuffs: []
-                         #   wbuffs: []
-                         #   last_traff_at: now
-      dotr, dotw = IO.pipe
-      @dotw = dotw
-      add_read( dotr, :dotr )
-      new_a_redir( redir_port )
-    end
-
-    def looping
-      loop_expire
-
-      loop do
-        rs, ws = IO.select( @reads, @writes )
-
-        @mutex.synchronize do
-          rs.each do | sock |
-            case @roles[ sock ]
-            when :dotr then
-              read_dotr( sock )
-            when :redir then
-              read_redir( sock )
-            when :tun then
-              read_tun( sock )
-            end
-          end
-
-          ws.each do | sock |
-            case @roles[ sock ]
-            when :redir then
-              write_redir( sock )
-            when :tun then
-              write_tun( sock )
-            end
-          end
-        end
-      end
-    end
-
-    def quit!
-      exit
-    end
-
-    private
-
-    def loop_expire
-      Thread.new do
-        loop do
-          sleep 30
-
-          @mutex.synchronize do
-            trigger = false
-            now = Time.new
-
-            @tun_infos.each do | tun, tun_info |
-              # net.netfilter.nf_conntrack_udp_timeout_stream
-              if now - tun_info[ :last_traff_at ] > 180 then
-                set_is_closing( tun )
-                trigger = true
-              end
-            end
-
-            next_tick if trigger
-          end
-        end
-      end
-    end
-
-    def new_a_redir( redir_port )
-      redir = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      redir.bind( Socket.sockaddr_in( redir_port, '0.0.0.0' ) )
-      puts "redir bound on #{ redir_port } #{ Time.new }"
-      @redir = redir
-      add_read( redir, :redir )
-    end
-
-    def new_a_tun( orig_src_addr, dst_addr, src_addr )
-      tun = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      tun.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      tun.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
-
-      @tun_infos[ tun ] = {
-        orig_src_addr: orig_src_addr,
-        dst_addr: dst_addr,
-        src_addr: src_addr,
-        tund_addr: nil,
-        rbuffs: [],
-        wbuffs: [],
-        last_traff_at: Time.new,
-        is_closing: false
-      }
-
-      @tuns[ [ orig_src_addr, dst_addr ].join ] = tun
-      add_read( tun, :tun )
-
-      tun
-    end
-
-    def add_redir_wbuff( redir, to_addr, data )
-      @redir_wbuffs << [ to_addr, data ]
-      add_write( redir )
-    end
-
-    def add_tun_wbuff( tun, to_addr, data )
-      tun_info = @tun_infos[ tun ]
-
-      if to_addr then
-        tun_info[ :wbuffs ] << [ to_addr, data ]
-        add_write( tun )
-      else
-        tun_info[ :rbuffs ] << data
-      end
-    end
-
-    def add_read( sock, role )
-      unless @reads.include?( sock ) then
-        @reads << sock
-      end
-
-      @roles[ sock ] = role
-    end
-
-    def add_write( sock )
-      unless @writes.include?( sock ) then
-        @writes << sock
-      end
-    end
-
-    def set_is_closing( tun )
-      if tun && !tun.closed? then
-        # puts "debug1 set tun is closing"
-
-        tun_info = @tun_infos[ tun ]
-        tun_info[ :is_closing ] = true
-
-        @reads.delete( tun )
-        add_write( tun )
-      end
-    end
-
-    def send_data( sock, data, to_addr )
-      begin
-        sock.sendmsg( data, 0, to_addr )
-      rescue IO::WaitWritable, Errno::EINTR
-        return false
-      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
-        if @roles[ sock ] == :tun then
-          puts "#{ Time.new } #{ e.class }, close tun"
-          close_tun( sock )
-          return false
-        end
-      end
-
-      true
-    end
-
-    def close_tun( tun )
-      tun.close
-      @reads.delete( tun )
-      @writes.delete( tun )
-      @roles.delete( tun )
-      tun_info = @tun_infos.delete( tun )
-      @tuns.delete( [ tun_info[ :orig_src_addr ], tun_info[ :dst_addr ] ].join )
-
-      if @mappings.include?( tun_info[ :src_addr ] ) then
-        orig_src_addr, dst_addr, timeout, read_at = @mappings[ tun_info[ :src_addr ] ]
-
-        if orig_src_addr == tun_info[ :orig_src_addr ] && dst_addr == tun_info[ :dst_addr ] then
-          @mappings.delete( tun_info[ :src_addr ] )
-        end
-      end
-    end
-
-    def write_redir( redir )
-      while @redir_wbuffs.any? do
-        to_addr, data = @redir_wbuffs.first
-        return unless send_data( redir, data, to_addr )
-        @redir_wbuffs.shift
-      end
-
-      @writes.delete( redir )
-    end
-
-    def write_tun( tun )
-      tun_info = @tun_infos[ tun ]
-
-      if tun_info[ :is_closing ] then
-        close_tun( tun )
-        return
-      end
-
-      while tun_info[ :wbuffs ].any? do
-        to_addr, data = tun_info[ :wbuffs ].first
-        return unless send_data( tun, data, to_addr )
-        tun_info[ :wbuffs ].shift
-      end
-
-      @writes.delete( tun )
-    end
-
-    def read_dotr( dotr )
-      dotr.read( 1 )
-    end
-
-    def read_redir( redir )
-      data, addrinfo, rflags, *controls = redir.recvmsg
-      src_addr = addrinfo.to_sockaddr
-      is_hit_cache = false
-      now = Time.new
-      # puts "debug redir recv #{ data.inspect } from #{ addrinfo.inspect }"
-
-      if @mappings.include?( src_addr ) then
-        orig_src_addr, dst_addr, timeout, read_at = @mappings[ src_addr ]
-
-        if now - read_at < timeout then
-          # puts "debug hit cache #{ addrinfo.inspect }"
-          is_hit_cache = true
-        else
-          # puts "debug cache timeout #{ addrinfo.inspect }"
-          @mappings.delete( src_addr )
-        end
-      end
-
-      unless is_hit_cache then
-        # 2 udp 4 timeout 5 src 7 sport 9 [UNREPLIED] 11 dst 13 dport
-        # 2 udp 4 timeout 5 src 7 sport 10 dst 12 dport
-        bin = IO.binread( '/proc/net/nf_conntrack' )
-        rows = bin.split( "\n" ).map { | line | line.split( ' ' ) }
-        row = rows.find { | _row | _row[ 2 ] == 'udp' && ( ( _row[ 10 ].split( '=' )[ 1 ] == addrinfo.ip_address && _row[ 12 ].split( '=' )[ 1 ].to_i == addrinfo.ip_port ) || ( _row[ 9 ] == '[UNREPLIED]' && _row[ 11 ].split( '=' )[ 1 ] == addrinfo.ip_address && _row[ 13 ].split( '=' )[ 1 ].to_i == addrinfo.ip_port ) ) }
-
-        unless row then
-          puts "miss conntrack #{ addrinfo.inspect } #{ Time.new }"
-          IO.binwrite( '/tmp/nf_conntrack', bin )
-          return
-        end
-
-        timeout = row[ 4 ].to_i
-        orig_src_ip = row[ 5 ].split( '=' )[ 1 ]
-        orig_src_port = row[ 7 ].split( '=' )[ 1 ].to_i
-        dst_ip = row[ 6 ].split( '=' )[ 1 ]
-        dst_port = row[ 8 ].split( '=' )[ 1 ].to_i
-        orig_src_addr = Socket.sockaddr_in( orig_src_port, orig_src_ip )
-        dst_addr = Socket.sockaddr_in( dst_port, dst_ip )
-
-        if Addrinfo.new( dst_addr ).ipv4_private? then
-          puts "dst is private? #{ Addrinfo.new( dst_addr ).inspect } #{ Addrinfo.new( src_addr ).inspect } #{ Addrinfo.new( orig_src_addr ).inspect } #{ Time.new }"
-          add_redir_wbuff( redir, dst_addr, data )
-          return
-        end
-
-        # puts "debug save cache #{ addrinfo.inspect } #{ Addrinfo.new( orig_src_addr ).inspect } #{ Addrinfo.new( dst_addr ).inspect } #{ timeout } #{ now }"
-        @mappings[ src_addr ] = [ orig_src_addr, dst_addr, timeout, now ]
-      end
-
-      tun = @tuns[ [ orig_src_addr, dst_addr ].join ]
-
-      unless tun then
-        tun = new_a_tun( orig_src_addr, dst_addr, src_addr )
-
-        # puts "debug tun send to udpd #{ Addrinfo.new( orig_src_addr ).inspect } #{ Addrinfo.new( dst_addr ).inspect }"
-        ctlmsg = [ orig_src_addr, dst_addr ].join
-        add_tun_wbuff( tun, @udpd_addr, ctlmsg )
-      end
-
-      tun_info = @tun_infos[ tun ]
-      add_tun_wbuff( tun, tun_info[ :tund_addr ], data )
-    end
-
-    def read_tun( tun )
-      data, addrinfo, rflags, *controls = tun.recvmsg
-      from_addr = addrinfo.to_sockaddr
-      tun_info = @tun_infos[ tun ]
-      tun_info[ :last_traff_at ] = Time.new
-
-      if from_addr == @udpd_addr then
-        tund_port = data[ 0, 2 ].unpack( 'n' ).first
-        tund_addr = Socket.sockaddr_in( tund_port, @udpd_host )
-        tun_info[ :tund_addr ] = tund_addr
-
-        if tun_info[ :rbuffs ].any? then
-          tun_info[ :wbuffs ] += tun_info[ :rbuffs ].map{ | rbuff | [ tund_addr, rbuff ] }
-          tun_info[ :rbuffs ].clear
-          add_write( tun )
-        end
-
-      elsif from_addr == tun_info[ :tund_addr ] then
-        add_redir_wbuff( @redir, tun_info[ :src_addr ], data )
-      end
-    end
-
-  end
-end

data/lib/girl/udpd.rb

@@ -1,316 +0,0 @@
-require 'girl/version'
-require 'socket'
-
-##
-# Girl::Udpd - udp透明转发，远端。
-#
-module Girl
-  class Udpd
-
-    def initialize( port = 3030 )
-      @mutex = Mutex.new
-      @reads = []
-      @writes = []
-      @roles = {}       # :dotr / :udpd / :tund
-      @udpd_wbuffs = [] # [ tun_addr ctlmsg ] ...
-      @tunds = {}       # [ tun_ip_addr orig_src_addr ] => tund
-      @tund_infos = {}  # tund => {}
-                        #   port: port
-                        #   tun_ip_addr: sockaddr
-                        #   orig_src_addr: sockaddr
-                        #   wbuffs: [] # [ to_addr, data ] ...
-                        #   dst_addrs: { tun_addr => dst_addr }
-                        #   tun_addrs: { dst_addr => tun_addr }
-                        #   is_tunneleds: { [ tun_addr dst_addr ] => false }
-                        #   unpaired_dst_rbuffs: { dst_addr => [] }
-                        #   last_traff_at: now
-      dotr, dotw = IO.pipe
-      @dotw = dotw
-      add_read( dotr, :dotr )
-      new_a_udpd( port )
-    end
-
-    def looping
-      loop_expire
-
-      loop do
-        rs, ws = IO.select( @reads, @writes )
-
-        @mutex.synchronize do
-          ws.each do | sock |
-            case @roles[ sock ]
-            when :udpd then
-              write_udpd( sock )
-            when :tund then
-              write_tund( sock )
-            end
-          end
-
-          rs.each do | sock |
-            case @roles[ sock ]
-            when :dotr then
-              read_dotr( sock )
-            when :udpd then
-              read_udpd( sock )
-            when :tund then
-              read_tund( sock )
-            end
-          end
-        end
-      end
-    end
-
-    def quit!
-      exit
-    end
-
-    private
-
-    def loop_expire
-      Thread.new do
-        loop do
-          sleep 30
-
-          @mutex.synchronize do
-            trigger = false
-            now = Time.new
-
-            @tund_infos.each do | tund, tund_info |
-              # net.netfilter.nf_conntrack_udp_timeout_stream
-              if now - tund_info[ :last_traff_at ] > 180 then
-                set_is_closing( tund )
-                trigger = true
-              end
-            end
-
-            next_tick if trigger
-          end
-        end
-      end
-    end
-
-    def new_a_udpd( port )
-      udpd = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      udpd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      udpd.bind( Socket.sockaddr_in( port, '0.0.0.0' ) )
-      puts "udpd bound on #{ port } #{ Time.new }"
-      @udpd = udpd
-      add_read( udpd, :udpd )
-    end
-
-    def pair_tund( tun_addr, tun_ip_addr, orig_src_addr, dst_addr )
-      from_addr = [ tun_ip_addr, orig_src_addr ].join
-      td_addr = [ tun_addr, dst_addr ].join
-      tund = @tunds[ from_addr ]
-
-      if tund then
-        tund_info = @tund_infos[ tund ]
-        tund_info[ :dst_addrs ][ tun_addr ] = dst_addr
-        tund_info[ :tun_addrs ][ dst_addr ] = tun_addr
-        tund_info[ :is_tunneleds ][ td_addr ] = false
-      else
-        tund = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-        tund.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-        tund.setsockopt( Socket::SOL_SOCKET, Socket::SO_BROADCAST, 1 )
-        tund.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
-        tund_port = tund.local_address.ip_unpack.last
-
-        @tund_infos[ tund ] = {
-          port: tund_port,
-          tun_ip_addr: tun_ip_addr,
-          orig_src_addr: orig_src_addr,
-          wbuffs: [],
-          dst_addrs: { tun_addr => dst_addr },
-          tun_addrs: { dst_addr => tun_addr },
-          is_tunneleds: { td_addr => false },
-          unpaired_dst_rbuffs: {},
-          last_traff_at: Time.new,
-          is_closing: false
-        }
-
-        @tunds[ from_addr ] = tund
-        add_read( tund, :tund )
-      end
-
-      tund
-    end
-
-    def add_tund_wbuff( tund, to_addr, data )
-      tund_info = @tund_infos[ tund ]
-      tund_info[ :wbuffs ] << [ to_addr, data ]
-
-      add_write( tund )
-    end
-
-    def add_read( sock, role )
-      unless @reads.include?( sock ) then
-        @reads << sock
-      end
-
-      @roles[ sock ] = role
-    end
-
-    def add_write( sock )
-      unless @writes.include?( sock ) then
-        @writes << sock
-      end
-    end
-
-    def set_is_closing( tund )
-      if tund && !tund.closed? then
-        # puts "debug1 set tund is closing"
-
-        tund_info = @tund_infos[ tund ]
-        tund_info[ :is_closing ] = true
-
-        @reads.delete( tund )
-        add_write( tund )
-      end
-    end
-
-    def send_data( sock, data, to_addr )
-      begin
-        sock.sendmsg( data, 0, to_addr )
-      rescue IO::WaitWritable, Errno::EINTR
-        return false
-      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
-        if @roles[ sock ] == :tund then
-          puts "#{ Time.new } #{ e.class }, close tund"
-          close_tund( sock )
-          return false
-        end
-      end
-
-      true
-    end
-
-    def close_tund( tund )
-      tund.close
-      @reads.delete( tund )
-      @writes.delete( tund )
-      @roles.delete( tund )
-      tund_info = @tund_infos.delete( tund )
-      @tunds.delete( [ tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ] ].join )
-    end
-
-    def next_tick
-      @dotw.write( '.' )
-    end
-
-    def write_udpd( udpd )
-      while @udpd_wbuffs.any? do
-        to_addr, data = @udpd_wbuffs.first
-        return unless send_data( udpd, data, to_addr )
-        @udpd_wbuffs.shift
-      end
-
-      @writes.delete( udpd )
-    end
-
-    def write_tund( tund )
-      tund_info = @tund_infos[ tund ]
-
-      if tund_info[ :is_closing ] then
-        close_tund( tund )
-        return
-      end
-
-      while tund_info[ :wbuffs ].any? do
-        to_addr, data = tund_info[ :wbuffs ].first
-        return unless send_data( tund, data, to_addr )
-        tund_info[ :wbuffs ].shift
-      end
-
-      @writes.delete( tund )
-    end
-
-    def read_dotr( dotr )
-      dotr.read( 1 )
-    end
-
-    def read_udpd( udpd )
-      data, addrinfo, rflags, *controls = udpd.recvmsg
-      # puts "debug udpd recv #{ data.inspect } from #{ addrinfo.inspect }"
-      orig_src_addr = data[ 0, 16 ]
-      dst_addr = data[ 16, 16 ]
-      tun_addr = addrinfo.to_sockaddr
-      tun_ip_addr = Addrinfo.ip( addrinfo.ip_address ).to_sockaddr
-
-      return unless Addrinfo.new( orig_src_addr ).ipv4?
-
-      dst_addrinfo = Addrinfo.new( dst_addr )
-      return unless dst_addrinfo.ipv4?
-      return if dst_addrinfo.ipv4_private?
-
-      tund = pair_tund( tun_addr, tun_ip_addr, orig_src_addr, dst_addr )
-      tund_info = @tund_infos[ tund ]
-      tund_port = tund_info[ :port ]
-
-      # puts "debug udpd send to tun #{ tund_port } #{ addrinfo.inspect }"
-      ctlmsg = [ tund_port ].pack( 'n' )
-      @udpd_wbuffs << [ tun_addr, ctlmsg ]
-      add_write( udpd )
-    end
-
-    def read_tund( tund )
-      data, addrinfo, rflags, *controls = tund.recvmsg
-      from_addr = addrinfo.to_sockaddr
-      tund_info = @tund_infos[ tund ]
-      tund_info[ :last_traff_at ] = Time.new
-      to_addr = tund_info[ :dst_addrs ][ from_addr ]
-
-      if to_addr then
-        # 来自tun，发给dst。
-        td_addr = [ from_addr, to_addr ].join
-        is_tunneled = tund_info[ :is_tunneleds ][ td_addr ]
-
-        unless is_tunneled then
-          # puts "debug first traffic from tun #{ addrinfo.inspect } to #{ Addrinfo.new( to_addr ).inspect }"
-          # 发暂存
-          if tund_info[ :unpaired_dst_rbuffs ].include?( to_addr ) then
-            rbuffs = tund_info[ :unpaired_dst_rbuffs ].delete( to_addr )
-            # puts "debug move tund.dst.rbuffs to tund.wbuffs #{ rbuffs.inspect }"
-            tund_info[ :wbuffs ] += rbuffs.map{ | rbuff | [ from_addr, rbuff ] }
-          end
-
-          tund_info[ :is_tunneleds ][ td_addr ] = true
-        end
-
-        # 如果对面没来过流量，且在nat里，nat规则是只对去过的目的地做接收，那么，先过去的流量会撞死。
-        # 没关系，撞死的流量通常是打洞数据，在应用计算之内，打洞数据通常是连发的。
-        # puts "debug #{ data.inspect } from #{ addrinfo.inspect } to #{ Addrinfo.new( to_addr ).inspect }"
-        add_tund_wbuff( tund, to_addr, data )
-        return
-      end
-
-      to_addr = tund_info[ :tun_addrs ][ from_addr ]
-
-      if to_addr then
-        # 来自dst，发给tun。
-        # puts "debug #{ data.inspect } from #{ addrinfo.inspect } to #{ Addrinfo.new( to_addr ).inspect }"
-
-        td_addr = [ to_addr, from_addr ].join
-        is_tunneled = tund_info[ :is_tunneleds ][ td_addr ]
-
-        if is_tunneled then
-          add_tund_wbuff( tund, to_addr, data )
-          return
-        end
-
-        # puts "debug #{ Addrinfo.new( to_addr ).inspect } #{ addrinfo.inspect } not tunneled"
-      end
-
-      # 来自未知的地方，或者对应的tun还没来流量，记暂存
-      unless tund_info[ :unpaired_dst_rbuffs ][ from_addr ] then
-        tund_info[ :unpaired_dst_rbuffs ][ from_addr ] = []
-      end
-
-      # 暂存5条（连发打洞数据，不需要存多）。
-      if tund_info[ :unpaired_dst_rbuffs ][ from_addr ].size < 5 then
-        # puts "debug save other dst rbuff #{ addrinfo.inspect } #{ data.inspect }"
-        tund_info[ :unpaired_dst_rbuffs ][ from_addr ] << data
-      end
-    end
-
-  end
-end