girl 0.78.0 → 0.83.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6d635f9fb525291d4b0c32b749245255a52234ff9b850add473b430aa5e732
-  data.tar.gz: c336934bd1fd8825f72e65fdcc9dd708788f53bec7a175a37228ec724b970869
+  metadata.gz: 28c02739bfb0608617fa46ef36d80d7ba9c84753eb3c34410eb98f05cab430f1
+  data.tar.gz: 94a70957768e52b1e40782c0df53451e1caebcac096829648009c6977219dd8b
 SHA512:
-  metadata.gz: 81f96a6e78ddf2cf00ff331002b145871eca5b72653bf822d42943858f887be4e996fa47a98e18313800d2a461899280fa6db6eff3781daa3d714b5e54a489dd
-  data.tar.gz: 29aaac2d5eae5d9889dcc033048929ff8fffac95c422b5322467ba8859df664097a600e14e9c26ac30e2babadc79463b05d32969565b176f990a52c708dbda80
+  metadata.gz: d0e12984275ddf891c11b75ce86d13830798d2538b9b4b15962720ac268f61dc721d1fd355f99282f6274217879e1053d698dbcdaf59de30533fe59c53596173
+  data.tar.gz: dc98d8959fd53fc51f8e0e2851ce46afe78a7ddedf293a595148b885a8ed2055a7e1fa92e88b22826528e0a6399ff5c16700c689bf4a766a6d7ca809567e0a1d

data/lib/girl/head.rb

@@ -25,6 +25,7 @@ module Girl
   GOT_FIN2              = 11
   TUND_FIN              = 12
   TUN_FIN               = 13
+  IP_CHANGED            = 14
   HTTP_OK               = "HTTP/1.1 200 OK\r\n\r\n"
   # https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
   RESERVED_ROUTE = <<EOF

data/lib/girl/proxy.rb

@@ -35,6 +35,7 @@ require 'socket'
 #                   11 not use
 #                   12 tund fin
 #                   13 tun fin
+#                   14 tun ip changed
 #
 # Q>: 1+ pack_id -> Q>/n: src id / dst port -> traffic
 #
@@ -107,7 +108,7 @@ module Girl
           raise "not found direct file #{ direct_path }"
         end
 
-        directs = ( [ Addrinfo.ip( proxyd_host ).ip_address ] + RESERVED_ROUTE.split( "\n" ) + IO.binread( direct_path ).split( "\n" ) ).map { | line | IPAddr.new( line.strip ) }
+        directs = ( RESERVED_ROUTE.split( "\n" ) + IO.binread( direct_path ).split( "\n" ) ).map { | line | IPAddr.new( line.strip ) }
       end
 
       remotes = []

data/lib/girl/proxy_worker.rb

@@ -264,8 +264,10 @@ module Girl
     # deal with destination ip
     #
     def deal_with_destination_ip( src, ip_info )
-      if @directs.any? { | direct | direct.include?( ip_info.ip_address ) }
-        # ip命中直连列表，直连
+      src_info = @src_infos[ src ]
+
+      if ( @directs.any? { | direct | direct.include?( ip_info.ip_address ) } ) || ( ( src_info[ :destination_domain ] == @proxyd_host ) && ![ 80, 443 ].include?( src_info[ :destination_port ] ) )
+        # ip命中直连列表，或者访问远端非80/443端口，直连
         # puts "debug1 #{ ip_info.inspect } hit directs"
         new_a_dst( src, ip_info )
       else
@@ -741,15 +743,14 @@ module Girl
     #
     def write_src( src )
       src_info = @src_infos[ src ]
-      data = src_info[ :cache ]
-      from = :cache
+      from, data = :cache, src_info[ :cache ]
 
       if data.empty?
         if src_info[ :chunks ].any?
           path = File.join( @src_chunk_dir, src_info[ :chunks ].shift )
 
           begin
-            src_info[ :cache ] = data = IO.binread( path )
+            data = src_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -757,8 +758,7 @@ module Girl
             return
           end
         else
-          data = src_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, src_info[ :wbuff ]
         end
       end
 
