October 2008 - usocket-cvs@common-lisp.net

[usocket-cvs] r472 - usocket/branches/experimental-udp/backend
by Chun Tian 31 Oct '08

31 Oct '08

Author: ctian Date: Fri Oct 31 17:16:35 2008 New Revision: 472 Log: [udp] bugfix for SCL. Modified: usocket/branches/experimental-udp/backend/scl.lisp Modified: usocket/branches/experimental-udp/backend/scl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/scl.lisp (original) +++ usocket/branches/experimental-udp/backend/scl.lisp Fri Oct 31 17:16:35 2008 @@ -22,11 +22,11 @@ (defun handle-condition (condition &optional (socket nil)) "Dispatch correct usocket condition." - (etypecase condition + (typecase condition (ext::socket-error (scl-map-socket-error (ext::socket-errno condition) - :socket socket - :condition condition)))) + :socket socket + :condition condition)))) (defun socket-connect (host port &key (protocol :stream) (element-type 'character) timeout deadline (nodelay t nodelay-specified) @@ -48,7 +48,8 @@ (:stream (setf socket (let ((args (list (host-to-hbo host) port :kind protocol))) (when (and patch-udp-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args)))) @@ -76,7 +77,7 @@ (ext:create-inet-listener (or local-port 0) protocol :host (when local-host - (if (ip= host *wildcard-host*) + (if (ip= local-host *wildcard-host*) 0 (host-to-hbo local-host))))) (with-mapped-conditions ()

1 0

[usocket-cvs] r471 - usocket/branches/experimental-udp/backend
by Chun Tian 28 Oct '08

28 Oct '08

Author: ctian Date: Tue Oct 28 12:02:38 2008 New Revision: 471 Log: [bugfix] merge from trunk (r469) Modified: usocket/branches/experimental-udp/backend/cmucl.lisp usocket/branches/experimental-udp/backend/scl.lisp Modified: usocket/branches/experimental-udp/backend/cmucl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/cmucl.lisp (original) +++ usocket/branches/experimental-udp/backend/cmucl.lisp Tue Oct 28 12:02:38 2008 @@ -71,7 +71,8 @@ (setf socket (let ((args (list (host-to-hbo host) port protocol))) (when (and local-bind-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args)))) @@ -90,7 +91,8 @@ (if (and host port) (let ((args (list (host-to-hbo host) port protocol))) (when (and local-bind-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args))) Modified: usocket/branches/experimental-udp/backend/scl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/scl.lisp (original) +++ usocket/branches/experimental-udp/backend/scl.lisp Tue Oct 28 12:02:38 2008 @@ -66,7 +66,8 @@ (if (and host port) (let ((args (list (host-to-hbo host) port :kind protocol))) (when (and patch-udp-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args))) @@ -74,9 +75,10 @@ (with-mapped-conditions () (ext:create-inet-listener (or local-port 0) protocol - :host (if (ip= host *wildcard-host*) - 0 - (host-to-hbo local-host)))) + :host (when local-host + (if (ip= host *wildcard-host*) + 0 + (host-to-hbo local-host))))) (with-mapped-conditions () (ext:create-inet-socket protocol))))) (let ((usocket (make-datagram-socket socket)))

1 0

[usocket-cvs] r470 - usocket/branches/0.4.x/backend
by Chun Tian 28 Oct '08

28 Oct '08

Author: ctian Date: Tue Oct 28 12:02:01 2008 New Revision: 470 Log: [bugfix] merge from trunk (r469) Modified: usocket/branches/0.4.x/backend/cmucl.lisp usocket/branches/0.4.x/backend/scl.lisp Modified: usocket/branches/0.4.x/backend/cmucl.lisp ============================================================================== --- usocket/branches/0.4.x/backend/cmucl.lisp (original) +++ usocket/branches/0.4.x/backend/cmucl.lisp Tue Oct 28 12:02:01 2008 @@ -69,7 +69,9 @@ (setf socket (let ((args (list (host-to-hbo host) port :stream))) (when (and local-bind-p (or local-host-p local-port-p)) - (nconc args (list :local-host local-host :local-port local-port))) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) + :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args)))) (if socket Modified: usocket/branches/0.4.x/backend/scl.lisp ============================================================================== --- usocket/branches/0.4.x/backend/scl.lisp (original) +++ usocket/branches/0.4.x/backend/scl.lisp Tue Oct 28 12:02:01 2008 @@ -22,11 +22,11 @@ (defun handle-condition (condition &optional (socket nil)) "Dispatch correct usocket condition." - (etypecase condition + (typecase condition (ext::socket-error (scl-map-socket-error (ext::socket-errno condition) - :socket socket - :condition condition)))) + :socket socket + :condition condition)))) (defun socket-connect (host port &key (element-type 'character) timeout deadline (nodelay t nodelay-specified) @@ -45,7 +45,8 @@ (let* ((socket (let ((args (list (host-to-hbo host) port :kind :stream))) (when (and patch-udp-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions () (apply #'ext:connect-to-inet-socket args))))

