From bd4335f8aae0d54db30524797fad02194311e17c Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 22 Sep 2006 17:47:39 +0000 Subject: [PATCH] r11204: 22 Sep 2006 Kevin Rosenberg * Version 1.90 * sockets.lisp: Commit patch from Joerg Hoehle for CLISP sockets --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ sockets.lisp | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 316e9c2..e7e2739 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +22 Sep 2006 Kevin Rosenberg + * Version 1.90 + * sockets.lisp: Commit patch from Joerg Hoehle for CLISP sockets + 04 Sep 2006 Kevin Rosenberg * Version 1.89 * kmrcl.asd, mop.lisp: Add support for CLISP MOP diff --git a/debian/changelog b/debian/changelog index 769b903..ca30ad1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-kmrcl (1.90-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Fri, 22 Sep 2006 11:46:17 -0600 + cl-kmrcl (1.89-1) unstable; urgency=low * New upstream diff --git a/sockets.lisp b/sockets.lisp index 2d9a8ff..74b4f36 100644 --- a/sockets.lisp +++ b/sockets.lisp @@ -104,7 +104,7 @@ setsockopt SO_REUSEADDR if :reuse is not nil" (defun close-passive-socket (socket) #+allegro (close socket) - #+clisp (close socket) + #+clisp (ext:socket-server-close socket) #+cmu (unix:unix-close socket) #+sbcl (sb-unix:unix-close (sb-bsd-sockets:socket-file-descriptor socket)) @@ -186,6 +186,9 @@ setsockopt SO_REUSEADDR if :reuse is not nil" (values (sys:make-fd-stream sock :input t :output t :element-type 'base-char) sock)) + #+clisp + (let ((sock (ext:socket-connect port server))) + (values sock sock)) #+openmcl (let ((sock (ccl:make-socket :remote-host server :remote-port port ))) (values sock sock)) @@ -203,6 +206,10 @@ setsockopt SO_REUSEADDR if :reuse is not nil" #+sbcl (ipaddr-array-to-dotted (nth-value 0 (sb-bsd-sockets:socket-peername socket))) #+cmu (nth-value 0 (ext:get-peer-host-and-port socket)) + #+clisp (let* ((peer (ext:socket-stream-peer socket t)) + (stop (position #\Space peer))) + ;; 2.37-2.39 had do-not-resolve-p backwards + (if stop (subseq peer 0 stop) peer)) #+openmcl (ccl:remote-host socket) ) -- 2.34.1