@@ -792,15 +792,14 @@ module Girl
     #
     def write_dst( dst )
       dst_info = @dst_infos[ dst ]
-      data = dst_info[ :cache ]
-      from = :cache
+      from, data = :cache, dst_info[ :cache ]
 
       if data.empty?
         if dst_info[ :chunks ].any?
           path = File.join( @dst_chunk_dir, dst_info[ :chunks ].shift )
 
           begin
-            dst_info[ :cache ] = data = IO.binread( path )
+            data = dst_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -808,8 +807,7 @@ module Girl
             return
           end
         else
-          data = dst_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, dst_info[ :wbuff ]
         end
       end
 
@@ -879,7 +877,6 @@ module Girl
         end
 
         @tun_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -895,8 +892,7 @@ module Girl
 
       # 取写前
       if @tun_info[ :caches ].any?
-        src_id, pack_id, data = @tun_info[ :caches ].first
-        from = :caches
+        datas = @tun_info[ :caches ]
       elsif @tun_info[ :chunks ].any?
         path = File.join( @tun_chunk_dir, @tun_info[ :chunks ].shift )
 
@@ -917,39 +913,39 @@ module Girl
           data = data[ ( 18 + pack_size )..-1 ]
         end
 
-        @tun_info[ :caches ] = caches
-        src_id, pack_id, data = caches.first
-        from = :caches
+        datas = @tun_info[ :caches ] = caches
       elsif @tun_info[ :wbuffs ].any?
-        src_id, pack_id, data = @tun_info[ :wbuffs ].first
-        from = :wbuffs
+        datas = @tun_info[ :wbuffs ]
       else
         @writes.delete( tun )
         return
       end
 
-      src_ext = @tun_info[ :src_exts ][ src_id ]
+      while datas.any?
+        src_id, pack_id, data = datas.first
+        src_ext = @tun_info[ :src_exts ][ src_id ]
 
-      if src_ext
-        if pack_id <= CONFUSE_UNTIL
-          data = @custom.encode( data )
-          # puts "debug1 encoded pack #{ pack_id }"
-        end
+        if src_ext
+          if pack_id <= CONFUSE_UNTIL
+            data = @custom.encode( data )
+            # puts "debug1 encoded pack #{ pack_id }"
+          end
 
-        data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
+          data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
 
-        unless send_data( tun, data, @tun_info[ :tund_addr ] )
-          return
+          unless send_data( tun, data, @tun_info[ :tund_addr ] )
+            return
+          end
+
+          # puts "debug2 written pack #{ pack_id }"
+          src_ext[ :relay_pack_id ] = pack_id
+          src_ext[ :wmems ][ pack_id ] = data
+          src_ext[ :send_ats ][ pack_id ] = now
+          src_ext[ :last_continue_at ] = now
         end
 
-        # puts "debug2 written pack #{ pack_id }"
-        src_ext[ :relay_pack_id ] = pack_id
-        src_ext[ :wmems ][ pack_id ] = data
-        src_ext[ :send_ats ][ pack_id ] = now
-        src_ext[ :last_continue_at ] = now
+        datas.shift
       end
-
-      @tun_info[ from ].shift
     end
 
     ##
@@ -1376,6 +1372,11 @@ module Girl
 
           puts "p#{ Process.pid } #{ Time.new } recv tund fin"
           set_is_closing( tun )
+        when IP_CHANGED
+          return if from_addr != @tun_info[ :tund_addr ]
+
+          puts "p#{ Process.pid } #{ Time.new } recv ip changed"
+          set_is_closing( tun )
         end
 
         return

data/lib/girl/proxyd_worker.rb

@@ -418,15 +418,17 @@ module Girl
     ##
     # send data
     #
-    def send_data( tund, data, to_addr )
+    def send_data( sock, data, to_addr )
       begin
-        tund.sendmsg( data, 0, to_addr )
+        sock.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
+        if @roles[ sock ] == :tund
+          puts "#{ Time.new } #{ e.class }, close tund"
+          close_tund( sock )
+          return false
+        end
       end
 
       true
