girl 0.55.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98deb3d9378bcd1eb4477e0a6466c527770b957f627908fd2f6b696da6648083
-  data.tar.gz: f3bca1da27d757810adccb9bb20d3eddfbfdb7b5ea4e1d0c5130d956d0dbd059
+  metadata.gz: 51cd8eb08b9c349052e54ac302dd4ad2fdfac19b93e80636d20507ab21e1d3b5
+  data.tar.gz: 05d5de915f020e027d938f410a9a875ba92b39cb668a14ad9a3f523ecf5424dd
 SHA512:
-  metadata.gz: 14d229048ad6c27df19295600b0c0817962b667bde195fd26a272a323d29b8f35196f49fc41cfc3b47afaac9f32e5e7d56be8dd890300a6d408e4a1a0fc600b5
-  data.tar.gz: de9f1a2af41e00056fb0822348276b5fcfd6326fe5b00813cc0f7bba66e2e7b524ad2a3f00d0e93d68723f14e4d4284a5f89f0e10564505c44e0d8a14ceee496
+  metadata.gz: 0bf9735b27decf69c11b3c2b9701ec6f77f351a95b5ab0585cffbc0d17df0ed0dce0b94cacc5b2b032b9ebf0e7ca13cb2b8ab49ba6c2d300c3a02a0985bbdd21
+  data.tar.gz: a8a5b465ed7ef52108ff56d8ddaf0b5a56e3b10ca1d254f78e069df198d3e3df8d1fe7285ea2e8695e24e9d26d41d72bb803955ad1a90aaa75672c2244aa15e7

data/lib/girl/udp.rb

@@ -13,45 +13,6 @@ require 'socket'
 #
 # iptables -t nat -A PREROUTING -p udp -d game.server.ip -j REDIRECT --to-ports 1313
 #
-# p2p flow
-# =========
-#
-# 源地址src发往第二个目的地dst2，iptables会映射一个新的本地端口sport2，用来代理dst2的返程。
-# 可在nf_conntrack里找到src1和src2，看到映射前的源地址端口是一样的。
-# 若在sport2没有收到返程30秒过期后，src发往第三个目的地dst3，iptables会把dst3的返程依旧映射在sport2上。因此不能根据映射端口建tun-tund对。
-#
-# tund1接到dst2，看作p2p进来，记tund1为src-dst2发送代理。
-# 取接收者tund1.dst2.receiver，由接收者接数据。
-# 若接收者为空，据dst2-src找接收者，找到tund2，tund2-tun2传数据，同时tund1发tund2.wmems去dst2。没找到，记tund1.dst2.rbuff。
-#
-# src经tun2-tund2发往dst2，记tund2为dst2-src接收者。
-# 取发送代理tund2.alias_sender，由发送代理发数据。
-# 若发送代理为空，据src-dst2找发送代理，找到tund1，tund1发数据给dst2，同时tund2转tund1.dst2.rbuffs给tun2。没找到，tund2-dst2，记tund2.wmem。
-#
-# 请求匹配服务器：
-#
-# redir recv -> src1, dst1, data -> tun1-tund1 data -> set receiver dst1-src: tund1 -> tund1-dst1 data
-#
-# 匹配服务器返回：
-#
-# tund1 recv -> dst1, data -> tund1-tun1 data -> redir-src1 data
-#
-# p1发往p2：
-#
-# redir recv -> src2, dst2, data -> tun2-tund2 data -> set receiver dst2-src: tund2 -> alias sender not found -> tund2-dst2 data -> save wmem
-#
-# p2后进来：
-#
-# tund1 recv -> dst2, data -> set alias sender src-dst2: tund1 -> found receiver tund2 -> tund2-tun2 redir-src2 data -> tund1-dst2 tund2.wmems
-#
-# p3进来：
-#
-# tund1 recv -> dst3, data -> set alias sender src-dst3: tund1 -> receiver not found -> save data to tund1.dst3.rbuffs
-#
-# p1后发往p3：
-#
-# redir recv -> src3, dst3, data -> tun3-tund3 data -> set receiver dst3-src: tund3 -> found alias sender tund1 -> tund1-dst3 data -> tund3-tun3 redir-src tund1.dst3.rbuffs
-#
 module Girl
   class Udp
 
