# port:: IRCd port
# host:: optional local host to bind to (ruby 1.7+ required)
# create a new IrcSocket
- def initialize(server, port, host, sendq_delay=2, sendq_burst=4)
+ def initialize(server, port, host, sendq_delay=2, sendq_burst=4, opts={})
@timer = Timer::Timer.new
@timer.add(0.2) do
spool
@spooler = false
@lines_sent = 0
@lines_received = 0
+ if opts.kind_of?(Hash) and opts.key?(:ssl)
+ @ssl = opts[:ssl]
+ else
+ @ssl = false
+ end
+
if sendq_delay
@sendq_delay = sendq_delay.to_f
else
else
@sock=TCPSocket.new(@server, @port)
end
+ if(@ssl)
+ require 'openssl'
+ ssl_context = OpenSSL::SSL::SSLContext.new()
+ ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+ @rawsock = @sock
+ @sock = OpenSSL::SSL::SSLSocket.new(@rawsock, ssl_context)
+ @sock.sync_close = true
+ @sock.connect
+ end
@qthread = false
@qmutex = Mutex.new
@sendq = MessageQueue.new
end
end
+ def handle_socket_error(string, err)
+ error "#{string} failed: #{err.inspect}"
+ debug err.backtrace.join("\n")
+ # We assume that an error means that there are connection
+ # problems and that we should reconnect, so we
+ shutdown
+ raise SocketError.new(err.inspect)
+ end
+
# get the next line from the server (blocks)
def gets
if @sock.nil?
debug "RECV: #{reply.inspect}"
return reply
rescue => e
- warning "socket get failed: #{e.inspect}"
- debug e.backtrace.join("\n")
- return nil
+ handle_socket_error(:RECV, e)
end
end
end
@flood_send = now if @flood_send < now
debug "can send #{@sendq_burst - @burst} lines, there are #{@sendq.length} to send"
- while !@sendq.empty? and @burst < @sendq_burst and @flood_send - now < MAX_IRC_SEND_PENALTY
+ while !@sendq.empty? and @burst < @sendq_burst and @flood_send - now < MAX_IRC_SEND_PENALTY
debug "sending message (#{@flood_send - now} < #{MAX_IRC_SEND_PENALTY})"
puts_critical(@sendq.shift, true)
end
# shutdown the connection to the server
def shutdown(how=2)
- @sock.shutdown(how) unless @sock.nil?
+ return unless connected?
+ begin
+ @sock.close
+ rescue => err
+ error "error while shutting down: #{err.inspect}"
+ debug err.backtrace.join("\n")
+ end
+ @rawsock = nil if @ssl
@sock = nil
@burst = 0
end
if @sock.nil?
error "SEND attempted on closed socket"
else
- @sock.send(message + "\n",0)
+ @sock.puts message
@last_send = Time.new
@flood_send += message.irc_send_penalty if penalty
@lines_sent += 1
@burst += 1
end
rescue => e
- error "SEND failed: #{e.inspect}"
- raise
+ handle_socket_error(:SEND, e)
end
end