@@ -541,9 +543,7 @@ module Girl
       while @proxyd_ctlmsgs.any?
         to_addr, data = @proxyd_ctlmsgs.first
 
-        begin
-          proxyd.sendmsg( data, 0, to_addr )
-        rescue IO::WaitWritable, Errno::EINTR
+        unless send_data( proxyd, data, to_addr )
           return
         end
 
@@ -558,15 +558,14 @@ module Girl
     #
     def write_dst( dst )
       dst_info = @dst_infos[ dst ]
-      data = dst_info[ :cache ]
-      from = :cache
+      from, data = :cache, dst_info[ :cache ]
 
       if data.empty?
         if dst_info[ :chunks ].any?
           path = File.join( @dst_chunk_dir, dst_info[ :chunks ].shift )
 
           begin
-            dst_info[ :cache ] = data = IO.binread( path )
+            data = dst_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -574,8 +573,7 @@ module Girl
             return
           end
         else
-          data = dst_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, dst_info[ :wbuff ]
         end
       end
 
@@ -613,6 +611,11 @@ module Girl
       tund_info = @tund_infos[ tund ]
 
       if tund_info[ :is_closing ]
+        if tund_info[ :changed_tun_addr ]
+          data = [ 0, IP_CHANGED ].pack( 'Q>C' )
+          send_data( tund, data, tund_info[ :changed_tun_addr ] )
+        end
+
         close_tund( tund )
         return
       end
@@ -646,7 +649,6 @@ module Girl
         end
 
         tund_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -662,8 +664,7 @@ module Girl
 
       # 取写前
       if tund_info[ :caches ].any?
-        dst_local_port, pack_id, data = tund_info[ :caches ].first
-        from = :caches
+        datas = tund_info[ :caches ]
       elsif tund_info[ :chunks ].any?
         path = File.join( @tund_chunk_dir, tund_info[ :chunks ].shift )
 
@@ -684,39 +685,39 @@ module Girl
           data = data[ ( 12 + pack_size )..-1 ]
         end
 
-        tund_info[ :caches ] = caches
-        dst_local_port, pack_id, data = caches.first
-        from = :caches
+        datas = tund_info[ :caches ] = caches
       elsif tund_info[ :wbuffs ].any?
-        dst_local_port, pack_id, data = tund_info[ :wbuffs ].first
-        from = :wbuffs
+        datas = tund_info[ :wbuffs ]
       else
         @writes.delete( tund )
         return
       end
 
-      dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
+      while datas.any?
+        dst_local_port, pack_id, data = datas.first
+        dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
 
-      if dst_ext
-        if pack_id <= CONFUSE_UNTIL
-          data = @custom.encode( data )
-          # puts "debug1 encoded pack #{ pack_id }"
-        end
+        if dst_ext
+          if pack_id <= CONFUSE_UNTIL
+            data = @custom.encode( data )
+            # puts "debug1 encoded pack #{ pack_id }"
+          end
 
-        data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
+          data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
 
-        unless send_data( tund, data, tund_info[ :tun_addr ] )
-          return
+          unless send_data( tund, data, tund_info[ :tun_addr ] )
+            return
+          end
+
+          # puts "debug2 written pack #{ pack_id }"
+          dst_ext[ :relay_pack_id ] = pack_id
+          dst_ext[ :wmems ][ pack_id ] = data
+          dst_ext[ :send_ats ][ pack_id ] = now
+          dst_ext[ :last_continue_at ] = now
         end
 
-        # puts "debug2 written pack #{ pack_id }"
-        dst_ext[ :relay_pack_id ] = pack_id
-        dst_ext[ :wmems ][ pack_id ] = data
-        dst_ext[ :send_ats ][ pack_id ] = now
-        dst_ext[ :last_continue_at ] = now
+        datas.shift
       end
-
-      tund_info[ from ].shift
     end
 
     ##
@@ -762,7 +763,8 @@ module Girl
         resendings: [],       # 重传队列 [ dst_local_port, pack_id ]
         created_at: Time.new, # 创建时间
         last_recv_at: nil,    # 上一次收到流量的时间，过期关闭
