January 2007 - usocket-cvs@common-lisp.net

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

22 Jan '07

Author: ehuelsmann Date: Mon Jan 22 14:39:13 2007 New Revision: 196 Modified: usocket/trunk/condition.lisp usocket/trunk/usocket.lisp Log: Raise an error on invalid parameters for a socket. Modified: usocket/trunk/condition.lisp ============================================================================== --- usocket/trunk/condition.lisp (original) +++ usocket/trunk/condition.lisp Mon Jan 22 14:39:13 2007 @@ -77,7 +77,9 @@ host-down-error host-unreachable-error shutdown-error - timeout-error) + timeout-error + invalid-socket-error + invalid-socket-stream-error) (socket-error)) (define-condition unknown-error (socket-error) Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Mon Jan 22 14:39:13 2007 @@ -48,11 +48,17 @@ (defun make-socket (&key socket) "Create a usocket socket type from implementation specific socket." + (unless socket + (error 'invalid-socket)) (make-stream-socket :socket socket)) (defun make-stream-socket (&key socket stream) "Create a usocket socket type from implementation specific socket and stream objects." + (unless socket + (error 'invalid-socket-error)) + (unless stream + (error 'invalid-socket-stream-error)) (make-instance 'stream-usocket :socket socket :stream stream))

1 0

[usocket-cvs] r195 - trivial-usocket/trunk usocket/trunk
by ehuelsmann＠common-lisp.net 21 Jan '07

21 Jan '07

Author: ehuelsmann Date: Sun Jan 21 08:31:46 2007 New Revision: 195 Added: trivial-usocket/trunk/LICENSE - copied, changed from r188, usocket/trunk/LICENSE Modified: usocket/trunk/LICENSE Log: Update LICENSE information. Copied: trivial-usocket/trunk/LICENSE (from r188, usocket/trunk/LICENSE) ============================================================================== --- usocket/trunk/LICENSE (original) +++ trivial-usocket/trunk/LICENSE Sun Jan 21 08:31:46 2007 @@ -1,7 +1,7 @@ (This is the MIT / X Consortium license as taken from http://www.opensource.org/licenses/mit-license.html) -Copyright (c) 2003 Erik Enge +Copyright (c) 2006-2007 Erik Huelsmann Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Modified: usocket/trunk/LICENSE ============================================================================== --- usocket/trunk/LICENSE (original) +++ usocket/trunk/LICENSE Sun Jan 21 08:31:46 2007 @@ -2,6 +2,7 @@ http://www.opensource.org/licenses/mit-license.html) Copyright (c) 2003 Erik Enge +Copyright (c) 2006-2007 Erik Huelsmann Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the

1 0

[usocket-cvs] r194 - trivial-usocket/trunk
by ehuelsmann＠common-lisp.net 21 Jan '07

21 Jan '07

Author: ehuelsmann Date: Sun Jan 21 08:17:08 2007 New Revision: 194 Modified: trivial-usocket/trunk/trivial-usocket.asd (props changed) trivial-usocket/trunk/trivial-usocket.lisp (contents, props changed) Log: Complete trivial-sockets compat (by implementing server sockets). Modified: trivial-usocket/trunk/trivial-usocket.lisp ============================================================================== --- trivial-usocket/trunk/trivial-usocket.lisp (original) +++ trivial-usocket/trunk/trivial-usocket.lisp Sun Jan 21 08:17:08 2007 @@ -10,7 +10,10 @@ #:usocket) (:export #:open-stream #:usocket - #:unsupported)) + #:unsupported + #:open-server + #:with-server + #:accept-connection)) (in-package :trivial-usocket) @@ -151,11 +154,15 @@ :usocket usocket rest))) +;; +;; The actual compat functions + (defun open-stream (peer-host peer-port &key (local-host :any) (local-port 0) (external-format :default) - (element-type 'character) + (element-type #-lispworks 'character + #+lispworks 'base-char) (protocol :tcp)) (unless (eq protocol :tcp) (error 'unsupported :feature `(:protocol ,protocol))) @@ -163,6 +170,48 @@ (error 'unsupported :feature :bind)) (unless (eql external-format :default) (error 'unsupported :feature :external-format)) - (let ((socket (socket-connect peer-host peer-port))) + (let ((socket (socket-connect peer-host peer-port + :element-type element-type))) (wrap-usocket-stream socket))) + +(defun open-server (&key (host :any) + (port 0) + (reuse-address t) + (backlog 1) + (protocol :tcp)) + (unless (eq protocol :tcp) + (error 'unsupported :feature `(:protocol ,protocol))) + (socket-listen (if (eq host :any) *wildcard-host* host) + port + :reuseaddress reuse-address + :backlog backlog)) + +(defun close-server (server) + (socket-close server)) + +(defun accept-connection (server &key (external-format :default) + (element-type #-lispworks 'character + #+lispworks 'base-char)) + (unless (eql external-format :default) + (error 'unsupported :feature :external-format)) + (wrap-usocket-stream (socket-accept server :element-type element-type))) + +(defmacro with-server ((server args) &body forms) + (let ((hostsym (gensym)) + (portsym (gensym)) + (newargs (gensym))) + `(let* ((,hostsym (or (getf ,args :host) + *wildcard-host*)) + (,portsym (or (getf ,args :port) + *wildcard-port*)) + (,newargs (copy-list ,args))) + (remf ,newargs :host) + (remf ,newargs :port) + (let ((,server (apply #'socket-listen ,hostsym ,portsym ,newargs))) + (when ,server + (unwind-protect + (progn + ,@forms) + (when ,server + (socket-close ,server))))))))

1 0

[usocket-cvs] r193 - in public_html: . releases
by ehuelsmann＠common-lisp.net 21 Jan '07

21 Jan '07

Author: ehuelsmann Date: Sun Jan 21 05:09:22 2007 New Revision: 193 Added: public_html/releases/usocket-0.3.0.tar.gz (contents, props changed) public_html/releases/usocket-0.3.0.tar.gz.asc Modified: public_html/index.shtml Log: Upload 0.3.0 and update website. Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Sun Jan 21 05:09:22 2007 @@ -325,6 +325,8 @@ <table> <caption>Release history</caption> <tr><th>Date</th><th>Release</th><th>Summary</th></tr> +<tr><td>Jan 21, 2007</td> + <td><b>0.3.0<b></td><td><b>Server sockets</b></td></tr> <tr><td>Jan 19, 2007</td> <td>0.2.5</td><td>Allegro compilation fix.</td></tr> <tr><td>Jan 17, 2007</td> Added: public_html/releases/usocket-0.3.0.tar.gz ============================================================================== Binary file. No diff available. Added: public_html/releases/usocket-0.3.0.tar.gz.asc ============================================================================== --- (empty file) +++ public_html/releases/usocket-0.3.0.tar.gz.asc Sun Jan 21 05:09:22 2007 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQBFs0i0i5O0Epaz9TkRArGIAJ4+XspIcQJu/pqUl/ilDxIrHFxypQCfbAL9 +g1ATAMyna4k9NmW/KUdO/i8= +=o5+Z +-----END PGP SIGNATURE-----

1 0

[usocket-cvs] r192 - usocket/branches/0.3.x
by ehuelsmann＠common-lisp.net 21 Jan '07

21 Jan '07

Author: ehuelsmann Date: Sun Jan 21 05:08:25 2007 New Revision: 192 Modified: usocket/branches/0.3.x/usocket.asd Log: Advance version number. Modified: usocket/branches/0.3.x/usocket.asd ============================================================================== --- usocket/branches/0.3.x/usocket.asd (original) +++ usocket/branches/0.3.x/usocket.asd Sun Jan 21 05:08:25 2007 @@ -14,7 +14,7 @@ (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann" - :version "0.3.0-dev" + :version "0.3.1-dev" :licence "MIT" :description "Universal socket library for Common Lisp" :depends-on (:split-sequence

1 0

[usocket-cvs] r191 - usocket/tags/0.3.0
by ehuelsmann＠common-lisp.net 21 Jan '07

21 Jan '07

Author: ehuelsmann Date: Sun Jan 21 05:03:35 2007 New Revision: 191 Added: usocket/tags/0.3.0/ - copied from r190, usocket/branches/0.3.x/ Modified: usocket/tags/0.3.0/usocket.asd Log: Create 0.3.0 tag. Modified: usocket/tags/0.3.0/usocket.asd ============================================================================== --- usocket/branches/0.3.x/usocket.asd (original) +++ usocket/tags/0.3.0/usocket.asd Sun Jan 21 05:03:35 2007 @@ -14,7 +14,7 @@ (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann" - :version "0.3.0-dev" + :version "0.3.0" :licence "MIT" :description "Universal socket library for Common Lisp" :depends-on (:split-sequence

1 0

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

20 Jan '07

Author: ehuelsmann Date: Sat Jan 20 10:33:40 2007 New Revision: 190 Added: public_html/feature-comparison.shtml Modified: public_html/index.shtml Log: Add comparison chart. Added: public_html/feature-comparison.shtml ============================================================================== --- (empty file) +++ public_html/feature-comparison.shtml Sat Jan 20 10:33:40 2007 @@ -0,0 +1,143 @@ +<?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title></title> + <link rel="stylesheet" type="text/css" href="style.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +</head> + +<body> + <div class="header"> + <h1></h1> + </div> + +<h2>Comparison to "trivial-sockets"</h2> + +<p><em>usocket</em> supports more backends than <em>trivial-sockets</em>. + The latter implements different feature-sets for different backends while + the former supplies consistent functionality for all backends.</p> + +<table style="border:3px solid black"> +<tr><th colspan="2">Feature</th> + <th colspan="8">In trivial-sockets?</th><th rowspan="2">In usocket?</th></tr> +<tr><th colspan="2"></th><th title="ArmedBear">ABCL</th> + <th title="Allegro">ACL</th> + <th>clisp</th> + <th>CMUCL</th> + <th>LispWorks</th> + <th>OpenMCL</th> + <th>SBCL</th> + <th>(all)</th> + </tr> +<tr><th rowspan="3">Client side tcp streams</th><th>:element-type</th> + <td>Yes</td>  + <td title="bivalent streams">Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td title="bivalent streams">Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + + </tr> +<tr><th>:external-format</th> + <td>No</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> +</tr> +<tr><th>binding local interface/port</th> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>Yes</td> + <td>Yes</td> + <td>No</td> + <td>No</td> + +<tr><th rowspan="5">Server socket creation</th> + <th>Binding specific local port</th> + <td colspan="8">Yes</td> + +</tr> +<tr><th>Binding specific local interface</th> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + +</tr> +<tr><th>Selectable backlog length</th> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + <td>Yes</td> + <td>No</td> + <td>Yes</td> + +<tr><th>reuse-address</th> + <td>Yes</td> + <td>Yes</td> + <td>No*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td>No*</td> + <td>Yes*</td> + +<tr><th>:element-type for created connections</th> + <td colspan="7">No</td> + <td>Yes</td> + +<tr><th rowspan="5">Accepting connections</th> + <th>:element-type for created stream</th> + <td>Yes</td> + <td>Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes*</td> + <td>Yes</td> + <td>Yes</td> + <td>Yes*</td> + +<tr><th>:external-format for created stream</th> + <td>No</td> + <td>No</td> + <td>Yes</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + <td>No</td> + +</tr> +</table> + +<p>In summary: there are only a very limited number of features you can depend +on to work on all platforms supported by trivial-sockets. While usocket +doesn't support all features, you can depend on the features to be available. +</p> + +</body> +</html> Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Sat Jan 20 10:33:40 2007 @@ -29,6 +29,9 @@ <p>If your lisp isn't mentioned in the list below, please feel free to submit a request for it at the mailing list mentioned below.</p> +<p>See the <a href="feature-comparison.shtml">feature comparison</a> with + trivial-sockets in order to find out which one you should use.</p> + <h2>Supported implementations</h2> <p>Currently these implementations are supported:</p>

1 0

[usocket-cvs] r189 - in usocket: branches/0.3.x branches/0.3.x/backend branches/0.3.x/doc trunk
by ehuelsmann＠common-lisp.net 20 Jan '07

20 Jan '07

Author: ehuelsmann Date: Sat Jan 20 07:57:27 2007 New Revision: 189 Added: usocket/branches/0.3.x/ - copied from r176, usocket/trunk/ usocket/branches/0.3.x/README - copied unchanged from r188, usocket/trunk/README usocket/branches/0.3.x/TODO - copied unchanged from r188, usocket/trunk/TODO usocket/branches/0.3.x/backend/ - copied from r188, usocket/trunk/backend/ usocket/branches/0.3.x/doc/ - copied from r188, usocket/trunk/doc/ usocket/branches/0.3.x/package.lisp - copied unchanged from r188, usocket/trunk/package.lisp usocket/branches/0.3.x/usocket.lisp - copied unchanged from r188, usocket/trunk/usocket.lisp Modified: usocket/trunk/usocket.asd Log: Branch for 0.3.x: server sockets. Modified: usocket/trunk/usocket.asd ============================================================================== --- usocket/trunk/usocket.asd (original) +++ usocket/trunk/usocket.asd Sat Jan 20 07:57:27 2007 @@ -14,7 +14,7 @@ (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann" - :version "0.3.0-dev" + :version "0.4.0-dev" :licence "MIT" :description "Universal socket library for Common Lisp" :depends-on (:split-sequence

1 0

[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 19 Jan '07

19 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

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

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 15:34:50 2007 New Revision: 178 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 usocket/trunk/usocket.lisp Log: Add :element-type support for server sockets. Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Fri Jan 19 15:34:50 2007 @@ -36,14 +36,18 @@ :real-error condition :socket socket)))))) +(defun to-format (element-type) + (if (subtypep element-type 'character) + :text + :binary)) + (defun socket-connect (host port &key (element-type 'character)) (let ((socket)) (setf socket (with-mapped-conditions (socket) (socket:make-socket :remote-host (host-to-hostname host) :remote-port port - :format (if (subtypep element-type 'character) - :text :binary)))) + :format (to-format element-type)))) (make-stream-socket :socket socket :stream socket))) (defmethod socket-close ((usocket usocket)) @@ -51,7 +55,10 @@ (with-mapped-conditions (usocket) (close (socket usocket)))) -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'character)) ;; Allegro and OpenMCL socket interfaces bear very strong resemblence ;; whatever you change here, change it also for OpenMCL (let ((sock (with-mapped-conditions () @@ -60,12 +67,12 @@ :reuse-address reuseaddress :local-port port :backlog backlog - :format :bivalent + :format (to-format element-type) ;; allegro now ignores :format ) (when (not (eql host *wildcard-host*)) (list :local-host host))))))) - (make-stream-server-socket sock))) + (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((socket stream-server-usocket)) (let ((stream-sock (socket:accept-connection (socket socket)))) Modified: usocket/trunk/backend/armedbear.lisp ============================================================================== --- usocket/trunk/backend/armedbear.lisp (original) +++ usocket/trunk/backend/armedbear.lisp Fri Jan 19 15:34:50 2007 @@ -31,7 +31,10 @@ :stream (ext:get-socket-stream sock :element-type element-type))))))) -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'character)) (let* ((sock-addr (jnew-call ("java.net.InetSocketAddress" "java.lang.String" "int") (host-to-hostname host) port)) @@ -43,7 +46,7 @@ (jmethod-call sock ("bind" "java.net.SocketAddress" "int") sock-addr backlog) - (make-stream-server-socket sock))) + (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((socket stream-server-usocket)) (let* ((jsock (socket socket)) Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Fri Jan 19 15:34:50 2007 @@ -49,7 +49,10 @@ (make-stream-socket :socket socket :stream socket))) ;; the socket is a stream too -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'character)) ;; clisp 2.39 sets SO_REUSEADDRESS to 1 by default; no need to ;; to explicitly turn it on. (let ((sock (apply #'socket:socket-server @@ -57,10 +60,11 @@ :backlog backlog) (when (not (eql host *wildcard-host*)) (list :interface host)))))) - (make-stream-server-socket sock))) + (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((socket stream-server-usocket)) - (let ((stream (socket:socket-accept (socket socket)))) + (let ((stream (socket:socket-accept (socket socket) + :element-type (element-type socket)))) (make-stream-socket :socket stream :stream stream))) Modified: usocket/trunk/backend/cmucl.lisp ============================================================================== --- usocket/trunk/backend/cmucl.lisp (original) +++ usocket/trunk/backend/cmucl.lisp Fri Jan 19 15:34:50 2007 @@ -69,7 +69,10 @@ (let ((err (unix:unix-errno))) (when err (cmucl-map-socket-error err)))))) -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'character)) (let ((server-sock (apply #'ext:create-inet-listener (append (list port :stream :backlog backlog @@ -77,7 +80,7 @@ (when (not (eql host *wildcard-host*)) (list :host (host-to-hbo host))))))) - (make-stream-server-socket server-sock))) + (make-stream-server-socket server-sock :element-type element-type))) (defmethod socket-accept ((usocket stream-server-usocket)) (let* ((sock (ext:accept-tcp-connection (socket usocket))) Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Fri Jan 19 15:34:50 2007 @@ -56,13 +56,16 @@ :stream stream) (error 'unknown-error)))) -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'base-char)) (let* ((comm::*use_so_reuseaddr* reuseaddress) (sock (with-mapped-conditions () #-lispworks4.1 (comm::create-tcp-socket-for-service port :address host :backlog backlog) #+lispworks4.1 (comm::create-tcp-socket-for-service port)))) - (make-stream-server-socket sock))) + (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((usocket stream-server-usocket)) (let* ((sock (comm::get-fd-from-socket (socket usocket))) Modified: usocket/trunk/backend/openmcl.lisp ============================================================================== --- usocket/trunk/backend/openmcl.lisp (original) +++ usocket/trunk/backend/openmcl.lisp Fri Jan 19 15:34:50 2007 @@ -40,27 +40,33 @@ (error (error 'unknown-error :socket socket :real-error condition)) (condition (signal 'unknown-condition :real-condition condition)))) +(defun to-format (element-type) + (if (subtypep element-type 'character) + :text + :binary)) + (defun socket-connect (host port &key (element-type 'character)) (with-mapped-conditions () (let ((mcl-sock (openmcl-socket:make-socket :remote-host (host-to-hostname host) :remote-port port - :format (if (subtypep element-type - 'character) - :text :binary)))) + :format (to-format element-type)))) (openmcl-socket:socket-connect mcl-sock) (make-stream-socket :stream mcl-sock :socket mcl-sock)))) -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'character)) (let* ((sock (apply #'openmcl-socket:make-socket (append (list :connect :passive :reuse-address reuseaddress :local-port port :backlog backlog - :format :bivalent) + :format (to-format element-type)) (when (not (eql host *wildcard-host*)) (list :local-host host)))))) - (make-stream-server-socket sock))) + (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((usocket stream-server-usocket)) (let ((sock (openmcl-socket:accept-connection (socket usocket)))) Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Fri Jan 19 15:34:50 2007 @@ -82,14 +82,17 @@ (sb-bsd-sockets:socket-connect socket ip port)) usocket)) -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'character)) (let* ((ip (host-to-vector-quad host)) (sock (make-instance 'sb-bsd-sockets:inet-socket :type :stream :protocol :tcp))) (setf (sb-bsd-sockets:sockopt-reuse-address sock) reuseaddress) (sb-bsd-sockets:socket-bind sock ip port) (sb-bsd-sockets:socket-listen sock backlog) - (make-stream-server-socket sock))) + (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((socket stream-server-usocket)) (let ((sock (sb-bsd-sockets:socket-accept (socket socket)))) Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Fri Jan 19 15:34:50 2007 @@ -41,7 +41,10 @@ :buffering :full))) (make-stream-socket :socket socket :stream stream))) -(defun socket-listen (host port &key reuseaddress (backlog 5)) +(defun socket-listen (host port + &key reuseaddress + (backlog 5) + (element-type 'character)) (let* ((host (if (eql host *wildcard-host*) 0 (host-to-hbo host))) @@ -49,7 +52,7 @@ :host host :reuse-address reuseaddress :backlog backlog))) - (make-stream-server-socket server-sock))) + (make-stream-server-socket server-sock :element-type element-type))) (defmethod socket-accept ((usocket stream-server-usocket)) (let* ((sock (ext:accept-tcp-connection (socket usocket))) Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Fri Jan 19 15:34:50 2007 @@ -249,7 +249,8 @@ Returns an object of type `stream-server-usocket'. `reuseaddress' and `backlog' are advisory parameters for setting socket -options at creation time. +options at creation time. `element-type' is the element type of the +streams to be created by `socket-accept'. ") ;; Documentation for the function

1 0

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

19 Jan '07

Author: ehuelsmann Date: Fri Jan 19 14:38:40 2007 New Revision: 177 Modified: usocket/trunk/backend/scl.lisp Log: Server side socket support for Scieneer (and re-indenting). Modified: usocket/trunk/backend/scl.lisp ============================================================================== --- usocket/trunk/backend/scl.lisp (original) +++ usocket/trunk/backend/scl.lisp Fri Jan 19 14:38:40 2007 @@ -24,7 +24,6 @@ "Dispatch correct usocket condition." (etypecase condition (ext::socket-error - (format t "erron: ~D~%" (ext::socket-errno condition)) (scl-map-socket-error (ext::socket-errno condition) :socket socket :condition condition)) @@ -34,15 +33,31 @@ :socket socket)))) (defun socket-connect (host port &key (element-type 'character)) - (let* ((socket - (with-mapped-conditions (nil) - (ext:connect-to-inet-socket (host-to-hbo host) port :kind :stream))) - (stream (sys:make-fd-stream socket :input t :output t - :element-type element-type - :buffering :full))) - ;;###FIXME the above line probably needs an :external-format + (let* ((socket (with-mapped-conditions () + (ext:connect-to-inet-socket (host-to-hbo host) port + :kind :stream))) + (stream (sys:make-fd-stream socket :input t :output t + :element-type element-type + :buffering :full))) (make-stream-socket :socket socket :stream stream))) +(defun socket-listen (host port &key reuseaddress (backlog 5)) + (let* ((host (if (eql host *wildcard-host*) + 0 + (host-to-hbo host))) + (server-sock (ext:create-inet-listener port :stream + :host host + :reuse-address reuseaddress + :backlog backlog))) + (make-stream-server-socket server-sock))) + +(defmethod socket-accept ((usocket stream-server-usocket)) + (let* ((sock (ext:accept-tcp-connection (socket usocket))) + (stream (sys:make-fd-stream sock :input t :output t + :element-type (element-type usocket) + :buffering :full))) + (make-stream-socket :socket sock :stream stream))) + (defmethod socket-close ((usocket usocket)) "Close socket." (with-mapped-conditions (usocket) @@ -51,13 +66,13 @@ (defmethod get-local-name ((usocket usocket)) (multiple-value-bind (address port) (with-mapped-conditions (usocket) - (ext:get-socket-host-and-port (socket usocket))) + (ext:get-socket-host-and-port (socket usocket))) (values (hbo-to-vector-quad address) port))) (defmethod get-peer-name ((usocket usocket)) (multiple-value-bind (address port) (with-mapped-conditions (usocket) - (ext:get-peer-host-and-port (socket usocket))) + (ext:get-peer-host-and-port (socket usocket))) (values (hbo-to-vector-quad address) port))) (defmethod get-local-address ((usocket usocket)) @@ -77,25 +92,25 @@ (multiple-value-bind (host errno) (ext:lookup-host-entry (host-byte-order address)) (cond (host - (ext:host-entry-name host)) - (t - (let ((condition (cdr (assoc errno +unix-ns-error-map+)))) - (cond (condition - (error condition :host-or-ip address)) - (t - (error 'ns-unknown-error :host-or-ip address - :real-error errno)))))))) + (ext:host-entry-name host)) + (t + (let ((condition (cdr (assoc errno +unix-ns-error-map+)))) + (cond (condition + (error condition :host-or-ip address)) + (t + (error 'ns-unknown-error :host-or-ip address + :real-error errno)))))))) (defun get-hosts-by-name (name) (multiple-value-bind (host errno) (ext:lookup-host-entry name) (cond (host - (mapcar #'hbo-to-vector-quad - (ext:host-entry-addr-list host))) - (t - (let ((condition (cdr (assoc errno +unix-ns-error-map+)))) - (cond (condition - (error condition :host-or-ip name)) - (t - (error 'ns-unknown-error :host-or-ip name - :real-error errno)))))))) + (mapcar #'hbo-to-vector-quad + (ext:host-entry-addr-list host))) + (t + (let ((condition (cdr (assoc errno +unix-ns-error-map+)))) + (cond (condition + (error condition :host-or-ip name)) + (t + (error 'ns-unknown-error :host-or-ip name + :real-error errno))))))))

1 0

[usocket-cvs] r176 - in public_html: . releases
by ehuelsmann＠common-lisp.net 18 Jan '07

18 Jan '07

Author: ehuelsmann Date: Thu Jan 18 18:51:59 2007 New Revision: 176 Added: public_html/releases/usocket-0.2.5.tar.gz (contents, props changed) public_html/releases/usocket-0.2.5.tar.gz.asc Modified: public_html/index.shtml Log: Upload 0.2.5 release and update website. Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Thu Jan 18 18:51:59 2007 @@ -310,6 +310,8 @@ <table> <caption>Release history</caption> <tr><th>Date</th><th>Release</th><th>Summary</th></tr> +<tr><td>Jan 19, 2007</td> + <td>0.2.5</td><td>Allegro compilation fix.</td></tr> <tr><td>Jan 17, 2007</td> <td>0.2.4</td><td>Various fixes for CMUCL, OpenMCL, Allegro and LispWorks. </td></tr> Added: public_html/releases/usocket-0.2.5.tar.gz ============================================================================== Binary file. No diff available. Added: public_html/releases/usocket-0.2.5.tar.gz.asc ============================================================================== --- (empty file) +++ public_html/releases/usocket-0.2.5.tar.gz.asc Thu Jan 18 18:51:59 2007 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQBFsBWIi5O0Epaz9TkRAuz/AJ96VAuMnlQOmdwLxAinab0LdxKm1QCfS5bi +7de82Dbrf7/ajzmaEZvtQvc= +=S7mg +-----END PGP SIGNATURE-----

1 0

[usocket-cvs] r175 - usocket/branches/0.2.x
by ehuelsmann＠common-lisp.net 18 Jan '07

18 Jan '07

Author: ehuelsmann Date: Thu Jan 18 18:51:29 2007 New Revision: 175 Modified: usocket/branches/0.2.x/usocket.asd Log: Advance version number. Modified: usocket/branches/0.2.x/usocket.asd ============================================================================== --- usocket/branches/0.2.x/usocket.asd (original) +++ usocket/branches/0.2.x/usocket.asd Thu Jan 18 18:51:29 2007 @@ -14,7 +14,7 @@ (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann" - :version "0.2.5-dev" + :version "0.2.6-dev" :licence "MIT" :description "Universal socket library for Common Lisp" :depends-on (:split-sequence

1 0

[usocket-cvs] r174 - usocket/tags/0.2.5
by ehuelsmann＠common-lisp.net 18 Jan '07

18 Jan '07

Author: ehuelsmann Date: Thu Jan 18 18:48:53 2007 New Revision: 174 Added: usocket/tags/0.2.5/ - copied from r173, usocket/branches/0.2.x/ Modified: usocket/tags/0.2.5/usocket.asd Log: Create 0.2.5 tag. Modified: usocket/tags/0.2.5/usocket.asd ============================================================================== --- usocket/branches/0.2.x/usocket.asd (original) +++ usocket/tags/0.2.5/usocket.asd Thu Jan 18 18:48:53 2007 @@ -14,7 +14,7 @@ (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann" - :version "0.2.5-dev" + :version "0.2.5" :licence "MIT" :description "Universal socket library for Common Lisp" :depends-on (:split-sequence

1 0

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

18 Jan '07

Author: ehuelsmann Date: Thu Jan 18 16:24:25 2007 New Revision: 173 Modified: usocket/trunk/backend/allegro.lisp usocket/trunk/test/test-usocket.lisp Log: Fix argument number problem (Allegro). Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Thu Jan 18 16:24:25 2007 @@ -65,7 +65,7 @@ ) (when (not (eql host *wildcard-host*)) (list :local-host host))))))) - (make-stream-server-socket :socket sock))) + (make-stream-server-socket sock))) (defmethod socket-accept ((socket stream-server-usocket)) (let ((stream-sock (socket:accept-connection (socket socket)))) Modified: usocket/trunk/test/test-usocket.lisp ============================================================================== --- usocket/trunk/test/test-usocket.lisp (original) +++ usocket/trunk/test/test-usocket.lisp Thu Jan 18 16:24:25 2007 @@ -39,7 +39,7 @@ (defparameter *soc1* (usocket::make-stream-socket :socket :my-socket :stream :my-stream)) (eval-when (:compile-toplevel :load-toplevel :execute) - (defparameter +common-lisp-net+ #(80 68 86 115))) + (defparameter +common-lisp-net+ #(80 68 86 115))) ;; common-lisp.net IP (deftest make-socket.1 (usocket:socket *soc1*) :my-socket) (deftest make-socket.2 (usocket:socket-stream *soc1*) :my-stream)

1 0

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

18 Jan '07

Author: ehuelsmann Date: Thu Jan 18 16:15:13 2007 New Revision: 172 Modified: usocket/trunk/backend/allegro.lisp Log: Fix variable naming error (Allegro). Modified: usocket/trunk/backend/allegro.lisp ============================================================================== --- usocket/trunk/backend/allegro.lisp (original) +++ usocket/trunk/backend/allegro.lisp Thu Jan 18 16:15:13 2007 @@ -65,7 +65,7 @@ ) (when (not (eql host *wildcard-host*)) (list :local-host host))))))) - (make-stream-server-socket :socket socket))) + (make-stream-server-socket :socket sock))) (defmethod socket-accept ((socket stream-server-usocket)) (let ((stream-sock (socket:accept-connection (socket socket))))

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

usocket-cvs January 2007