@@ -6,6 +6,7 @@ module TunnelSplitter extend Forwardable attr_reader :tunnel_addresses, :tunnel_group + attr_accessor :swallow_pings def_delegator :@tunnel_group, :max_pending_acks= def initialize(listen_address, *tunnel_addresses) @@ -70,7 +71,12 @@ module TunnelSplitter @connection_id = @client.create_connection(self) end + def swallow_pings(data) + data.gsub!(/^PING (\S+)\r\n/, '') + end + def receive_data(data) + swallow_pings(data) if @client.swallow_pings @client.connection_for(@connection_id).queue_out(data) @tunnel_group.flush_outgoing_queue end lib/tunnel_splitter/client.rb @@ -48,9 +48,10 @@ module TunnelSplitter @tunneled_connections.values end - def clear_connections + def reset_connections @tunneled_connections.values.each {|conn| conn.connection_closed } @tunneled_connections.clear + @cleared_connections.clear end class TunnelConnection < EventMachine::Connection @@ -83,7 +84,7 @@ module TunnelSplitter when Command::Ack @tunnel_group.receive_ack(self, cmd) when Command::ResetConnections - @server.clear_connections + @server.reset_connections end end end @@ -107,7 +108,7 @@ module TunnelSplitter end def handle_pings(data) - while data.sub!(/PING (\S+).+?\r\n/, '') + while data.sub!(/^PING (\S+)\r\n/, '') send_data("PONG #$1\r\n") end end lib/tunnel_splitter/server.rb @@ -3,14 +3,20 @@ require 'tunnel_splitter' require 'optparse' p = nil +i = nil opts = OptionParser.new do |o| o.on "-p", "--max-pending-acks N" do |p| p = p.to_i end + + o.on "-i", "--swallow-pings" do + i = true + end end opts.parse! rescue (puts opts; exit 1) client = TunnelSplitter::Client.new(ARGV[0].dup, ARGV[1..-1].map{|a|a.dup}) client.max_pending_acks = p if p +client.swallow_pings = i EventMachine.run { client.start } ts_client.rb 8a996c8cc2a93fd8d85927beaa6147c2d1314971 steve coderrr.contact@gmail.com http://github.com/coderrr/tunnel_splitter/commit/d70bbd8306ed471347fbc20d6db88f92d53e0d97 d70bbd8306ed471347fbc20d6db88f92d53e0d97 2009-06-25T10:15:59-07:00 2009-06-25T10:15:59-07:00 fix resetting of connections; add swallow pings options to client, to prevent excess flood on long delayed reconnect 4220d606505113f4a3f690380026d488dccea113 steve coderrr.contact@gmail.com