-        is_closing: false     # 是否准备关闭
+        is_closing: false,    # 是否准备关闭
+        changed_tun_addr: nil # 记录到和tun addr不符的来源地址
       }
 
       add_read( tund, :tund )
@@ -812,13 +814,11 @@ module Girl
       tund_info = @tund_infos[ tund ]
 
       if from_addr != tund_info[ :tun_addr ]
-        if addrinfo.ip_port == Addrinfo.new( tund_info[ :tun_addr ] ).ip_port
-          puts "p#{ Process.pid } #{ Time.new } tun ip changed #{ addrinfo.inspect }"
-          tund_info[ :tun_addr ] = from_addr
-        else
-          puts "p#{ Process.pid } #{ Time.new } #{ addrinfo.inspect } not match #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
-          return
-        end
+        # 通常是光猫刷新ip（端口也会变），但万一不是，为了避免脏数据注入，关闭tund
+        puts "p#{ Process.pid } #{ Time.new } from #{ addrinfo.inspect } not match tun addr #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
+        tund_info[ :changed_tun_addr ] = from_addr
+        set_is_closing( tund )
+        return
       end
 
       tund_info[ :last_recv_at ] = now

data/lib/girl/udp.rb

@@ -17,25 +17,12 @@ module Girl
   class Udp
 
     def initialize( udpd_host, udpd_port = 3030, redir_port = 1313 )
-      ctlr, ctlw = IO.pipe
-
-      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 }"
-
-      @mutex = Mutex.new
       @udpd_host = udpd_host
       @udpd_addr = Socket.sockaddr_in( udpd_port, udpd_host )
-      @ctlw = ctlw
-      @redir = redir
-      @reads = [ ctlr, redir ]
+      @mutex = Mutex.new
+      @reads = []
       @writes = []
-      @closings = []
-      @roles = {
-        ctlr => :ctlr,   # :ctlr / :redir / :tun
-        redir => :redir
-      }
+      @roles = {}        # :dotr / :redir / :tun
       @redir_wbuffs = [] # [ src_addr data ] ...
       @tuns = {}         # [ orig_src_addr dst_addr ]=> tun
       @mappings = {}     # src_addr => [ orig_src_addr dst_addr ]
@@ -47,6 +34,10 @@ module Girl
                          #   rbuffs: []
                          #   wbuffs: []
                          #   last_traff_at: now
+      dotr, dotw = IO.pipe
+      @dotw = dotw
+      add_read( dotr, :dotr )
+      new_a_redir( redir_port )
     end
 
     def looping
@@ -56,23 +47,23 @@ module Girl
         rs, ws = IO.select( @reads, @writes )
 
         @mutex.synchronize do
-          rs.each do | sock |
+          ws.each do | sock |
             case @roles[ sock ]
-            when :ctlr
-              read_ctlr( sock )
             when :redir
-              read_redir( sock )
+              write_redir( sock )
             when :tun
-              read_tun( sock )
+              write_tun( sock )
             end
           end
 
-          ws.each do | sock |
+          rs.each do | sock |
             case @roles[ sock ]
+            when :dotr
+              read_dotr( sock )
             when :redir
-              write_redir( sock )
+              read_redir( sock )
             when :tun
-              write_tun( sock )
+              read_tun( sock )
             end
           end
         end
@@ -85,15 +76,176 @@ module Girl
 
     private
 
-    def read_ctlr( ctlr )
-      od_addr = ctlr.read( 32 )
-      tun = @tuns[ od_addr ]
+    def loop_expire
+      Thread.new do
+        loop do
+          sleep 30
 
