Ticket #6: ,port-and-password-in-connection-object.patch

command.lisp

@@ -250 +250 @@
                      (logging-stream t))
   "Connect to server and return a connection object."
   (let* ((stream (socket-connect server port))
+         (input-stream (flexi-streams:make-flexi-stream stream :element-type 'character :external-format '(:latin-1 :eol-style :crlf)))
          (connection (make-connection :connection-type connection-type
                                       :network-stream stream
+                                      :input-stream input-stream
                                       :client-stream logging-stream
-                                      :server-name server))
+                                      :server-name server
+                                      :server-port port
+                                      :password password))
          (user (make-user connection
                           :nickname nickname
                           :username username

package.lisp

@@ -18 +18 @@
              :destructuring-arguments
              :socket-connect
              :server-name
+             :server-port
+             :password
              :no-such-reply
              :irc-mode
              :boolean-value-mode

protocol.lisp

@@ -114 +114 @@
     :initarg :server-name
     :accessor server-name
     :initform "Unknown server")
+   (server-port
+    :initarg :server-port
+    :accessor server-port
+    :initform *default-irc-server-port*)
+   (password
+    :initarg :password
+    :accessor password
+    :initform nil)
    (network-stream
     :initarg :network-stream
     :accessor network-stream
-    :documentation "Stream used to talk to the IRC server.")
+    :documentation "Stream used to talk binary to the IRC server.")
+   (input-stream
+    :initarg :input-stream
+    :accessor input-stream
+    :documentation "Stream used to receive messages from the IRC server.")
    (server-capabilities
     :initform *default-isupport-values*
     :accessor server-capabilities
@@ -183 +195 @@
 (defgeneric re-apply-case-mapping (connection))
 
 (defun make-connection (&key (connection-type 'connection)
-                             (user nil)
-                             (server-name "")
-                             (network-stream nil)
-                             (client-stream t)
-                             (hooks nil))
+                        (user nil)
+                        (server-name "")
+                        (server-port nil)
+                        (password nil)
+                        (network-stream nil)
+                        (output-stream nil)
+                        (input-stream nil)
+                        (client-stream t)
+                        (hooks nil))
   (let ((connection (make-instance connection-type
-                                   :user user
-                                   :server-name server-name
-                                   :network-stream network-stream
-                                   :client-stream client-stream)))
+                       :user user
+                       :server-name server-name
+                       :server-port server-port
+                       :password password
+                       :network-stream network-stream
+                       :input-stream input-stream
+                       :client-stream client-stream)))
     (dolist (hook hooks)
       (add-hook connection (car hook) (cadr hook)))
     connection))