@@ -83,7 +44,7 @@ module Girl
                          #   dst_addr: sockaddr
                          #   src_addr: sockaddr
                          #   tund_addr: sockaddr
-                         #   ctlmsgs: []
+                         #   rbuffs: []
                          #   wbuffs: []
                          #   last_traff_at: now
     end
@@ -136,30 +97,51 @@ module Girl
     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 }"
-      # 2 udp 5 src 7 sport 9 [UNREPLIED] 11 dst 13 dport
-      # 2 udp 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[ 9 ] == '[UNREPLIED]' && _row[ 11 ].split( '=' )[ 1 ] == addrinfo.ip_address && _row[ 13 ].split( '=' )[ 1 ].to_i == addrinfo.ip_port ) || ( _row[ 10 ].split( '=' )[ 1 ] == addrinfo.ip_address && _row[ 12 ].split( '=' )[ 1 ].to_i == addrinfo.ip_port ) ) }
 
-      if row
+      if @mappings.include?( src_addr )
+        orig_src_addr, dst_addr, timeout, read_at = @mappings[ src_addr ]
+
+        if now - read_at < timeout
+          # 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
+        # 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
+          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 )
-      else
-        unless @mappings.include?( src_addr )
-          puts "miss conntrack #{ addrinfo.inspect } #{ Time.new }"
-          IO.binwrite( '/tmp/nf_conntrack', bin )
+
+        if Addrinfo.new( dst_addr ).ipv4_private?
+          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 "hit mapping #{ addrinfo.inspect }"
-        orig_src_addr, dst_addr = @mappings[ src_addr ]
+        # 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 ]
@@ -169,12 +151,11 @@ module Girl
 
         # 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_ctlmsg( tun, ctlmsg )
-
-        @mappings[ src_addr ] = [ orig_src_addr, dst_addr ]
+        add_tun_wbuff( tun, @udpd_addr, ctlmsg )
       end
 
-      add_write( tun, data )
+      tun_info = @tun_infos[ tun ]
+      add_tun_wbuff( tun, tun_info[ :tund_addr ], data )
     end
 
     def read_tun( tun )
@@ -187,10 +168,15 @@ module Girl
         tund_port = data[ 0, 2 ].unpack( 'n' ).first
         tund_addr = Socket.sockaddr_in( tund_port, @udpd_host )
         tun_info[ :tund_addr ] = tund_addr
-        add_write( tun )
+
+        if tun_info[ :rbuffs ].any?
+          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 ]
-        @redir_wbuffs << [ tun_info[ :src_addr ], data ]
-        add_write( @redir )
+        add_redir_wbuff( @redir, tun_info[ :src_addr ], data )
       end
     end
 
@@ -211,34 +197,33 @@ module Girl
       end
 
       tun_info = @tun_infos[ tun ]
-      ctlmsg = tun_info[ :ctlmsgs ].shift
-
-      if ctlmsg
-        tun.sendmsg( ctlmsg, 0, @udpd_addr )
-        return
-      end
 
-      if tun_info[ :tund_addr ].nil? || tun_info[ :wbuffs ].empty?
+      if tun_info[ :wbuffs ].empty?
         @writes.delete( tun )
         return
       end
 
-      data = tun_info[ :wbuffs ].shift
-      tun.sendmsg( data, 0, tun_info[ :tund_addr ] )
+      to_addr, data = tun_info[ :wbuffs ].shift
+      tun.sendmsg( data, 0, to_addr )
     end
 
-    def add_ctlmsg( tun, ctlmsg )
-      tun_info = @tun_infos[ tun ]
-      tun_info[ :ctlmsgs ] << ctlmsg
-      add_write( tun )
+    def add_redir_wbuff( redir, to_addr, data )
+      @redir_wbuffs << [ to_addr, data ]
+      add_write( redir )
     end
 
-    def add_write( sock, data = nil )
-      if data
-        tun_info = @tun_infos[ sock ]
-        tun_info[ :wbuffs ] << data
+    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
@@ -262,7 +247,7 @@ module Girl
       @tuns.delete( [ tun_info[ :orig_src_addr ], tun_info[ :dst_addr ] ].join )
 
       if @mappings.include?( tun_info[ :src_addr ] )
-        orig_src_addr, dst_addr = @mappings[ 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 ] )
@@ -280,7 +265,7 @@ module Girl
         dst_addr: dst_addr,
         src_addr: src_addr,
         tund_addr: nil,