-      if tun
-        add_closing( tun )
+          @mutex.synchronize do
+            need_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
+                set_is_closing( tun )
+                need_trigger = true
+              end
+            end
+
+            if need_trigger
+              next_tick
+            end
+          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
+        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 )
+        @reads << sock
+      end
+
+      @roles[ sock ] = role
+    end
+
+    def add_write( sock )
+      unless @writes.include?( sock )
+        @writes << sock
+      end
+    end
+
+    def set_is_closing( tun )
+      if tun && !tun.closed?
+        # 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
+          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 ] )
+        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 ]
+          @mappings.delete( tun_info[ :src_addr ] )
+        end
+      end
+    end
+
+    def write_redir( redir )
+      while @redir_wbuffs.any?
+        to_addr, data = @redir_wbuffs.first
+
+        unless send_data( redir, data, to_addr )
+          return
+        end
+
+        @redir_wbuffs.shift
+      end
+
+      @writes.delete( redir )
+    end
+
+    def write_tun( tun )
+      tun_info = @tun_infos[ tun ]
+
+      if tun_info[ :is_closing ]
+        close_tun( tun )
+        return
+      end
+
+      while tun_info[ :wbuffs ].any?
+        to_addr, data = tun_info[ :wbuffs ].first
+
+        unless send_data( tun, data, to_addr )
+          return
+        end
+
+        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
@@ -180,121 +332,5 @@ module Girl
       end
     end
 
-    def write_redir( redir )
-      if @redir_wbuffs.empty?
-        @writes.delete( redir )
-        return
-      end
-
-      src_addr, data = @redir_wbuffs.shift
-      redir.sendmsg( data, 0, src_addr )
-    end
-
-    def write_tun( tun )
-      if @closings.include?( tun )
-        close_tun( tun )
-        return
-      end
-
-      tun_info = @tun_infos[ tun ]
-
-      if tun_info[ :wbuffs ].empty?
-        @writes.delete( tun )
-        return
-      end
-
-      to_addr, data = tun_info[ :wbuffs ].shift
-      tun.sendmsg( data, 0, to_addr )
-    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
-        tun_info[ :wbuffs ] << [ to_addr, data ]
-        add_write( tun )
-      else
-        tun_info[ :rbuffs ] << data
-      end
-    end
-
-    def add_write( sock )
-      unless @writes.include?( sock )
-        @writes << sock
-      end
-    end
-
-    def add_closing( tun )
-      unless @closings.include?( tun )
-        @closings << tun
-      end
-
-      add_write( tun )
-    end
-
-    def close_tun( tun )
-      tun.close
-      @reads.delete( tun )
-      @writes.delete( tun )
-      @closings.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 ] )
-        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 ]
-          @mappings.delete( tun_info[ :src_addr ] )
-        end
-      end
-    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
-      }
-
-      @tuns[ [ orig_src_addr, dst_addr ].join ] = tun
-      @roles[ tun ] = :tun
-      @reads << tun
-
-      tun
-    end
-
-    def loop_expire
-      Thread.new do
-        loop do
-          sleep 30
-
-          @mutex.synchronize do
-            now = Time.new
-
-            @tun_infos.values.each do | tun_info |
-              # net.netfilter.nf_conntrack_udp_timeout_stream
-              if now - tun_info[ :last_traff_at ] > 180
-                @ctlw.write( [ tun_info[ :orig_src_addr ], tun_info[ :dst_addr ] ].join )
-              end
-            end
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/girl/udpd.rb

@@ -8,23 +8,10 @@ module Girl
   class Udpd
 
     def initialize( port = 3030 )
-      ctlr, ctlw = IO.pipe
-
-      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 }"
-
       @mutex = Mutex.new
-      @ctlw = ctlw
-      @udpd = udpd
-      @reads = [ ctlr, udpd ]
+      @reads = []
       @writes = []
-      @closings = []
-      @roles = {
-        ctlr => :ctlr,  # :ctlr / :udpd / :tund
-        udpd => :udpd
-      }
+      @roles = {}       # :dotr / :udpd / :tund
       @udpd_wbuffs = [] # [ tun_addr ctlmsg ] ...
       @tunds = {}       # [ tun_ip_addr orig_src_addr ] => tund
       @tund_infos = {}  # tund => {}
@@ -37,6 +24,10 @@ module Girl
                         #   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
@@ -46,23 +37,23 @@ module Girl
         rs, ws = IO.select( @reads, @writes )
 
         @mutex.synchronize do
