girl 0.56.0 → 0.60.0

data/lib/girl/resolv.rb

@@ -3,7 +3,7 @@ require 'girl/version'
 require 'socket'
 
 ##
-# Girl::Resolv - dns查询得到正确的ip。近端。
+# Girl::Resolv - dns查询得到正确的ip，近端。
 #
 # usage
 # =====

data/lib/girl/resolvd.rb

@@ -3,7 +3,7 @@ require 'girl/version'
 require 'socket'
 
 ##
-# Girl::Resolvd - dns查询得到正确的ip。远端。
+# Girl::Resolvd - dns查询得到正确的ip，远端。
 #
 module Girl
   class Resolvd

data/lib/girl/tun.rb

@@ -4,7 +4,7 @@ require 'girl/version'
 require 'socket'
 
 ##
-# Girl::Tun - tcp流量正常的到达目的地。近端。
+# Girl::Tun - tcp透明转发，近端。
 #
 # usage
 # =====
@@ -39,18 +39,6 @@ require 'socket'
 #                             12 tund fin
 #                             13 tun fin
 #
-# 两套关闭
-# ========
-#
-# 1-1. source.close -> ext.is_dest_closed ? no -> send fin1 loop
-# 1-2. recv got_fin1 -> break loop
-# 1-3. recv fin2 -> send got_fin2 -> del ext
-#
-# 2-1. recv fin1 -> send got_fin1 -> ext.is_dest_closed = true
-# 2-2. all sent && ext.biggest_dest_pack_id == ext.continue_dest_pack_id -> add closing source
-# 2-3. source.close -> ext.is_dest_closed ? yes -> del ext -> loop send fin2
-# 2-4. recv got_fin2 -> break loop
-#
 module Girl
   class Tun
     ##
@@ -96,6 +84,15 @@ module Girl
         rs, ws = IO.select( @reads, @writes )
 
         @mutex.synchronize do
+          ws.each do | sock |
+            case @roles[ sock ]
+            when :source
+              write_source( sock )
+            when :tun
+              write_tun( sock )
+            end
+          end
+
           rs.each do | sock |
             case @roles[ sock ]
             when :ctlr
@@ -108,15 +105,6 @@ module Girl
               read_tun( sock )
             end
           end
-
-          ws.each do | sock |
-            case @roles[ sock ]
-            when :source
-              write_source( sock )
-            when :tun
-              write_tun( sock )
-            end
-          end
         end
       end
     rescue Interrupt => e
@@ -707,13 +695,13 @@ module Girl
 
     def check_expire( tun )
       Thread.new do
-        sleep HEARTBEAT_INTERVAL
+        sleep 3
 
-        unless tun.closed?
-          tun_info = @infos[ tun ]
+        @mutex.synchronize do
+          unless tun.closed?
+            tun_info = @infos[ tun ]
 
-          unless tun_info[ :tund_addr ]
-            @mutex.synchronize do
+            unless tun_info[ :tund_addr ]
               tun_id = @socks[ tun ]
               @ctlw.write( [ CTL_CLOSE, tun_id ].pack( 'CQ>' ) )
             end
@@ -739,26 +727,23 @@ module Girl
     def loop_check_expire( tun )
       Thread.new do
         loop do
-          sleep 60
+          sleep CHECK_EXPIRE_INTERVAL
+
           break if tun.closed?
 
-          now = Time.new
-          tun_info = @infos[ tun ]
+          @mutex.synchronize do
+            now = Time.new
+            tun_info = @infos[ tun ]
 
-          if now - tun_info[ :last_traffic_at ] > EXPIRE_AFTER
-            @mutex.synchronize do
+            if now - tun_info[ :last_traffic_at ] > EXPIRE_AFTER
               tun_id = @socks[ tun ]
               # puts "debug ctlw close tun #{ tun_id } #{ Time.new } p#{ Process.pid }"
               @ctlw.write( [ CTL_CLOSE, tun_id ].pack( 'CQ>' ) )
             end
 
-            break
-          end
-
-          exts = tun_info[ :source_exts ].select{ | _, ext | now - ext[ :created_at ] > 5 }
+            exts = tun_info[ :source_exts ].select{ | _, ext | now - ext[ :created_at ] > 5 }
 
-          if exts.any?
-            @mutex.synchronize do
+            if exts.any?
               exts.each do | source_id, ext |
                 if ext[ :last_recv_at ].nil? || ( now - ext[ :last_recv_at ] > EXPIRE_AFTER )
                   # puts "debug ctlw close source #{ source_id } #{ Time.new } p#{ Process.pid }"
@@ -781,10 +766,10 @@ module Girl
             break
           end
 
-          tun_info = @infos[ tun ]
+          @mutex.synchronize do
+            tun_info = @infos[ tun ]
 