-        ctlmsgs: [],
+        rbuffs: [],
         wbuffs: [],
         last_traff_at: Time.new
       }
@@ -295,13 +280,14 @@ module Girl
     def loop_expire
       Thread.new do
         loop do
-          sleep 60
+          sleep 30
 
           @mutex.synchronize do
             now = Time.new
 
             @tun_infos.values.each do | tun_info |
-              if now - tun_info[ :last_traff_at ] > 600
+              # 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

data/lib/girl/udpd.rb

@@ -22,25 +22,20 @@ module Girl
       @writes = []
       @closings = []
       @roles = {
-        ctlr => :ctlr,        # :ctlr / :udpd / :tund
+        ctlr => :ctlr,  # :ctlr / :udpd / :tund
         udpd => :udpd
       }
-      @udpd_wbuffs = []       # [ tun_addr ctlmsg ] ...
-      @tunds = {}             # tun_addr => tund
-      @alias_senders = {}     # [ tun_ip_addr orig_src_addr dst_addr ] => tund # alias senders to dst
-      @receivers = {}         # [ dst_addr tun_ip_addr orig_src_addr ] => tund # receivers from dst
-      @tund_infos = {}        # tund => {}
-                              #   port: port
-                              #   tun_addr: sockaddr
-                              #   tun_ip_addr: sockaddr
-                              #   orig_src_addr: sockaddr
-                              #   dst_addr: sockaddr
-                              #   wbuffs: [] # 写往tun的写前缓存
-                              #   wmems: [] # 写往dst的写后缓存
-                              #   other_dst_rbuffs: { new_dst_addr => [] }
-                              #   receivers: { other_dst_addr => other_tund }
-                              #   last_traff_at: now
-      @od_addr_rbuffs = {}
+      @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 }
+                        #   unpaired_dst_rbuffs: { dst_addr => [] }
+                        #   last_traff_at: now
     end
 
     def looping
@@ -80,8 +75,8 @@ module Girl
     private
 
     def read_ctlr( ctlr )
-      tun_addr = ctlr.read( 16 )
-      tund = @tunds[ tun_addr ]
+      to_addr = ctlr.read( 32 )
+      tund = @tunds[ to_addr ]
 
       if tund
         add_closing( tund )
@@ -97,14 +92,12 @@ module Girl
       tun_ip_addr = Addrinfo.ip( addrinfo.ip_address ).to_sockaddr
 
       return unless Addrinfo.new( orig_src_addr ).ipv4?
-      return unless Addrinfo.new( dst_addr ).ipv4?
 
-      tund = @tunds[ tun_addr ]
-
-      unless tund
-        tund = new_a_tund( tun_addr, tun_ip_addr, orig_src_addr, dst_addr )
-      end
+      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 ]
 
@@ -119,106 +112,42 @@ module Girl
       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
+        # 来自tun，发给dst。
+        # 如果对面没来过流量，且在nat里，nat规则是只对去过的目的地做接收，那么，先过去的流量会撞死。
+        # 没关系，撞死的流量通常是打洞数据，撞死在应用掌控之内，打洞数据通常是连发的。
+        # puts "debug #{ data.inspect } from #{ addrinfo.inspect } to #{ Addrinfo.new( to_addr ).inspect }"
+        add_tund_wbuff( tund, to_addr, data )
+        return
+      end
 
-      case from_addr
-      when tund_info[ :tun_addr ]
-        # src经tun2-tund2发往dst2，记tund2为dst2-src接收者。
-        dto_addr = [ tund_info[ :dst_addr ], tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ] ].join
+      to_addr = tund_info[ :tun_addrs ][ from_addr ]
 
-        if @receivers[ dto_addr ]
-          if @receivers[ dto_addr ] != tund
-            puts "receiver not unique? #{ Addrinfo.new( tund_info[ :dst_addr ] ).inspect } #{ Addrinfo.new( tund_info[ :tun_ip_addr ] ).inspect } #{ Addrinfo.new( tund_info[ :orig_src_addr ] ).inspect }"
-            return
-          end
-        else
-          @receivers[ dto_addr ] = tund
+      if to_addr
+        # 来自dst，发给tun。
+        # 先发暂存
+        if tund_info[ :unpaired_dst_rbuffs ].include?( from_addr )
+          rbuffs = tund_info[ :unpaired_dst_rbuffs ].delete( from_addr )
+          # puts "debug move tund.dst.rbuffs to tund.wbuffs #{ rbuffs.inspect }"
+          tund_info[ :wbuffs ] += rbuffs.map{ | rbuff | [ to_addr, rbuff ] }
         end
 
