Changeset 118

Timestamp:

01/24/06 22:10:58 (19 years ago)

Author:

Erik Huelsmann

Message:

Remove code also maintained in trivial-sockets, adding that as a dependency.

Location:

trunk

Files:

• cl-irc.asd (modified) (1 diff)
• command.lisp (modified) (2 diffs)
• event.lisp (modified) (2 diffs)
• protocol.lisp (modified) (1 diff)
• utility.lisp (modified) (1 diff)

trunk/cl-irc.asd ¶

@@ -17 +17 @@
     :licence "MIT"
     :description "Common Lisp interface to the IRC protocol"
-    :depends-on
-      #+sbcl (:sb-bsd-sockets :split-sequence)
-      #-sbcl (:split-sequence)
-    :depends-on (:split-sequence)
+    :depends-on (:split-sequence :trivial-sockets)
     :properties ((#:author-email . "cl-irc-devel@common-lisp.net")
                  (#:date . "$Date$")

trunk/command.lisp ¶

@@ -344 +344 @@
   (send-irc-message connection :privmsg (make-ctcp-message message) target))
 
+#|
+There's too much wrong with this method to fix it now.
+
 (defmethod ctcp-chat-initiate ((connection connection) (nickname string))
   #+sbcl
@@ -360 +363 @@
   #-sbcl (warn "ctcp-chat-initiate is not supported on this implementation.")
   )
+|#

trunk/event.lisp ¶

@@ -293 +293 @@
 ;    (let* ((user (find-user (connection message) (source message)))
 ;           (args (tokenize-string (trailing-argument message)))
-;           (remote-address (hbo-to-vector-quad (parse-integer (fourth args))))
+;           (remote-address (hbo-to-dotted-quad (parse-integer (fourth args))))
 ;           (remote-port (parse-integer (fifth args) :junk-allowed t)))
 ;      (push (make-dcc-connection :user user
@@ -307 +307 @@
 ;           (args (tokenize-string (trailing-argument message)))
 ;           (filename (third args))
-;           (remote-address (hbo-to-vector-quad (parse-integer (fourth args))))
+;           (remote-address (hbo-to-dotted-quad (parse-integer (fourth args))))
 ;           (remote-port (parse-integer (fifth args)))
 ;           (filesize (parse-integer (sixth args) :junk-allowed t)))

trunk/protocol.lisp ¶

@@ -401 +401 @@
   (make-instance 'dcc-connection
                  :user user
-                 :stream (socket-stream remote-address remote-port)
+                 :stream (socket-connect remote-address remote-port)
                  :output-stream output-stream))
 

trunk/utility.lisp ¶

@@ -107 +107 @@
     (vector first second third fourth)))
 
-(defun connect-to-server-socket (host port)
-  #+sbcl
-  (let ((s (make-instance 'sb-bsd-sockets:inet-socket
-                          :type :stream
-                          :protocol :tcp)))
-    (sb-bsd-sockets:socket-connect s (car (sb-bsd-sockets:host-ent-addresses
-                                           (sb-bsd-sockets:get-host-by-name host))) port)
-    s)
-  )
-
-(defun socket-stream (socket)
-  #+sbcl
-  (sb-bsd-sockets:socket-make-stream socket
-                                     :element-type 'character
-                                     :input t
-                                     :output t
-                                     :buffering :none)
-  )
-
 (defun socket-connect (server port)
   "Create a socket connected to `server':`port' and return stream for it."
-  #+lispworks (comm:open-tcp-stream server port :errorp t)
-  #+cmu       (sys:make-fd-stream (ext:connect-to-inet-socket server port)
-                                  :input t
-                                  :output t
-                                  :element-type 'character)
-  #+allegro (socket:make-socket :remote-host server :remote-port port)
-  #+sbcl (socket-stream (connect-to-server-socket server port))
-  #+openmcl (ccl:make-socket :remote-host server :remote-port port)
-  #+armedbear (ext:get-socket-stream (ext:make-socket server port))
-  #-(or lispworks cmu allegro sbcl openmcl armedbear)
-  (warn "socket-connect not supported for this implementation.")
-  )
+  (trivial-sockets:open-stream server port))