- usocket-cvs@common-lisp.net - mailman3.common-lisp.net

[usocket-cvs] r188 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 20 Jan '07

20 Jan '07

Author: ehuelsmann Date: Sat Jan 20 07:48:03 2007 New Revision: 188 Modified: usocket/trunk/backend/cmucl.lisp Log: Add last-minute :element-type specification for trivial-sockets compatibility. Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Sat Jan 20 07:48:03 2007 @@ -83,10 +83,11 @@ (host-to-hbo host))))))) (make-stream-server-socket server-sock :element-type element-type))) -(defmethod socket-accept ((usocket stream-server-usocket)) +(defmethod socket-accept ((usocket stream-server-usocket) &key element-type) (let* ((sock (ext:accept-tcp-connection (socket usocket))) (stream (sys:make-fd-stream sock :input t :output t - :element-type (element-type usocket) + :element-type (or element-type + (element-type usocket)) :buffering :full))) (make-stream-socket :socket sock :stream stream)))

1 0

[usocket-cvs] r187 - in usocket/trunk: . backend
by ehuelsmann＠common-lisp.net 20 Jan '07

20 Jan '07

Author: ehuelsmann Date: Sat Jan 20 07:45:20 2007 New Revision: 187 Modified: usocket/trunk/README usocket/trunk/backend/allegro.lisp usocket/trunk/backend/armedbear.lisp usocket/trunk/backend/clisp.lisp usocket/trunk/backend/lispworks.lisp usocket/trunk/backend/openmcl.lisp usocket/trunk/backend/sbcl.lisp usocket/trunk/backend/scl.lisp usocket/trunk/usocket.lisp Log: Add last-minute :element-type specification for trivial-sockets compatibility. Modified: usocket/trunk/README ============================================================================== --- usocket/trunk/README (original) +++ usocket/trunk/README Sat Jan 20 07:45:20 2007 @@ -70,7 +70,7 @@ socket-listen host port &key reuseaddress backlog element-type where `host' has the same definition as above - socket-accept (method) [ to create an active/connected socket ] - socket-accept socket + socket-accept socket &key element-type returns (server side) a connected socket derived from a listening/passive socket. - socket-close (method) Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Sat Jan 20 07:45:20 2007 @@ -74,7 +74,8 @@ (list :local-host host))))))) (make-stream-server-socket sock :element-type element-type))) -(defmethod socket-accept ((socket stream-server-usocket)) +(defmethod socket-accept ((socket stream-server-usocket) &key element-type) + (declare (ignore element-type)) ;; allegro streams are multivalent (let ((stream-sock (socket:accept-connection (socket socket)))) (make-stream-socket :socket stream-sock :stream stream-sock))) Modified: usocket/trunk/backend/armedbear.lisp ============================================================================== --- usocket/trunk/backend/armedbear.lisp (original) +++ usocket/trunk/backend/armedbear.lisp Sat Jan 20 07:45:20 2007 @@ -48,12 +48,13 @@ sock-addr backlog) (make-stream-server-socket sock :element-type element-type))) -(defmethod socket-accept ((socket stream-server-usocket)) +(defmethod socket-accept ((socket stream-server-usocket) &key element-type) (let* ((jsock (socket socket)) (jacc-sock (jmethod-call jsock ("accept"))) (jacc-stream (ext:get-socket-stream jacc-sock - :element-type (element-type socket)))) + :element-type (or element-type + (element-type socket))))) (make-stream-socket :socket jacc-sock :stream jacc-stream))) Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Sat Jan 20 07:45:20 2007 @@ -62,9 +62,11 @@ (list :interface host)))))) (make-stream-server-socket sock :element-type element-type))) -(defmethod socket-accept ((socket stream-server-usocket)) - (let ((stream (socket:socket-accept (socket socket) - :element-type (element-type socket)))) +(defmethod socket-accept ((socket stream-server-usocket) &key element-type) + (let ((stream + (socket:socket-accept (socket socket) + :element-type (or element-type + (element-type socket))))) (make-stream-socket :socket stream :stream stream))) Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Sat Jan 20 07:45:20 2007 @@ -67,12 +67,13 @@ #+lispworks4.1 (comm::create-tcp-socket-for-service port)))) (make-stream-server-socket sock :element-type element-type))) -(defmethod socket-accept ((usocket stream-server-usocket)) +(defmethod socket-accept ((usocket stream-server-usocket) &key element-type) (let* ((sock (comm::get-fd-from-socket (socket usocket))) (stream (make-instance 'comm:socket-stream :socket sock :direction :io - :element-type (element-type usocket)))) + :element-type (or element-type + (element-type usocket))))) (make-stream-socket :socket sock :stream stream))) (defmethod socket-close ((usocket stream-usocket)) Modified: usocket/trunk/backend/openmcl.lisp ============================================================================== --- usocket/trunk/backend/openmcl.lisp (original) +++ usocket/trunk/backend/openmcl.lisp Sat Jan 20 07:45:20 2007 @@ -68,7 +68,8 @@ (list :local-host host)))))) (make-stream-server-socket sock :element-type element-type))) -(defmethod socket-accept ((usocket stream-server-usocket)) +(defmethod socket-accept ((usocket stream-server-usocket) &key element-type) + (declare (ignore element-type)) ;; openmcl streams are bi/multivalent (let ((sock (openmcl-socket:accept-connection (socket usocket)))) (make-stream-socket :socket sock :stream sock))) Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Sat Jan 20 07:45:20 2007 @@ -94,12 +94,13 @@ (sb-bsd-sockets:socket-listen sock backlog) (make-stream-server-socket sock :element-type element-type))) -(defmethod socket-accept ((socket stream-server-usocket)) +(defmethod socket-accept ((socket stream-server-usocket) &key element-type) (let ((sock (sb-bsd-sockets:socket-accept (socket socket)))) (make-stream-socket :socket sock :stream (sb-bsd-sockets:socket-make-stream sock :input t :output t :buffering :full - :element-type (element-type socket))))) + :element-type (or element-type + (element-type socket)))))) (defmethod socket-close ((usocket usocket)) (with-mapped-conditions (usocket) Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Sat Jan 20 07:45:20 2007 @@ -54,10 +54,11 @@ :backlog backlog))) (make-stream-server-socket server-sock :element-type element-type))) -(defmethod socket-accept ((usocket stream-server-usocket)) +(defmethod socket-accept ((usocket stream-server-usocket) &key element-type) (let* ((sock (ext:accept-tcp-connection (socket usocket))) (stream (sys:make-fd-stream sock :input t :output t - :element-type (element-type usocket) + :element-type (or element-type + (element-type usocket)) :buffering :full))) (make-stream-socket :socket sock :stream stream))) Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Sat Jan 20 07:45:20 2007 @@ -271,7 +271,9 @@ ;; Documentation for the function ;; -;; (defun SOCKET-ACCEPT (socket &key element-type -;; buffered timeout) ..) +;; (defun SOCKET-ACCEPT (socket &key element-type) (setf (documentation 'socket-accept 'function) - "") + "Accepts a connection from `socket', returning a `stream-socket'. + +The stream associated with the socket returned has `element-type' when +explicitly specified, or the element-type passed to `socket-listen' otherwise.")

1 0

[usocket-cvs] r186 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 20 Jan '07

20 Jan '07

Author: ehuelsmann Date: Fri Jan 19 19:19:32 2007 New Revision: 186 Modified: usocket/trunk/backend/cmucl.lisp Log: Don't raise NIL as an error, return it instead. Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Fri Jan 19 19:19:32 2007 @@ -128,11 +128,14 @@ entry ;;###The constants below work on *most* OSes, but are defined as the ;; constants mentioned in C - (error - (second (assoc errno '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND + (let ((exception + (second (assoc errno + '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND (2 ns-no-recovery-error) ;; NO_DATA (3 ns-no-recovery-error) ;; NO_RECOVERY - (4 ns-try-again)))))))) ;; TRY_AGAIN + (4 ns-try-again)))))) ;; TRY_AGAIN + (when exception + (error exception)))))) (defun get-host-by-address (address)

1 0

[usocket-cvs] r185 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 19 Jan '07

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 18:58:50 2007 New Revision: 185 Modified: usocket/trunk/backend/allegro.lisp usocket/trunk/backend/clisp.lisp usocket/trunk/backend/cmucl.lisp usocket/trunk/backend/openmcl.lisp usocket/trunk/backend/scl.lisp Log: Use new ip comparison functions when determining ip (in)equality. Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Fri Jan 19 18:58:50 2007 @@ -70,8 +70,8 @@ :format (to-format element-type) ;; allegro now ignores :format ) - (when (not (eql host *wildcard-host*)) - (list :local-host host))))))) + (when (ip/= host *wildcard-host*) + (list :local-host host))))))) (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((socket stream-server-usocket)) Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Fri Jan 19 18:58:50 2007 @@ -58,7 +58,7 @@ (let ((sock (apply #'socket:socket-server (append (list port :backlog backlog) - (when (not (eql host *wildcard-host*)) + (when (ip/= host *wildcard-host*) (list :interface host)))))) (make-stream-server-socket sock :element-type element-type))) Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Fri Jan 19 18:58:50 2007 @@ -78,7 +78,7 @@ (append (list port :stream :backlog backlog :reuse-address reuseaddress) - (when (not (eql host *wildcard-host*)) + (when (ip/= host *wildcard-host*) (list :host (host-to-hbo host))))))) (make-stream-server-socket server-sock :element-type element-type))) Modified: usocket/trunk/backend/openmcl.lisp ============================================================================== --- usocket/trunk/backend/openmcl.lisp (original) +++ usocket/trunk/backend/openmcl.lisp Fri Jan 19 18:58:50 2007 @@ -64,7 +64,7 @@ :local-port port :backlog backlog :format (to-format element-type)) - (when (not (eql host *wildcard-host*)) + (when (ip/= host *wildcard-host*) (list :local-host host)))))) (make-stream-server-socket sock :element-type element-type))) Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Fri Jan 19 18:58:50 2007 @@ -45,7 +45,7 @@ &key reuseaddress (backlog 5) (element-type 'character)) - (let* ((host (if (eql host *wildcard-host*) + (let* ((host (if (ip= host *wildcard-host*) 0 (host-to-hbo host))) (server-sock (ext:create-inet-listener port :stream

1 0

[usocket-cvs] r184 - usocket/trunk
by ehuelsmann＠common-lisp.net 19 Jan '07

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 18:53:45 2007 New Revision: 184 Modified: usocket/trunk/package.lisp usocket/trunk/usocket.lisp Log: Add ip comparison functions ip= and ip/=. Modified: usocket/trunk/package.lisp ============================================================================== --- usocket/trunk/package.lisp (original) +++ usocket/trunk/package.lisp Fri Jan 19 18:53:45 2007 @@ -30,11 +30,13 @@ #:socket #:socket-stream - #:host-byte-order ; IPv4 utility functions + #:host-byte-order ; IP(v4) utility functions #:hbo-to-dotted-quad #:hbo-to-vector-quad #:vector-quad-to-dotted-quad #:dotted-quad-to-vector-quad + #:ip= + #:ip/= #:socket-condition ; conditions #:socket-error ; errors Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Fri Jan 19 18:53:45 2007 @@ -121,7 +121,7 @@ ,@body)) ;; -;; IPv4 utility functions +;; IP(v4) utility functions ;; (defun list-of-strings-to-integers (list) @@ -173,6 +173,29 @@ (+ (* (aref vector 0) 256 256 256) (* (aref vector 1) 256 256) (* (aref vector 2) 256) (aref vector 3))) +(defmethod host-byte-order ((int integer)) + int) + +(defun host-to-hostname (host) + "Translate a string or vector quad to a stringified hostname." + (etypecase host + (string host) + ((vector t 4) (vector-quad-to-dotted-quad host)) + (integer (hbo-to-dotted-quad host)))) + +(defun ip= (ip1 ip2) + (etypecase ip1 + (string (string= ip1 (host-to-hostname ip2))) + ((vector t 4) (or (eq ip1 ip2) + (and (= (aref ip1 0) (aref ip2 0)) + (= (aref ip1 1) (aref ip2 1)) + (= (aref ip1 2) (aref ip2 2)) + (= (aref ip1 3) (aref ip2 3))))) + (integer (= ip1 (host-byte-order ip2))))) + +(defun ip/= (ip1 ip2) + (not (ip= ip1 ip2))) + ;; ;; DNS helper functions ;; @@ -210,13 +233,6 @@ ((vector t 4) (host-byte-order host)) (integer host)))) -(defun host-to-hostname (host) - "Translate a string or vector quad to a stringified hostname." - (etypecase host - (string host) - ((vector t 4) (vector-quad-to-dotted-quad host)) - (integer (hbo-to-dotted-quad host)))) - ;; ;; Setting of documentation for backend defined functions ;;

1 0

[usocket-cvs] r183 - usocket/trunk
by ehuelsmann＠common-lisp.net 19 Jan '07

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 18:43:50 2007 New Revision: 183 Modified: usocket/trunk/README usocket/trunk/TODO Log: Update project description files README and TODO. Modified: usocket/trunk/README ============================================================================== --- usocket/trunk/README (original) +++ usocket/trunk/README Fri Jan 19 18:43:50 2007 @@ -20,7 +20,7 @@ - SBCL - CMUCL - - ArmedBear + - ArmedBear (post feb 11th, 2006 versions) - clisp - Allegro Common Lisp - LispWorks @@ -59,19 +59,32 @@ ============== - usocket (class) + - stream-usocket (class; usocket derivative) + - stream-server-usocket (class; usocket derivative) - socket-connect (function) [ to create an active/connected socket ] socket-connect host port &key element-type where `host' is a vectorized ip or a string representation of a dotted ip address or a hostname for lookup in the DNS system + - socket-listen (function) [ to create a passive/listening socket ] + socket-listen host port &key reuseaddress backlog element-type + where `host' has the same definition as above + - socket-accept (method) [ to create an active/connected socket ] + socket-accept socket + returns (server side) a connected socket derived from a + listening/passive socket. - socket-close (method) socket-close socket where socket a previously returned socket + - socket (usocket slot accessor), + the internal/implementation defined socket representation - socket-stream (usocket slot accessor), socket-stream socket the return value of which satisfies the normal stream interface + + Errors: - address-in-use-error - address-not-available-error @@ -110,4 +123,14 @@ - When running the test suite through the run-usocket-tests.sh shell script, ArmedBear 0.0.9 will report failure - even when it didn't. You need a CVS version later than 2006-02-11, or later than 0.0.9 - for the script to work correctly. + release version for the script to work correctly. + +- The ArmedBear backend doesn't do any error mapping (yet). Java + defines exceptions at the wrong level (IMO), since the exception + reported bares a relation to the function failing, not the actual + error that occurred: for example 'Address already in use' (when + creating a passive socket) is reported as a BindException with + an error text of 'Address already in use'. There's no way to sanely + map 'BindException' to a meaningfull error in usocket. [This does not + mean the backend should not at least map to 'unknown-error'!] + Modified: usocket/trunk/TODO ============================================================================== --- usocket/trunk/TODO (original) +++ usocket/trunk/TODO Fri Jan 19 18:43:50 2007 @@ -1,22 +1,8 @@ -- Check consistency of error translation for each of the backends - with the design document. - -- check stream creation arguments such as element-type and external-format - for availability in the different lisps. - - Extend ABCL socket support with the 4 java errors in java.net.* so that they can map to our usocket errors instead of mapping all errors to unknown-error. -- Investigate which backends would support streams with other - elements than :element-type 'character, especially since - cl-irc chokes on characters which are non-UTF8 conforming... - Probably other clients do too (try that with a binary HTTP stream!) - -- change CMUCL implementation to catch name resolution errors: - Don't send host names into connect-to-inet-socket, but use - gethostbyname, binding the return value and the error code. - Raise an error if gethostbyname returns one. - - Add INET6 support. + +For more TODO items, see http://trac.common-lisp.net/usocket/report.

1 0

[usocket-cvs] r182 - usocket/trunk/doc
by ehuelsmann＠common-lisp.net 19 Jan '07

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 18:43:12 2007 New Revision: 182 Modified: usocket/trunk/doc/backends.txt Log: Document new backend requirements. Modified: usocket/trunk/doc/backends.txt ============================================================================== --- usocket/trunk/doc/backends.txt (original) +++ usocket/trunk/doc/backends.txt Fri Jan 19 18:43:12 2007 @@ -11,6 +11,7 @@ - handle-condition - socket-connect + - socket-listen - get-hosts-by-name [ optional ] - get-host-by-address [ optional ] @@ -18,6 +19,7 @@ Methods: - socket-close + - socket-accept - get-local-name - get-peer-name

1 0

[usocket-cvs] r181 - usocket/trunk/backend
by ehuelsmann＠common-lisp.net 19 Jan '07

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 18:37:45 2007 New Revision: 181 Modified: usocket/trunk/backend/cmucl.lisp Log: Implement error handling for host name resolution. Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Fri Jan 19 18:37:45 2007 @@ -51,7 +51,8 @@ :condition condition)) (simple-error (error 'unknown-error :real-condition condition - :socket socket)))) + :socket socket)) + (condition (error condition)))) (defun socket-connect (host port &key (element-type 'character)) (let* ((socket)) @@ -119,14 +120,29 @@ (nth-value 1 (get-peer-name usocket))) +(defun lookup-host-entry (host) + (multiple-value-bind + (entry errno) + (ext:lookup-host-entry host) + (if entry + entry + ;;###The constants below work on *most* OSes, but are defined as the + ;; constants mentioned in C + (error + (second (assoc errno '((1 ns-host-not-found-error) ;; HOST_NOT_FOUND + (2 ns-no-recovery-error) ;; NO_DATA + (3 ns-no-recovery-error) ;; NO_RECOVERY + (4 ns-try-again)))))))) ;; TRY_AGAIN + + (defun get-host-by-address (address) (handler-case (ext:host-entry-name - (ext::lookup-host-entry (host-byte-order address))) + (lookup-host-entry (host-byte-order address))) (condition (condition) (handle-condition condition)))) (defun get-hosts-by-name (name) (handler-case (mapcar #'hbo-to-vector-quad (ext:host-entry-addr-list - (ext:lookup-host-entry name))) + (lookup-host-entry name))) (condition (condition) (handle-condition condition))))

1 0

[usocket-cvs] r180 - public_html
by ehuelsmann＠common-lisp.net 19 Jan '07

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 16:06:41 2007 New Revision: 180 Modified: public_html/index.shtml Log: Update project status. Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Fri Jan 19 16:06:41 2007 @@ -224,21 +224,33 @@ <td class="PASS">PASS</td> </tr> <tr> - <td rowspan="2">Add support for passive (connection-accepting/server) + <td rowspan="3">Add support for passive (connection-accepting/server) sockets.</td> <td>Investigate interfaces provided</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>Implement api calls listen and accept</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> + <td class="DONE">DONE</td> </tr> <tr> - <td>Implement api calls get- and setsockopt.</td> + <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>

1 0

[usocket-cvs] r179 - usocket/trunk
by ehuelsmann＠common-lisp.net 19 Jan '07

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 15:56:14 2007 New Revision: 179 Modified: usocket/trunk/package.lisp Log: Add the 'with-server-socket' macro to the list of exported symbols. Modified: usocket/trunk/package.lisp ============================================================================== --- usocket/trunk/package.lisp (original) +++ usocket/trunk/package.lisp Fri Jan 19 15:56:14 2007 @@ -22,6 +22,7 @@ #:get-peer-name #:with-connected-socket ; macros + #:with-server-socket #:usocket ; socket object and accessors #:stream-usocket

1 0