[Cl-irc-cvs] CVS cl-irc

ehuelsmann ehuelsmann at common-lisp.net
Tue Jan 24 22:10:58 UTC 2006


Update of /project/cl-irc/cvsroot/cl-irc
In directory common-lisp:/tmp/cvs-serv8000

Modified Files:
	cl-irc.asd command.lisp event.lisp protocol.lisp utility.lisp 
Log Message:
Remove code also maintained in trivial-sockets, adding that as a dependency.

--- /project/cl-irc/cvsroot/cl-irc/cl-irc.asd	2004/03/29 19:07:54	1.2
+++ /project/cl-irc/cvsroot/cl-irc/cl-irc.asd	2006/01/24 22:10:58	1.3
@@ -1,4 +1,4 @@
-;;;; $Id: cl-irc.asd,v 1.2 2004/03/29 19:07:54 krosenberg Exp $
+;;;; $Id: cl-irc.asd,v 1.3 2006/01/24 22:10:58 ehuelsmann Exp $
 ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/cl-irc.asd,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -16,12 +16,9 @@
     :version "0.5.2"
     :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 at common-lisp.net")
-                 (#:date . "$Date: 2004/03/29 19:07:54 $")
+                 (#:date . "$Date: 2006/01/24 22:10:58 $")
                  ((#:albert #:output-dir) . "doc/api-doc/")
                  ((#:albert #:formats) . ("docbook"))
                  ((#:albert #:docbook #:template) . "book")
--- /project/cl-irc/cvsroot/cl-irc/command.lisp	2005/09/25 14:55:02	1.12
+++ /project/cl-irc/cvsroot/cl-irc/command.lisp	2006/01/24 22:10:58	1.13
@@ -1,4 +1,4 @@
-;;;; $Id: command.lisp,v 1.12 2005/09/25 14:55:02 bmastenbrook Exp $
+;;;; $Id: command.lisp,v 1.13 2006/01/24 22:10:58 ehuelsmann Exp $
 ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/command.lisp,v $
 
 ;;;; See LICENSE for licensing information.
@@ -343,6 +343,9 @@
 (defmethod ctcp ((connection connection) target message)
   (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
   (let ((socket (sb-bsd-sockets:make-inet-socket :stream :tcp))
@@ -359,3 +362,4 @@
                          :socket socket))
   #-sbcl (warn "ctcp-chat-initiate is not supported on this implementation.")
   )
+|#
--- /project/cl-irc/cvsroot/cl-irc/event.lisp	2005/09/25 14:55:02	1.11
+++ /project/cl-irc/cvsroot/cl-irc/event.lisp	2006/01/24 22:10:58	1.12
@@ -1,4 +1,4 @@
-;;;; $Id: event.lisp,v 1.11 2005/09/25 14:55:02 bmastenbrook Exp $
+;;;; $Id: event.lisp,v 1.12 2006/01/24 22:10:58 ehuelsmann Exp $
 ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/event.lisp,v $
 
 ;;;; See LICENSE for licensing information.
@@ -292,7 +292,7 @@
 ;  (when (automatically-accept-dcc-connections (configuration (connection message)))
 ;    (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
 ;                                 :remote-address remote-address
@@ -306,7 +306,7 @@
 ;    (let* ((user (find-user (connection message) (source message)))
 ;           (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)))
 ;      (let ((dcc-connection (make-dcc-connection :user user
--- /project/cl-irc/cvsroot/cl-irc/protocol.lisp	2006/01/23 23:49:01	1.27
+++ /project/cl-irc/cvsroot/cl-irc/protocol.lisp	2006/01/24 22:10:58	1.28
@@ -1,4 +1,4 @@
-;;;; $Id: protocol.lisp,v 1.27 2006/01/23 23:49:01 ehuelsmann Exp $
+;;;; $Id: protocol.lisp,v 1.28 2006/01/24 22:10:58 ehuelsmann Exp $
 ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/protocol.lisp,v $
 
 ;;;; See LICENSE for licensing information.
@@ -400,7 +400,7 @@
                                  (output-stream t))
   (make-instance 'dcc-connection
                  :user user
-                 :stream (socket-stream remote-address remote-port)
+                 :stream (socket-connect remote-address remote-port)
                  :output-stream output-stream))
 
 (defgeneric dcc-close (connection))
--- /project/cl-irc/cvsroot/cl-irc/utility.lisp	2005/10/03 14:11:02	1.8
+++ /project/cl-irc/cvsroot/cl-irc/utility.lisp	2006/01/24 22:10:58	1.9
@@ -1,4 +1,4 @@
-;;;; $Id: utility.lisp,v 1.8 2005/10/03 14:11:02 afuchs Exp $
+;;;; $Id: utility.lisp,v 1.9 2006/01/24 22:10:58 ehuelsmann Exp $
 ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/utility.lisp,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -106,39 +106,9 @@
         (fourth (ldb (byte 8 0) integer)))
     (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))
 
 
 (defun cut-between (string start-char end-chars &key (start 0) (cut-extra t))




More information about the cl-irc-cvs mailing list