usocket-cvs July 2008

usocket-cvs@common-lisp.net

2 participants
52 discussions

[usocket-cvs] r411 - usocket/branches/0.4.x
by ehuelsmann＠common-lisp.net 31 Jul '08

31 Jul '08

Author: ehuelsmann Date: Thu Jul 31 02:18:31 2008 New Revision: 411 Added: usocket/branches/0.4.x/ - copied from r410, usocket/trunk/ Log: Re-branch.

1 0

[usocket-cvs] r410 - usocket/branches/0.4.x
by ehuelsmann＠common-lisp.net 31 Jul '08

31 Jul '08

Author: ehuelsmann Date: Thu Jul 31 02:17:53 2008 New Revision: 410 Removed: usocket/branches/0.4.x/ Log: Delete for re-branching.

1 0

[usocket-cvs] r409 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 31 Jul '08

31 Jul '08

Author: ehuelsmann Date: Thu Jul 31 01:50:06 2008 New Revision: 409 Modified: usocket/trunk/backend/armedbear.lisp Log: ABCL fixes for getting socket names. Modified: usocket/trunk/backend/armedbear.lisp ============================================================================== --- usocket/trunk/backend/armedbear.lisp (original) +++ usocket/trunk/backend/armedbear.lisp Thu Jul 31 01:50:06 2008 @@ -275,16 +275,24 @@ (close (socket-stream usocket)))) (defmethod get-local-address ((usocket usocket)) - (dotted-quad-to-vector-quad (ext:socket-local-address (socket usocket)))) + (dotted-quad-to-vector-quad (ext:socket-local-address + (jdi:jop-deref + (jdi:do-jmethod-call (socket usocket) + "socket"))))) (defmethod get-peer-address ((usocket stream-usocket)) - (dotted-quad-to-vector-quad (ext:socket-peer-address (socket usocket)))) + (dotted-quad-to-vector-quad (ext:socket-peer-address + (jdi:jop-deref + (jdi:do-jmethod-call (socket usocket) + "socket"))))) (defmethod get-local-port ((usocket usocket)) - (ext:socket-local-port (socket usocket))) + (ext:socket-local-port (jdi:jop-deref + (jdi:do-jmethod-call (socket usocket) "socket")))) (defmethod get-peer-port ((usocket stream-usocket)) - (ext:socket-peer-port (socket usocket))) + (ext:socket-peer-port (jdi:jop-deref + (jdi:do-jmethod-call (socket usocket) "socket")))) (defmethod get-local-name ((usocket usocket)) (values (get-local-address usocket)

1 0

[usocket-cvs] r408 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 30 Jul '08

30 Jul '08

Author: ehuelsmann Date: Wed Jul 30 18:57:42 2008 New Revision: 408 Modified: usocket/trunk/backend/sbcl.lisp Log: Revert too much added in the last commit. Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Wed Jul 30 18:57:42 2008 @@ -61,9 +61,6 @@ "#define CONS(x, y) make_cons((x), (y))" "#define MAKE_INTEGER(x) make_integer((x))") - (defconstant sb-bsd-sockets::sockopt-tcp-nodelay (sockopt-tcp-nodelay)) - (export sb-bsd-sockets::sockopt-tcp-nodelay) - (defun fd-setsize () (ffi:c-inline () () :fixnum "FD_SETSIZE" :one-liner t))

1 0

[usocket-cvs] r407 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 30 Jul '08

30 Jul '08

Author: ehuelsmann Date: Wed Jul 30 18:56:07 2008 New Revision: 407 Modified: usocket/trunk/backend/sbcl.lisp Log: Fix SBCL and ECL compilation. Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Wed Jul 30 18:56:07 2008 @@ -37,6 +37,7 @@ #+ecl (progn + #-:wsock (ffi:clines "#include <errno.h>" @@ -60,6 +61,9 @@ "#define CONS(x, y) make_cons((x), (y))" "#define MAKE_INTEGER(x) make_integer((x))") + (defconstant sb-bsd-sockets::sockopt-tcp-nodelay (sockopt-tcp-nodelay)) + (export sb-bsd-sockets::sockopt-tcp-nodelay) + (defun fd-setsize () (ffi:c-inline () () :fixnum "FD_SETSIZE" :one-liner t)) @@ -204,6 +208,9 @@ local-host local-port) (when deadline (unsupported 'deadline 'socket-connect)) (when timeout (unsupported 'timeout 'socket-connect)) + (when (and nodelay-specified + (not (fboundp 'sb-bsd-sockets::sockopt-tcp-nodelay))) + (unsupported 'nodelay 'socket-connect)) (let* ((socket (make-instance 'sb-bsd-sockets:inet-socket :type :stream :protocol :tcp)) @@ -215,11 +222,14 @@ ;;###FIXME: The above line probably needs an :external-format (usocket (make-stream-socket :stream stream :socket socket)) (ip (host-to-vector-quad host))) - (when nodelay-specified + (when (and nodelay-specified + (fboundp 'sb-bsd-sockets::sockopt-tcp-nodelay)) (setf (sb-bsd-sockets:sockopt-tcp-nodelay socket) nodelay)) (when (or local-host local-port) - (sb-bsd-sockets:bind socket (host-to-vector-quad (or local-host *wildcard-host*)) - (or local-port *auto-port*))) + (sb-bsd-sockets:socket-bind socket + (host-to-vector-quad + (or local-host *wildcard-host*)) + (or local-port *auto-port*))) (with-mapped-conditions (usocket) (sb-bsd-sockets:socket-connect socket ip port)) usocket))

1 0

[usocket-cvs] r406 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 30 Jul '08

30 Jul '08

Author: ehuelsmann Date: Wed Jul 30 16:56:49 2008 New Revision: 406 Modified: usocket/trunk/backend/lispworks.lisp Log: Fix LispWorks local-host/-port. Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Wed Jul 30 16:56:49 2008 @@ -74,17 +74,18 @@ (raise-usock-err errno socket condition))))) (defun socket-connect (host port &key (element-type 'base-char) - timeout deadline (nodelay t nodelay-specified)) + timeout deadline (nodelay t nodelay-specified) + local-host local-port) (declare (ignorable nodelay)) (when timeout (unimplemented 'timeout 'socket-connect)) - (when deadline (unsupported 'deadline 'socket-connect "LispWorks 5.1")) + (when deadline (unsupported 'deadline 'socket-connect :minimum "LispWorks 5.1")) #+(and (not lispworks4) (not lispworks5.0)) (when nodelay-specified (unimplemented 'nodelay 'socket-connect)) #+lispworks4 (when (or local-host local-port) - (unsupported 'local-host 'socket-connect "LispWorks 5.0+ (verified)") - (unsupported 'local-port 'socket-connect "LispWorks 5.0+ (verified)")) + (unsupported 'local-host 'socket-connect :minimum "LispWorks 5.0+ (verified)") + (unsupported 'local-port 'socket-connect :minimum "LispWorks 5.0+ (verified)")) (let ((hostname (host-to-hostname host)) (stream)) @@ -110,9 +111,9 @@ (backlog 5) (element-type 'base-char)) #+lispworks4.1 - (unsupported 'host 'socket-listen "LispWorks 4.0 or newer than 4.1") + (unsupported 'host 'socket-listen :minimum "LispWorks 4.0 or newer than 4.1") #+lispworks4.1 - (unsupported 'backlog 'socket-listen "LispWorks 4.0 or newer than 4.1") + (unsupported 'backlog 'socket-listen :minimum "LispWorks 4.0 or newer than 4.1") (let* ((reuseaddress (if reuse-address-supplied-p reuse-address reuseaddress)) (comm::*use_so_reuseaddr* reuseaddress)

1 0

[usocket-cvs] r405 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 30 Jul '08

30 Jul '08

Author: ehuelsmann Date: Wed Jul 30 15:26:46 2008 New Revision: 405 Modified: usocket/trunk/backend/allegro.lisp usocket/trunk/backend/armedbear.lisp usocket/trunk/backend/clisp.lisp usocket/trunk/backend/cmucl.lisp usocket/trunk/backend/lispworks.lisp usocket/trunk/backend/openmcl.lisp usocket/trunk/backend/sbcl.lisp usocket/trunk/backend/scl.lisp Log: Implement local-host and local-port binding for SOCKET-CONNECT. Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Wed Jul 30 15:26:46 2008 @@ -51,7 +51,8 @@ (defun socket-connect (host port &key (element-type 'character) timeout deadline - (nodelay t)) ;; nodelay == t is the ACL default + (nodelay t) ;; nodelay == t is the ACL default + local-host local-port) (when timeout (unsupported 'timeout 'socket-connect)) (when deadline (unsupported 'deadline 'socket-connect)) @@ -62,10 +63,14 @@ (mp:with-timeout (timeout nil) (socket:make-socket :remote-host (host-to-hostname host) :remote-port port + :local-host (when local-host (host-to-hostname local-host)) + :local-port local-port :format (to-format element-type) :nodelay nodelay)) (socket:make-socket :remote-host (host-to-hostname host) :remote-port port + :local-host local-host + :local-port local-port :format (to-format element-type) :nodelay nodelay)))) (make-stream-socket :socket socket :stream socket))) Modified: usocket/trunk/backend/armedbear.lisp ============================================================================== --- usocket/trunk/backend/armedbear.lisp (original) +++ usocket/trunk/backend/armedbear.lisp Wed Jul 30 15:26:46 2008 @@ -187,8 +187,12 @@ (error (error 'unknown-error :socket socket :real-error condition)))) (defun socket-connect (host port &key (element-type 'character) - timeout deadline (nodelay nil nodelay-specified)) + timeout deadline (nodelay nil nodelay-specified) + local-host local-port) (when deadline (unsupported 'deadline 'socket-connect)) + (when (or local-host local-port) + (unimplemented 'local-host 'socket-connect) + (unimplemented 'local-port 'socket-connect)) (let ((usock)) (with-mapped-conditions (usock) Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Wed Jul 30 15:26:46 2008 @@ -56,11 +56,15 @@ (signal usock-err :socket socket))))))) (defun socket-connect (host port &key (element-type 'character) - timeout deadline (nodelay t nodelay-specified)) + timeout deadline (nodelay t nodelay-specified) + local-host local-port) (declare (ignore nodelay)) (when timeout (unsupported 'timeout 'socket-connect)) (when deadline (unsupported 'deadline 'socket-connect)) (when nodelay-specified (unsupported 'nodelay 'socket-connect)) + (when (or local-host local-port) + (unsupported 'local-host 'socket-connect) + (unsupported 'local-port 'socket-connect)) (let ((socket) (hostname (host-to-hostname host))) Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Wed Jul 30 15:26:46 2008 @@ -51,11 +51,15 @@ :condition condition)))) (defun socket-connect (host port &key (element-type 'character) - timeout deadline (nodelay t nodelay-specified)) + timeout deadline (nodelay t nodelay-specified) + local-host local-port) (declare (ignore nodelay)) (when timeout (unsupported 'timeout 'socket-connect)) (when deadline (unsupported 'deadline 'socket-connect)) (when nodelay-specified (unsupported 'nodelay 'socket-connect)) + (when (or local-host local-port) + (unsupported 'local-host 'socket-connect) + (unsupported 'local-port 'socket-connect)) (let* ((socket)) (setf socket Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Wed Jul 30 15:26:46 2008 @@ -81,6 +81,10 @@ #+(and (not lispworks4) (not lispworks5.0)) (when nodelay-specified (unimplemented 'nodelay 'socket-connect)) + #+lispworks4 + (when (or local-host local-port) + (unsupported 'local-host 'socket-connect "LispWorks 5.0+ (verified)") + (unsupported 'local-port 'socket-connect "LispWorks 5.0+ (verified)")) (let ((hostname (host-to-hostname host)) (stream)) @@ -88,6 +92,10 @@ (with-mapped-conditions () (comm:open-tcp-stream hostname port :element-type element-type + #-lispworks4 #-lispworks4 + #-lispworks4 #-lispworks4 + :local-address (when local-host (host-to-hostname local-host)) + :local-port local-port #+(and (not lispworks4) (not lispworks5.0)) #+(and (not lispworks4) (not lispworks5.0)) :nodelay nodelay))) Modified: usocket/trunk/backend/openmcl.lisp ============================================================================== --- usocket/trunk/backend/openmcl.lisp (original) +++ usocket/trunk/backend/openmcl.lisp Wed Jul 30 15:26:46 2008 @@ -74,11 +74,14 @@ :text :binary)) -(defun socket-connect (host port &key (element-type 'character) timeout deadline nodelay) +(defun socket-connect (host port &key (element-type 'character) timeout deadline nodelay + local-host local-port) (with-mapped-conditions () (let ((mcl-sock (openmcl-socket:make-socket :remote-host (host-to-hostname host) :remote-port port + :local-host (when local-host (host-to-hostname local-host)) + :local-port local-port :format (to-format element-type) :deadline deadline :nodelay nodelay Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Wed Jul 30 15:26:46 2008 @@ -200,7 +200,8 @@ (defun socket-connect (host port &key (element-type 'character) - timeout deadline (nodelay t nodelay-specified)) + timeout deadline (nodelay t nodelay-specified) + local-host local-port) (when deadline (unsupported 'deadline 'socket-connect)) (when timeout (unsupported 'timeout 'socket-connect)) @@ -216,6 +217,9 @@ (ip (host-to-vector-quad host))) (when nodelay-specified (setf (sb-bsd-sockets:sockopt-tcp-nodelay socket) nodelay)) + (when (or local-host local-port) + (sb-bsd-sockets:bind socket (host-to-vector-quad (or local-host *wildcard-host*)) + (or local-port *auto-port*))) (with-mapped-conditions (usocket) (sb-bsd-sockets:socket-connect socket ip port)) usocket)) Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Wed Jul 30 15:26:46 2008 @@ -29,11 +29,15 @@ :condition condition)))) (defun socket-connect (host port &key (element-type 'character) - timeout deadline (nodelay t nodelay-specified)) + timeout deadline (nodelay t nodelay-specified) + local-host local-port) (declare (ignore nodelay)) (when nodelay-specified (unsupported 'nodelay 'socket-connect)) (when deadline (unsupported 'deadline 'socket-connect)) (when timeout (unsupported 'timeout 'socket-connect)) + (when (or local-host local-port) + (unsupported 'local-host 'socket-connect) + (unsupported 'local-port 'socket-connect)) (let* ((socket (with-mapped-conditions () (ext:connect-to-inet-socket (host-to-hbo host) port

1 0

[usocket-cvs] r404 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 29 Jul '08

29 Jul '08

Author: ehuelsmann Date: Tue Jul 29 17:18:10 2008 New Revision: 404 Modified: usocket/trunk/backend/armedbear.lisp Log: Remove invalid IGNORE declaration. Modified: usocket/trunk/backend/armedbear.lisp ============================================================================== --- usocket/trunk/backend/armedbear.lisp (original) +++ usocket/trunk/backend/armedbear.lisp Tue Jul 29 17:18:10 2008 @@ -188,7 +188,6 @@ (defun socket-connect (host port &key (element-type 'character) timeout deadline (nodelay nil nodelay-specified)) - (declare (ignore nodelay timeout)) (when deadline (unsupported 'deadline 'socket-connect)) (let ((usock))

1 0

[usocket-cvs] r403 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 29 Jul '08

29 Jul '08

Author: ehuelsmann Date: Tue Jul 29 17:13:43 2008 New Revision: 403 Modified: usocket/trunk/backend/allegro.lisp usocket/trunk/backend/armedbear.lisp usocket/trunk/backend/clisp.lisp usocket/trunk/backend/cmucl.lisp usocket/trunk/backend/lispworks.lisp usocket/trunk/backend/sbcl.lisp usocket/trunk/backend/scl.lisp Log: Make reporting of unimplemented and unsupported features dependent on their use. Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Tue Jul 29 17:13:43 2008 @@ -52,9 +52,8 @@ (defun socket-connect (host port &key (element-type 'character) timeout deadline (nodelay t)) ;; nodelay == t is the ACL default - (declare (ignorable timeout)) - (unsupported 'timeout 'socket-connect) - (unsupported 'deadline 'socket-connect) + (when timeout (unsupported 'timeout 'socket-connect)) + (when deadline (unsupported 'deadline 'socket-connect)) (let ((socket)) (setf socket Modified: usocket/trunk/backend/armedbear.lisp ============================================================================== --- usocket/trunk/backend/armedbear.lisp (original) +++ usocket/trunk/backend/armedbear.lisp Tue Jul 29 17:13:43 2008 @@ -189,8 +189,7 @@ (defun socket-connect (host port &key (element-type 'character) timeout deadline (nodelay nil nodelay-specified)) (declare (ignore nodelay timeout)) - (unsupported 'timeout 'socket-connect) - (unimplemented 'deadline 'socket-connect) + (when deadline (unsupported 'deadline 'socket-connect)) (let ((usock)) (with-mapped-conditions (usock) @@ -207,6 +206,9 @@ (if nodelay (java:make-immediate-object t :boolean) (java:make-immediate-object nil :boolean)))) + (when timeout + (jdi:do-jmethod-call sock "setSoTimeout" + (truncate (* 1000 timeout)))) (setf usock (make-stream-socket :socket jchan Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Tue Jul 29 17:13:43 2008 @@ -56,11 +56,11 @@ (signal usock-err :socket socket))))))) (defun socket-connect (host port &key (element-type 'character) - timeout deadline nodelay) - (declare (ignore nodelay timeout)) - (unsupported 'timeout 'socket-connect) - (unsupported 'deadline 'socket-connect) - (unsupported 'nodelay 'socket-connect) + timeout deadline (nodelay t nodelay-specified)) + (declare (ignore nodelay)) + (when timeout (unsupported 'timeout 'socket-connect)) + (when deadline (unsupported 'deadline 'socket-connect)) + (when nodelay-specified (unsupported 'nodelay 'socket-connect)) (let ((socket) (hostname (host-to-hostname host))) Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Tue Jul 29 17:13:43 2008 @@ -51,11 +51,11 @@ :condition condition)))) (defun socket-connect (host port &key (element-type 'character) - timeout deadline nodelay) - (declare (ignore nodelay timeout)) - (unsupported 'timeout 'socket-connect) - (unsupported 'deadline 'socket-connect) - (unsupported 'nodelay 'socket-connect) + timeout deadline (nodelay t nodelay-specified)) + (declare (ignore nodelay)) + (when timeout (unsupported 'timeout 'socket-connect)) + (when deadline (unsupported 'deadline 'socket-connect)) + (when nodelay-specified (unsupported 'nodelay 'socket-connect)) (let* ((socket)) (setf socket Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Tue Jul 29 17:13:43 2008 @@ -74,17 +74,23 @@ (raise-usock-err errno socket condition))))) (defun socket-connect (host port &key (element-type 'base-char) - timeout deadline nodelay) - (declare (ignore nodelay)) - (unsupported 'timeout 'socket-connect) - (unsupported 'deadline 'socket-connect) - (unimplemented 'nodelay 'socket-connect) + timeout deadline (nodelay t nodelay-specified)) + (declare (ignorable nodelay)) + (when timeout (unimplemented 'timeout 'socket-connect)) + (when deadline (unsupported 'deadline 'socket-connect "LispWorks 5.1")) + + #+(and (not lispworks4) (not lispworks5.0)) + (when nodelay-specified (unimplemented 'nodelay 'socket-connect)) + (let ((hostname (host-to-hostname host)) (stream)) (setf stream (with-mapped-conditions () (comm:open-tcp-stream hostname port - :element-type element-type))) + :element-type element-type + #+(and (not lispworks4) (not lispworks5.0)) + #+(and (not lispworks4) (not lispworks5.0)) + :nodelay nodelay))) (if stream (make-stream-socket :socket (comm:socket-stream-socket stream) :stream stream) @@ -96,9 +102,10 @@ (backlog 5) (element-type 'base-char)) #+lispworks4.1 - (unsupported 'host 'socket-listen) + (unsupported 'host 'socket-listen "LispWorks 4.0 or newer than 4.1") #+lispworks4.1 - (unsupported 'backlog 'socket-listen) + (unsupported 'backlog 'socket-listen "LispWorks 4.0 or newer than 4.1") + (let* ((reuseaddress (if reuse-address-supplied-p reuse-address reuseaddress)) (comm::*use_so_reuseaddr* reuseaddress) (hostname (host-to-hostname host)) Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Tue Jul 29 17:13:43 2008 @@ -201,9 +201,8 @@ (defun socket-connect (host port &key (element-type 'character) timeout deadline (nodelay t nodelay-specified)) - (declare (ignore deadline timeout)) - (unsupported 'deadline 'socket-connect) - (unsupported 'timeout 'socket-connect) + (when deadline (unsupported 'deadline 'socket-connect)) + (when timeout (unsupported 'timeout 'socket-connect)) (let* ((socket (make-instance 'sb-bsd-sockets:inet-socket :type :stream :protocol :tcp)) Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Tue Jul 29 17:13:43 2008 @@ -29,11 +29,11 @@ :condition condition)))) (defun socket-connect (host port &key (element-type 'character) - timeout deadline nodelay) - (declare (ignore nodelay timeout)) - (unsupported 'nodelay 'socket-connect) - (unsupported 'deadline 'socket-connect) - (unsupported 'timeout 'socket-connect) + timeout deadline (nodelay t nodelay-specified)) + (declare (ignore nodelay)) + (when nodelay-specified (unsupported 'nodelay 'socket-connect)) + (when deadline (unsupported 'deadline 'socket-connect)) + (when timeout (unsupported 'timeout 'socket-connect)) (let* ((socket (with-mapped-conditions () (ext:connect-to-inet-socket (host-to-hbo host) port

1 0

[usocket-cvs] r402 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 29 Jul '08

29 Jul '08

Author: ehuelsmann Date: Tue Jul 29 02:08:34 2008 New Revision: 402 Modified: usocket/trunk/backend/allegro.lisp usocket/trunk/backend/clisp.lisp usocket/trunk/backend/cmucl.lisp usocket/trunk/backend/lispworks.lisp usocket/trunk/backend/scl.lisp Log: Add DEADLINE everywhere. Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Tue Jul 29 02:08:34 2008 @@ -49,10 +49,12 @@ :text :binary)) -(defun socket-connect (host port &key (element-type 'character) timeout +(defun socket-connect (host port &key (element-type 'character) + timeout deadline (nodelay t)) ;; nodelay == t is the ACL default (declare (ignorable timeout)) (unsupported 'timeout 'socket-connect) + (unsupported 'deadline 'socket-connect) (let ((socket)) (setf socket Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Tue Jul 29 02:08:34 2008 @@ -55,10 +55,12 @@ (error usock-err :socket socket) (signal usock-err :socket socket))))))) -(defun socket-connect (host port &key (element-type 'character) timeout nodelay) +(defun socket-connect (host port &key (element-type 'character) + timeout deadline nodelay) (declare (ignore nodelay timeout)) - (unsupported 'nodelay 'socket-connect) (unsupported 'timeout 'socket-connect) + (unsupported 'deadline 'socket-connect) + (unsupported 'nodelay 'socket-connect) (let ((socket) (hostname (host-to-hostname host))) Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Tue Jul 29 02:08:34 2008 @@ -50,10 +50,12 @@ :socket socket :condition condition)))) -(defun socket-connect (host port &key (element-type 'character) timeout nodelay) +(defun socket-connect (host port &key (element-type 'character) + timeout deadline nodelay) (declare (ignore nodelay timeout)) - (unsupported 'nodelay 'socket-connect) (unsupported 'timeout 'socket-connect) + (unsupported 'deadline 'socket-connect) + (unsupported 'nodelay 'socket-connect) (let* ((socket)) (setf socket Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Tue Jul 29 02:08:34 2008 @@ -73,9 +73,11 @@ (declare (ignore host port err-msg)) (raise-usock-err errno socket condition))))) -(defun socket-connect (host port &key (element-type 'base-char) timeout nodelay) +(defun socket-connect (host port &key (element-type 'base-char) + timeout deadline nodelay) (declare (ignore nodelay)) (unsupported 'timeout 'socket-connect) + (unsupported 'deadline 'socket-connect) (unimplemented 'nodelay 'socket-connect) (let ((hostname (host-to-hostname host)) (stream)) Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Tue Jul 29 02:08:34 2008 @@ -28,9 +28,11 @@ :socket socket :condition condition)))) -(defun socket-connect (host port &key (element-type 'character) timeout nodelay) +(defun socket-connect (host port &key (element-type 'character) + timeout deadline nodelay) (declare (ignore nodelay timeout)) (unsupported 'nodelay 'socket-connect) + (unsupported 'deadline 'socket-connect) (unsupported 'timeout 'socket-connect) (let* ((socket (with-mapped-conditions ()

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

usocket-cvs July 2008