1 0

[usocket-cvs] r469 - usocket/trunk/backend
by Chun Tian 28 Oct '08

28 Oct '08

Author: ctian Date: Tue Oct 28 12:00:38 2008 New Revision: 469 Log: bugfix: ETYPECASE in HANDLE-CONDITION (SCL) should be TYPECASE, Call HOST-TO-HBO should detect NULL first. Modified: usocket/trunk/backend/cmucl.lisp usocket/trunk/backend/scl.lisp Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Tue Oct 28 12:00:38 2008 @@ -69,7 +69,9 @@ (setf socket (let ((args (list (host-to-hbo host) port :stream))) (when (and local-bind-p (or local-host-p local-port-p)) - (nconc args (list :local-host local-host :local-port local-port))) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) + :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args)))) (if socket Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Tue Oct 28 12:00:38 2008 @@ -22,11 +22,11 @@ (defun handle-condition (condition &optional (socket nil)) "Dispatch correct usocket condition." - (etypecase condition + (typecase condition (ext::socket-error (scl-map-socket-error (ext::socket-errno condition) - :socket socket - :condition condition)))) + :socket socket + :condition condition)))) (defun socket-connect (host port &key (element-type 'character) timeout deadline (nodelay t nodelay-specified) @@ -45,7 +45,8 @@ (let* ((socket (let ((args (list (host-to-hbo host) port :kind :stream))) (when (and patch-udp-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions () (apply #'ext:connect-to-inet-socket args))))

1 0

[usocket-cvs] r468 - usocket/branches/experimental-udp/backend
by Chun Tian 28 Oct '08

28 Oct '08

