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