-        # 取发送代理tund2.alias_sender，由发送代理发数据。
-        sender = tund_info[ :alias_sender ]
-
-        if sender
-          # puts "debug alias sender send #{ data.inspect } to #{ Addrinfo.new( tund_info[ :dst_addr ] ).inspect }"
-          sender.sendmsg( data, 0, tund_info[ :dst_addr ] )
-        else
-          # 若发送代理为空，据src-dst2找发送代理，找到tund1，tund1发数据给dst2，同时tund2转tund1.dst2.rbuffs给tun2。没找到，tund2-dst2，记tund2.wmem。
-          tod_addr = [ tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ], tund_info[ :dst_addr ] ].join
-          sender = @alias_senders[ tod_addr ]
-
-          if sender
-            sender.sendmsg( data, 0, tund_info[ :dst_addr ] )
-            tund_info[ :alias_sender ] = sender
-
-            sender_info = @tund_infos[ sender ]
-            rbuffs = sender_info[ :other_dst_rbuffs ].delete( tund_info[ :dst_addr ] )
-
-            if rbuffs
-              # puts "debug move tund1.dst2.rbuffs to tund2.wbuffs #{ rbuffs.inspect }"
-              tund_info[ :wbuffs ] += rbuffs
-              add_write( tund )
-            end
-          else
-            tund.sendmsg( data, 0, tund_info[ :dst_addr ] )
-
-            # 缓存写后，可能是p2p自己先出去，撞死的流量，之后对面进来匹配成对，由发送代理重发。超过5条看做非p2p。
-            if tund_info[ :wmems ].size < 5
-              # puts "debug save wmem #{ data.inspect } #{ Addrinfo.new( tund_info[ :dst_addr ] ).inspect }"
-              tund_info[ :wmems ] << data
-            end
-          end
-        end
-      when tund_info[ :dst_addr ]
-        # puts "debug tund-tun #{ data.inspect } from #{ Addrinfo.new( tund_info[ :dst_addr ] ).inspect }"
-        add_write( tund, data )
-      else
-        # tund1接到dst2，看作p2p进来，记tund1为src-dst2发送代理。
-        # puts "debug tund recv #{ data.inspect } from #{ addrinfo.inspect }"
-        tod_addr = [ tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ], from_addr ].join
-
-        if @alias_senders[ tod_addr ]
-          if @alias_senders[ tod_addr ] != tund
-            puts "alias sender not unique? #{ Addrinfo.new( tund_info[ :tun_ip_addr ] ).inspect } #{ Addrinfo.new( tund_info[ :orig_src_addr ] ).inspect } #{ addrinfo.inspect }"
-            return
-          end
-        else
-          @alias_senders[ tod_addr ] = tund
-        end
-
-        # 取接收者tund1.dst2.receiver，由接收者接数据。
-        receiver = tund_info[ :receivers ][ from_addr ]
-
-        if receiver
-          receiver_info = @tund_infos[ receiver ]
-          add_write( receiver, data )
-        else
-          # 若接收者为空，据dst2-src找接收者，找到tund2，tund2-tun2传数据，同时tund1转tund2.wmems给dst2。没找到，记tund1.dst2.rbuff。
-          dto_addr = [ from_addr, tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ] ].join
-          receiver = @receivers[ dto_addr ]
-
-          if receiver
-            add_write( receiver, data )
-
-            tund_info[ :receivers ][ from_addr ] = receiver
-            receiver_info = @tund_infos[ receiver ]
-
-            receiver_info[ :wmems ].each do | wmem |
-              # puts "debug send wmem #{ wmem.inspect } to #{ addrinfo.inspect }"
-              tund.sendmsg( wmem, 0, from_addr )
-            end
+        # puts "debug #{ data.inspect } from #{ addrinfo.inspect } to #{ Addrinfo.new( to_addr ).inspect }"
+        add_tund_wbuff( tund, to_addr, data )
+        return
+      end
 