-          if tun_info[ :source_exts ].any?
-            @mutex.synchronize do
+            if tun_info[ :source_exts ].any?
               now = Time.new
 
               tun_info[ :source_exts ].each do | source_id, ext |
@@ -801,10 +786,8 @@ module Girl
                 end
               end
             end
-          end
 
-          if tun_info[ :paused ] && ( tun_info[ :source_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
-            @mutex.synchronize do
+            if tun_info[ :paused ] && ( tun_info[ :source_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
               tun_id = @socks[ tun ]
               puts "ctlw resume #{ tun_id } #{ Time.new } p#{ Process.pid }"
               @ctlw.write( [ CTL_RESUME, tun_id ].pack( 'CQ>' ) )
@@ -817,7 +800,7 @@ module Girl
 
     def loop_send_a_new_source( source, original_dst )
       Thread.new do
-        100.times do
+        30.times do
           break if source.closed?
 
           source_info = @infos[ source ]
@@ -834,12 +817,12 @@ module Girl
               # puts "debug break a new source loop #{ Time.new } p#{ Process.pid }"
               break
             end
+          end
 
-            @mutex.synchronize do
-              ctlmsg = "#{ [ 0, A_NEW_SOURCE, source_id ].pack( 'Q>CQ>' ) }#{ original_dst }"
-              # puts "debug send a new source #{ Time.new } p#{ Process.pid }"
-              send_pack( tun, ctlmsg, tun_info[ :tund_addr ] )
-            end
+          @mutex.synchronize do
+            ctlmsg = "#{ [ 0, A_NEW_SOURCE, source_id ].pack( 'Q>CQ>' ) }#{ original_dst }"
+            # puts "debug send a new source #{ Time.new } p#{ Process.pid }"
+            send_pack( tun, ctlmsg, tun_info[ :tund_addr ] )
           end
 
           sleep 1
@@ -849,7 +832,7 @@ module Girl
 
     def loop_send_fin1( tun, source_id )
       Thread.new do
-        100.times do
+        30.times do
           break if tun.closed?
 
           tun_info = @infos[ tun ]
@@ -878,7 +861,7 @@ module Girl
 
     def loop_send_fin2( tun, source_id )
       Thread.new do
-        100.times do
+        30.times do
           break if tun.closed?
 
           tun_info = @infos[ tun ]

data/lib/girl/tund.rb

@@ -4,19 +4,7 @@ require 'girl/version'
 require 'socket'
 
 ##
-# Girl::Tund - tcp流量正常的到达目的地。远端。
-#
-# 两套关闭
-# ========
-#
-# 1-1. dest.close -> ext.is_source_closed ? no -> send fin1 loop
-# 1-2. recv got_fin1 -> break loop
-# 1-3. recv fin2 -> send got_fin2 -> del ext
-#
-# 2-1. recv fin1 -> send got_fin1 -> ext.is_source_closed = true
-# 2-2. all sent && ext.biggest_source_pack_id == ext.continue_source_pack_id -> add closing dest
-# 2-3. dest.close -> ext.is_source_closed ? yes -> del ext -> loop send fin2
-# 2-4. recv got_fin2 -> break loop
+# Girl::Tund - tcp透明转发，远端。
 #
 module Girl
   class Tund
@@ -54,6 +42,15 @@ module Girl
         rs, ws = IO.select( @reads, @writes )
 
         @mutex.synchronize do
+          ws.each do | sock |
+            case @roles[ sock ]
+            when :dest
+              write_dest( sock )
+            when :tund
+              write_tund( sock )
+            end
+          end
+
           rs.each do | sock |
             case @roles[ sock ]
             when :ctlr
@@ -66,15 +63,6 @@ module Girl
               read_tund( sock )
             end
           end
-
-          ws.each do | sock |
-            case @roles[ sock ]
-            when :dest
-              write_dest( sock )
-            when :tund
-              write_tund( sock )
-            end
-          end
         end
       end
     rescue Interrupt => e
@@ -660,13 +648,13 @@ module Girl
 
     def check_expire( tund )
       Thread.new do
-        sleep HEARTBEAT_INTERVAL
+        sleep 3
 
-        unless tund.closed?
-          tund_info = @infos[ tund ]
+        @mutex.synchronize do
+          unless tund.closed?
+            tund_info = @infos[ tund ]
 
-          unless tund_info[ :tun_addr ]
-            @mutex.synchronize do
+            unless tund_info[ :tun_addr ]
               tund_id = @socks[ tund ]
               @ctlw.write( [ CTL_CLOSE, tund_id ].pack( 'CQ>' ) )
             end
@@ -678,25 +666,22 @@ module Girl
     def loop_check_expire( tund )
       Thread.new do
         loop do
-          sleep 60
+          sleep CHECK_EXPIRE_INTERVAL
+
           break if tund.closed?
 
-          now = Time.new
-          tund_info = @infos[ tund ]
+          @mutex.synchronize do
+            now = Time.new
+            tund_info = @infos[ tund ]
 
-          if now - tund_info[ :last_traffic_at ] > EXPIRE_AFTER
-            @mutex.synchronize do
+            if now - tund_info[ :last_traffic_at ] > EXPIRE_AFTER
               tund_id = @socks[ tund ]
               @ctlw.write( [ CTL_CLOSE, tund_id ].pack( 'CQ>' ) )
             end
 
-            break
-          end
-
-          exts = tund_info[ :dest_exts ].select{ | _, ext | now - ext[ :created_at ] > 5 }
+            exts = tund_info[ :dest_exts ].select{ | _, ext | now - ext[ :created_at ] > 5 }
 
-          if exts.any?
-            @mutex.synchronize do
+            if exts.any?
               exts.each do | dest_id, ext |
                 if ext[ :last_recv_at ].nil? || ( now - ext[ :last_recv_at ] > EXPIRE_AFTER )
                   # puts "debug ctlw close dest #{ dest_id } #{ Time.new } p#{ Process.pid }"
@@ -719,10 +704,10 @@ module Girl
             break
           end
 
-          tund_info = @infos[ tund ]
+          @mutex.synchronize do
+            tund_info = @infos[ tund ]
 
-          if tund_info[ :dest_exts ].any?
-            @mutex.synchronize do
+            if tund_info[ :dest_exts ].any?
               now = Time.new
 
               tund_info[ :dest_exts ].each do | dest_id, ext |
@@ -739,10 +724,8 @@ module Girl
                 end
               end
             end
-          end
 
-          if tund_info[ :paused ] && ( tund_info[ :dest_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
-            @mutex.synchronize do
+            if tund_info[ :paused ] && ( tund_info[ :dest_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
               tund_id = @socks[ tund ]
               puts "ctlw resume #{ tund_id } #{ Time.new } p#{ Process.pid }"
               @ctlw.write( [ CTL_RESUME, tund_id ].pack( 'CQ>' ) )
@@ -755,7 +738,7 @@ module Girl
 
     def loop_send_fin1( tund, dest_id )
       Thread.new do
-        100.times do
+        30.times do
           break if tund.closed?
 
           tund_info = @infos[ tund ]
@@ -784,7 +767,7 @@ module Girl
 
     def loop_send_fin2( tund, dest_id )
       Thread.new do
-        100.times do
+        30.times do
           break if tund.closed?
 
           tund_info = @infos[ tund ]

data/lib/girl/udp.rb

@@ -2,7 +2,7 @@ require 'girl/version'
 require 'socket'
 
 ##
-# Girl::Udp - 转发udp。近端。
+# Girl::Udp - udp透明转发，近端。
 #
 # usage
 # ======

data/lib/girl/udpd.rb

@@ -2,7 +2,7 @@ require 'girl/version'
 require 'socket'
 
 ##
-# Girl::Udpd - 转发udp。远端。
+# Girl::Udpd - udp透明转发，远端。
 #
 module Girl
   class Udpd
@@ -34,6 +34,7 @@ module Girl
                         #   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
     end
@@ -116,8 +117,23 @@ module Girl
 
       if to_addr
         # 来自tun，发给dst。
+        td_addr = [ from_addr, to_addr ].join
+        is_tunneled = tund_info[ :is_tunneleds ][ td_addr ]
+
+        unless is_tunneled
+          # puts "debug first traffic from tun #{ addrinfo.inspect } to #{ Addrinfo.new( to_addr ).inspect }"
+          # 发暂存
+          if tund_info[ :unpaired_dst_rbuffs ].include?( to_addr )
+            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
@@ -127,19 +143,20 @@ module Girl
 
       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 ] }
+        # 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
+          add_tund_wbuff( tund, to_addr, data )
+          return
         end
 
-        # puts "debug #{ data.inspect } from #{ addrinfo.inspect } to #{ Addrinfo.new( to_addr ).inspect }"
-        add_tund_wbuff( tund, to_addr, data )
-        return
+        # puts "debug #{ Addrinfo.new( to_addr ).inspect } #{ addrinfo.inspect } not tunneled"
       end
 
-      # 来自未知的地方，看做是p2p对面先到。
+      # 来自未知的地方，或者对应的tun还没来流量，记暂存
       unless tund_info[ :unpaired_dst_rbuffs ][ from_addr ]
         tund_info[ :unpaired_dst_rbuffs ][ from_addr ] = []
       end
@@ -211,12 +228,14 @@ module Girl
 
     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 )
@@ -231,6 +250,7 @@ module Girl
           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
         }

data/lib/girl/version.rb

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