Author: ctian Date: Tue Oct 28 10:37:24 2008 New Revision: 468 Log: [udp] merge from trunk and limit format of datagram to :binary Modified: usocket/branches/experimental-udp/backend/openmcl.lisp Modified: usocket/branches/experimental-udp/backend/openmcl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/openmcl.lisp (original) +++ usocket/branches/experimental-udp/backend/openmcl.lisp Tue Oct 28 10:37:24 2008 @@ -81,9 +81,9 @@ (ecase protocol (:stream (let ((mcl-sock - (openmcl-socket:make-socket :remote-host (host-to-hbo host) + (openmcl-socket:make-socket :remote-host (host-to-hostname host) :remote-port port - :local-host (host-to-hbo local-host) + :local-host (when local-host (host-to-hostname local-host)) :local-port local-port :format (to-format element-type) :deadline deadline @@ -96,8 +96,9 @@ (let ((mcl-sock (openmcl-socket:make-socket :address-family :internet :type :datagram - :local-host (host-to-hbo local-host) - :local-port local-port))) + :local-host (when local-host (host-to-hostname local-host)) + :local-port local-port + :format :binary))) (when (and host port) (ccl::inet-connect (ccl::socket-device mcl-sock) (ccl::host-as-inet-host host)

1 0

[usocket-cvs] r467 - usocket/branches/experimental-udp
by Chun Tian 28 Oct '08

28 Oct '08

Author: ctian Date: Tue Oct 28 07:00:59 2008 New Revision: 467 Log: [udp] cancel unused ELEMENT-TYPE keyword in SOCKET-SERVER Modified: usocket/branches/experimental-udp/server.lisp Modified: usocket/branches/experimental-udp/server.lisp ============================================================================== --- usocket/branches/experimental-udp/server.lisp (original) +++ usocket/branches/experimental-udp/server.lisp Tue Oct 28 07:00:59 2008 @@ -7,7 +7,7 @@ (defvar *remote-port*) (defun socket-server (host port function &optional arguments - &key (element-type '(unsigned-byte 8)) (timeout 1) + &key (timeout 1) (max-buffer-size +max-datagram-packet-size+)) (let ((socket (socket-connect nil nil :protocol :datagram

1 0

[usocket-cvs] r466 - usocket/branches/experimental-udp
by Chun Tian 28 Oct '08

28 Oct '08

Author: ctian Date: Tue Oct 28 06:47:42 2008 New Revision: 466 Log: [udp] more code change to match the API change on SOCKET-SEND Modified: usocket/branches/experimental-udp/rtt-client.lisp usocket/branches/experimental-udp/server.lisp Modified: usocket/branches/experimental-udp/rtt-client.lisp ============================================================================== --- usocket/branches/experimental-udp/rtt-client.lisp (original) +++ usocket/branches/experimental-udp/rtt-client.lisp Tue Oct 28 06:47:42 2008 @@ -5,7 +5,7 @@ (defun default-rtt-function (message) (values message 0)) -(defmethod socket-sync ((socket datagram-usocket) message &key address port +(defmethod socket-sync ((socket datagram-usocket) message &key host port (max-receive-length +max-datagram-packet-size+) (encode-function #'default-rtt-function) (decode-function #'default-rtt-function)) @@ -18,7 +18,7 @@ and recv-seq = -1 and continue-p = t do (progn - (socket-send socket data data-length :address address :port port) + (socket-send socket data data-length :host host :port port) (multiple-value-bind (sockets real-time) (wait-for-input socket :timeout (rtt-start socket)) (declare (ignore sockets)) Modified: usocket/branches/experimental-udp/server.lisp ============================================================================== --- usocket/branches/experimental-udp/server.lisp (original) +++ usocket/branches/experimental-udp/server.lisp Tue Oct 28 06:47:42 2008 @@ -12,8 +12,7 @@ (let ((socket (socket-connect nil nil :protocol :datagram :local-host host - :local-port port - :element-type element-type)) + :local-port port)) (buffer (make-array max-buffer-size :element-type '(unsigned-byte 8) :initial-element 0))) @@ -34,7 +33,7 @@ (when reply (replace buffer reply) (let ((n (socket-send socket buffer (length reply) - :address *remote-host* + :host *remote-host* :port *remote-port*))) (when (minusp n) (error "send error: ~A~%" n))))))

1 0

[usocket-cvs] r465 - usocket/branches/experimental-udp/backend
by Chun Tian 28 Oct '08

28 Oct '08

Author: ctian Date: Tue Oct 28 05:58:15 2008 New Revision: 465 Log: [udp] SOCKET-SEND API Change: use keyword HOST instead of ADDRESS. Modified: usocket/branches/experimental-udp/backend/allegro.lisp usocket/branches/experimental-udp/backend/cmucl.lisp usocket/branches/experimental-udp/backend/lispworks.lisp usocket/branches/experimental-udp/backend/openmcl.lisp usocket/branches/experimental-udp/backend/sbcl.lisp usocket/branches/experimental-udp/backend/scl.lisp Modified: usocket/branches/experimental-udp/backend/allegro.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/allegro.lisp (original) +++ usocket/branches/experimental-udp/backend/allegro.lisp Tue Oct 28 05:58:15 2008 @@ -129,10 +129,10 @@ (socket:accept-connection (socket socket))))) (make-stream-socket :socket stream-sock :stream stream-sock))) -(defmethod socket-send ((socket datagram-usocket) buffer length &key address port) +(defmethod socket-send ((socket datagram-usocket) buffer length &key host port) (with-mapped-conditions (socket) (let ((s (socket socket))) - (socket:send-to s buffer length :remote-host address :remote-port port)))) + (socket:send-to s buffer length :remote-host host :remote-port port)))) (defmethod socket-receive ((socket datagram-usocket) buffer length) (with-mapped-conditions (socket) Modified: usocket/branches/experimental-udp/backend/cmucl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/cmucl.lisp (original) +++ usocket/branches/experimental-udp/backend/cmucl.lisp Tue Oct 28 05:58:15 2008 @@ -157,9 +157,9 @@ (defmethod socket-close :after ((socket datagram-usocket)) (setf (%open-p socket) nil)) -(defmethod socket-send ((usocket datagram-usocket) buffer length &key address port) +(defmethod socket-send ((usocket datagram-usocket) buffer length &key host port) (with-mapped-conditions (usocket) - (ext:inet-sendto (socket usocket) buffer length (if address (host-to-hbo address)) port))) + (ext:inet-sendto (socket usocket) buffer length (if host (host-to-hbo host)) port))) (defmethod socket-receive ((usocket datagram-usocket) buffer length) (let ((real-buffer (or buffer Modified: usocket/branches/experimental-udp/backend/lispworks.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/lispworks.lisp (original) +++ usocket/branches/experimental-udp/backend/lispworks.lisp Tue Oct 28 05:58:15 2008 @@ -371,9 +371,9 @@ (fli:dereference len))) (comm::%send socket-fd ptr (min length +max-datagram-packet-size+) 0))))))) -(defmethod socket-send ((socket datagram-usocket) buffer length &key address port) +(defmethod socket-send ((socket datagram-usocket) buffer length &key host port) (let ((s (socket socket))) - (send-message s buffer length (host-to-hbo address) port))) + (send-message s buffer length (host-to-hbo host) port))) (defvar *message-receive-buffer* (make-array +max-datagram-packet-size+ Modified: usocket/branches/experimental-udp/backend/openmcl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/openmcl.lisp (original) +++ usocket/branches/experimental-udp/backend/openmcl.lisp Tue Oct 28 05:58:15 2008 @@ -136,10 +136,10 @@ (with-mapped-conditions (usocket) (close (socket usocket)))) -(defmethod socket-send ((usocket datagram-usocket) buffer length &key address port) +(defmethod socket-send ((usocket datagram-usocket) buffer length &key host port) (with-mapped-conditions (usocket) (openmcl-socket:send-to (socket usocket) buffer length - :remote-host (host-to-hbo address) + :remote-host (host-to-hbo host) :remote-port port))) (defmethod socket-receive ((usocket datagram-usocket) buffer length) Modified: usocket/branches/experimental-udp/backend/sbcl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/sbcl.lisp (original) +++ usocket/branches/experimental-udp/backend/sbcl.lisp Tue Oct 28 05:58:15 2008 @@ -301,10 +301,10 @@ (with-mapped-conditions (usocket) (close (socket-stream usocket)))) -(defmethod socket-send ((socket datagram-usocket) buffer length &key address port) +(defmethod socket-send ((socket datagram-usocket) buffer length &key host port) (with-mapped-conditions (socket) (let* ((s (socket socket)) - (dest (if (and address port) (list (host-to-vector-quad address) port) nil))) + (dest (if (and host port) (list (host-to-vector-quad host) port) nil))) (sb-bsd-sockets:socket-send s buffer length :address dest)))) (defmethod socket-receive ((socket datagram-usocket) buffer length Modified: usocket/branches/experimental-udp/backend/scl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/scl.lisp (original) +++ usocket/branches/experimental-udp/backend/scl.lisp Tue Oct 28 05:58:15 2008 @@ -132,12 +132,12 @@ (defmethod socket-close :after ((socket datagram-usocket)) (setf (%open-p socket) nil)) -(defmethod socket-send ((socket datagram-usocket) buffer length &key address port) +(defmethod socket-send ((socket datagram-usocket) buffer length &key host port) (let ((s (socket socket)) - (address (if address (host-to-hbo address)))) + (host (if host (host-to-hbo host)))) (multiple-value-bind (result errno) (ext:inet-socket-send-to s buffer length - :remote-host address :remote-port port) + :remote-host host :remote-port port) (or result (scl-map-socket-error errno :socket socket)))))

1 0

[usocket-cvs] r464 - in public_html: . releases
by Erik Huelsmann 26 Oct '08

26 Oct '08

Author: ehuelsmann Date: Sun Oct 26 21:45:33 2008 New Revision: 464 Log: Publish 0.4.0 release. Added: public_html/releases/usocket-0.4.0.tar.gz (contents, props changed) public_html/releases/usocket-0.4.0.tar.gz.asc Modified: public_html/index.shtml Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Sun Oct 26 21:45:33 2008 @@ -281,15 +281,15 @@ </tr> <tr> <td>Implement api calls get- and setsockopt (or equivalent).</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> </tr> <tr> <td rowspan="2">Implement efficient waiting for multiple sockets @@ -362,15 +362,15 @@ </tr> <tr> <td>Build on top of that (or custom ffi).</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> - <td class="TODO">TODO</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> + <td class="WIP">WIP</td> </tr> </tbody> </table> @@ -392,9 +392,11 @@ <table> <caption>Release history</caption> <tr><th>Date</th><th>Release</th><th>Summary</th></tr> -<tr><td>Jun 28, 2008</td> - <td>0.3.7</td> - <td>Fix of OpenMCL (Closure CL) backend. </td></tr> +<tr><td>Oct 28, 2008</td> + <td><b>0.4.0</b></td> + <td><b>select()-like api</b>: make a single thread wait for multiple sockets.<br /> + <b>various socket options</b> for socket-creation with SOCKET-CONNECT. + </td></tr> <tr><td>Jun 21, 2008</td> <td>0.3.6</td> <td>Code fixups based on advice from the ECL and OpenMCL maintainers. Added: public_html/releases/usocket-0.4.0.tar.gz ============================================================================== Binary file. No diff available. Added: public_html/releases/usocket-0.4.0.tar.gz.asc ============================================================================== --- (empty file) +++ public_html/releases/usocket-0.4.0.tar.gz.asc Sun Oct 26 21:45:33 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQBJBOSvi5O0Epaz9TkRAn56AJ97E4i0TpEbfDySWNKibc2r5l41/wCcCn1O +aZteNAha3LUwhK6MkN0r5n0= +=ixRK +-----END PGP SIGNATURE-----

1 0

[usocket-cvs] r463 - usocket/tags/0.4.0/usocket-0.4.0-tag
by Erik Huelsmann 26 Oct '08

26 Oct '08

Author: ehuelsmann Date: Sun Oct 26 21:43:41 2008 New Revision: 463 Log: Fix error in release script. Removed: usocket/tags/0.4.0/usocket-0.4.0-tag/

1 0