-            receiver_info[ :wmems ].clear
-          else
-            unless tund_info[ :other_dst_rbuffs ][ from_addr ]
-              tund_info[ :other_dst_rbuffs ][ from_addr ] = []
-            end
+      # 来自未知的地方，看做是p2p对面先到。
+      unless tund_info[ :unpaired_dst_rbuffs ][ from_addr ]
+        tund_info[ :unpaired_dst_rbuffs ][ from_addr ] = []
+      end
 
-            # 暂存对面先到的p2p流量。超过5条看做意外数据忽略。
-            if tund_info[ :other_dst_rbuffs ][ from_addr ].size < 5
-              # puts "debug save other dst rbuff #{ addrinfo.inspect } #{ data.inspect }"
-              tund_info[ :other_dst_rbuffs ][ from_addr ] << data
-            end
-          end
-        end
+      # 暂存5条（连发打洞数据，不需要存多）。
+      if tund_info[ :unpaired_dst_rbuffs ][ from_addr ].size < 5
+        # puts "debug save other dst rbuff #{ addrinfo.inspect } #{ data.inspect }"
+        tund_info[ :unpaired_dst_rbuffs ][ from_addr ] << data
       end
     end
 
@@ -245,16 +174,18 @@ module Girl
         return
       end
 
-      data = tund_info[ :wbuffs ].shift
-      tund.sendmsg( data, 0, tund_info[ :tun_addr ] )
+      to_addr, data = tund_info[ :wbuffs ].shift
+      tund.sendmsg( data, 0, to_addr )
     end
 
-    def add_write( sock, data = nil )
-      if data
-        tund_info = @tund_infos[ sock ]
-        tund_info[ :wbuffs ] << data
-      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
@@ -275,44 +206,39 @@ module Girl
       @closings.delete( tund )
       @roles.delete( tund )
       tund_info = @tund_infos.delete( tund )
-      @tunds.delete( tund_info[ :tun_addr ] )
-
-      tod_addr = [ tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ], tund_info[ :dst_addr ] ].join
-
-      if @alias_senders[ tod_addr ] && @alias_senders[ tod_addr ] == tund
-        @alias_senders.delete( tod_addr )
-      end
-
-      dto_addr = [ tund_info[ :dst_addr ], tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ] ].join
-
-      if @receivers[ dto_addr ] && @receivers[ dto_addr ] == tund
-        @receivers.delete( dto_addr )
-      end
+      @tunds.delete( [ tund_info[ :tun_ip_addr ], tund_info[ :orig_src_addr ] ].join )
     end
 
-    def new_a_tund( tun_addr, tun_ip_addr, orig_src_addr, dst_addr )
-      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
-
-      @tunds[ tun_addr ] = tund
-      @tund_infos[ tund ] = {
-        port: tund_port,
-        tun_addr: tun_addr,
-        tun_ip_addr: tun_ip_addr,
-        orig_src_addr: orig_src_addr,
-        dst_addr: dst_addr,
-        wbuffs: [],
-        wmems: [],
-        other_dst_rbuffs: {},
-        receivers: {},
-        last_traff_at: Time.new
-      }
+    def pair_tund( tun_addr, tun_ip_addr, orig_src_addr, dst_addr )
+      from_addr = [ tun_ip_addr, orig_src_addr ].join
+      tund = @tunds[ from_addr ]
 
-      @roles[ tund ] = :tund
-      @reads << tund
+      if tund
+        tund_info = @tund_infos[ tund ]
+        tund_info[ :dst_addrs ][ tun_addr ] = dst_addr
+        tund_info[ :tun_addrs ][ dst_addr ] = tun_addr
+      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 },
+          unpaired_dst_rbuffs: {},
+          last_traff_at: Time.new
+        }
+
+        @roles[ tund ] = :tund
+        @reads << tund
+        @tunds[ from_addr ] = tund
+      end
 
       tund
     end
@@ -320,14 +246,15 @@ module Girl
     def loop_expire
       Thread.new do
         loop do
-          sleep 60
+          sleep 30
 
           @mutex.synchronize do
             now = Time.new
 
             @tund_infos.values.each do | tund_info |
-              if now - tund_info[ :last_traff_at ] > 600
-                @ctlw.write( tund_info[ :tun_addr ] )
+              # 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

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.55.0'.freeze
+  VERSION = '0.56.0'.freeze
 end

metadata

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