-          rs.each do | sock |
+          ws.each do | sock |
             case @roles[ sock ]
-            when :ctlr
-              read_ctlr( sock )
             when :udpd
-              read_udpd( sock )
+              write_udpd( sock )
             when :tund
-              read_tund( sock )
+              write_tund( sock )
             end
           end
 
-          ws.each do | sock |
+          rs.each do | sock |
             case @roles[ sock ]
+            when :dotr
+              read_dotr( sock )
             when :udpd
-              write_udpd( sock )
+              read_udpd( sock )
             when :tund
-              write_tund( sock )
+              read_tund( sock )
             end
           end
         end
@@ -75,13 +66,176 @@ module Girl
 
     private
 
-    def read_ctlr( ctlr )
-      to_addr = ctlr.read( 32 )
-      tund = @tunds[ to_addr ]
+    def loop_expire
+      Thread.new do
+        loop do
+          sleep 30
+
+          @mutex.synchronize do
+            need_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
+                set_is_closing( tund )
+                need_trigger = true
+              end
+            end
+
+            if need_trigger
+              next_tick
+            end
+          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
-        add_closing( tund )
+        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 )
+        @reads << sock
+      end
+
+      @roles[ sock ] = role
+    end
+
+    def add_write( sock )
+      unless @writes.include?( sock )
+        @writes << sock
+      end
+    end
+
+    def set_is_closing( tund )
+      if tund && !tund.closed?
+        # 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
+          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?
+        to_addr, data = @udpd_wbuffs.first
+
+        unless send_data( udpd, data, to_addr )
+          return
+        end
+
+        @udpd_wbuffs.shift
+      end
+
+      @writes.delete( udpd )
+    end
+
+    def write_tund( tund )
+      tund_info = @tund_infos[ tund ]
+
+      if tund_info[ :is_closing ]
+        close_tund( tund )
+        return
+      end
+
+      while tund_info[ :wbuffs ].any?
+        to_addr, data = tund_info[ :wbuffs ].first
+
+        unless send_data( tund, data, to_addr )
+          return
+        end
+
+        tund_info[ :wbuffs ].shift
       end
+
+      @writes.delete( tund )
+    end
+
+    def read_dotr( dotr )
+      dotr.read( 1 )
     end
 
     def read_udpd( udpd )
@@ -168,119 +322,5 @@ module Girl
       end
     end
 
-    def write_udpd( udpd )
-      if @udpd_wbuffs.empty?
-        @writes.delete( udpd )
-        return
-      end
-
-      tun_addr, ctlmsg = @udpd_wbuffs.shift
-      udpd.sendmsg( ctlmsg, 0, tun_addr )
-    end
-
-    def write_tund( tund )
-      if @closings.include?( tund )
-        close_tund( tund )
-        return
-      end
-
-      tund_info = @tund_infos[ tund ]
-
-      if tund_info[ :wbuffs ].empty?
-        @writes.delete( tund )
-        return
-      end
-
-      to_addr, data = tund_info[ :wbuffs ].shift
-      tund.sendmsg( data, 0, to_addr )
-    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_write( sock )
-      unless @writes.include?( sock )
-        @writes << sock
-      end
-    end
-
-    def add_closing( tund )
-      unless @closings.include?( tund )
-        @closings << tund
-      end
-
-      add_write( tund )
-    end
-
-    def close_tund( tund )
-      tund.close
-      @reads.delete( tund )
-      @writes.delete( tund )
-      @closings.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 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
-        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
-        }
-
-        @roles[ tund ] = :tund
-        @reads << tund
-        @tunds[ from_addr ] = tund
-      end
-
-      tund
-    end
-
-    def loop_expire
-      Thread.new do
-        loop do
-          sleep 30
-
-          @mutex.synchronize do
-            now = Time.new
-
-            @tund_infos.values.each do | tund_info |
-              # net.netfilter.nf_conntrack_udp_timeout_stream
-              if now - tund_info[ :last_traff_at ] > 180
-                @ctlw.write( [ tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ] ].join )
-              end
-            end
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/girl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.78.0
+  version: 0.83.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-09-05 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: