usocket-cvs February 2006

usocket-cvs@common-lisp.net

1 participants
98 discussions

[usocket-cvs] r34 - public_html
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 17:35:44 2006 New Revision: 34 Modified: public_html/index.shtml Log: Update website. Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Fri Feb 3 17:35:44 2006 @@ -146,6 +146,16 @@ </table> </div> +<h2>Project history</h2> + +<p>Long ago the project was conceived and started by Erik Enge in an +attempt to factor out all implementation specific sockets code from +<a href="/project/cl-irc">cl-irc</a>. This 'long ago' must have been +way before 2003 when I entered the cl-irc project.</p> + +<p>In januari 2006, Erik Huelsmann found Erik Enge willing to donate +the code he had still laying around to restart the project.</p> + <hr /> <div style="float:left;font-size:x-small;font-weight:bold">

1 0

[usocket-cvs] r33 - usocket/trunk
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 17:27:31 2006 New Revision: 33 Modified: usocket/trunk/condition.lisp Log: Fix clisp hack. That should teach me using old clisp... Modified: usocket/trunk/condition.lisp ============================================================================== --- usocket/trunk/condition.lisp (original) +++ usocket/trunk/condition.lisp Fri Feb 3 17:27:31 2006 @@ -74,12 +74,7 @@ (define-condition usocket-unknown-error (usocket-error) ((real-error :initarg :real-error - :accessor usocket-real-error) - ;; clisp error wrt its condition system... - ;;it doesn't seem to inherit slots - #+clisp - (socket :initarg :socket - :accessor :usocket-socket)) + :accessor usocket-real-error)) (:documentation ""))

1 0

[usocket-cvs] r32 - usocket/trunk/doc
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 16:33:39 2006 New Revision: 32 Modified: usocket/trunk/doc/backends.txt (contents, props changed) Log: Update backend implementation requirements. Modified: usocket/trunk/doc/backends.txt ============================================================================== --- usocket/trunk/doc/backends.txt (original) +++ usocket/trunk/doc/backends.txt Fri Feb 3 16:33:39 2006 @@ -1,5 +1,7 @@ -*- text -*- +$Id$ + A document to describe which APIs a backend should implement. @@ -15,12 +17,29 @@ - socket-close -Name resolution functions: - - - get-host-by-address (name string) - - get-hosts-by-name (address vector-quad) - - An error-handling function, resolving implementation specific errors to this list of errors: + - usocket-address-in-use-error + - usocket-address-not-available-error + - usocket-bad-file-descriptor-error + - usocket-connection-refused-error + - usocket-invalid-argument-error + - usocket-no-buffers-error + - usocket-operation-not-supported-error + - usocket-operation-not-permitted-error + - usocket-protocol-not-supported-error + - usocket-socket-type-not-supported-error + - usocket-network-unreachable-error + - usocket-network-down-error + - usocket-network-reset-error + - usocket-host-down-error + - usocket-host-unreachable-error + - usocket-shutdown-error + - usocket-timeout-error + - usocket-unkown-error + +and these conditions: + + - usocket-interrupted-condition + - usocket-unkown-condition

1 0

[usocket-cvs] r31 - public_html
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 16:11:39 2006 New Revision: 31 Modified: public_html/index.shtml public_html/style.css Log: Update website. Modified: public_html/index.shtml ============================================================================== --- public_html/index.shtml (original) +++ public_html/index.shtml Fri Feb 3 16:11:39 2006 @@ -80,10 +80,10 @@ <tr> <td>Identify socket errors generated.</td> - <td class="WIP" title="Work in progress">WIP</td> + <td class="DONE" title="Implemented">DONE</td> <td class="WIP" title="Work in progress">WIP</td> <td class="TODO">TODO</td> - <td class="WIP" title="Work in progress">WIP</td> + <td class="DONE" title="Implemented">DONE</td> <td class="WIP" title="Work in progress">WIP</td> <td class="TODO">TODO</td> <td class="TODO">TODO</td> Modified: public_html/style.css ============================================================================== --- public_html/style.css (original) +++ public_html/style.css Fri Feb 3 16:11:39 2006 @@ -71,3 +71,6 @@ font-weight: bold; text-align: center; } +.DONE { background-color: #080; + color: #000; + text-align: center; }

1 0

[usocket-cvs] r30 - in usocket/trunk: . backend
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 16:10:43 2006 New Revision: 30 Modified: usocket/trunk/backend/clisp.lisp usocket/trunk/condition.lisp Log: Implement condition handling for clisp. Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Fri Feb 3 16:10:43 2006 @@ -25,21 +25,25 @@ (system::simple-os-error (destructuring-bind (&optional usock-err errorp) - (cdr (assoc (car (system::$format-arguments)) - +clisp-error-map+)) + (cdr (assoc (car (simple-condition-format-arguments condition)) + +clisp-error-map+ :test #'member)) (if usock-err (if errorp (error usock-err :socket socket) (signal usock-err :socket socket)) - (error 'usocket-unkown-error + (error 'usocket-unknown-error :socket socket :real-error condition)))))) (defun socket-connect (host port &optional (type :stream)) (declare (ignore type)) - (let ((socket (socket:socket-connect port (host-to-hostname host) - :element-type 'character - :buffered t))) + (let ((socket) + (hostname (host-to-hostname host))) + (with-mapped-conditions (socket) + (setf socket + (socket:socket-connect port hostname + :element-type 'character + :buffered t))) (make-socket :socket socket :stream socket))) ;; the socket is a stream too ;; :host host @@ -47,19 +51,6 @@ (defmethod socket-close ((usocket usocket)) "Close socket." - (close (socket usocket))) - - - -(defun get-host-by-address (address) - (handler-case - (posix:hostent-name - (posix:resolve-host-ipaddr (vector-quad-to-dotted-quad address))) - (condition (condition) (handle-condition condition)))) - -(defun get-hosts-by-name (name) - (handler-case - (mapcar #'dotted-quad-to-vector-quad - (posix:hostent-addr-list (posix:resolve-host-ipaddr name))) - (condition (condition) (handle-condition condition)))) + (with-mapped-conditions (usocket) + (close (socket usocket)))) Modified: usocket/trunk/condition.lisp ============================================================================== --- usocket/trunk/condition.lisp (original) +++ usocket/trunk/condition.lisp Fri Feb 3 16:10:43 2006 @@ -17,7 +17,9 @@ ;; (real-condition c) (socket c))))) (define-condition usocket-condition (condition) - () ;;###FIXME: no slots (yet); should at least be the affected usocket... + ((socket :initarg :socket + :accessor :usocket-socket)) + ;;###FIXME: no slots (yet); should at least be the affected usocket... (:documentation "")) (define-condition usocket-error (usocket-condition error) @@ -72,7 +74,12 @@ (define-condition usocket-unknown-error (usocket-error) ((real-error :initarg :real-error - :accessor usocket-real-error)) + :accessor usocket-real-error) + ;; clisp error wrt its condition system... + ;;it doesn't seem to inherit slots + #+clisp + (socket :initarg :socket + :accessor :usocket-socket)) (:documentation ""))

1 0

[usocket-cvs] r29 - in usocket/trunk: . backend
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 15:26:05 2006 New Revision: 29 Modified: usocket/trunk/backend/clisp.lisp usocket/trunk/condition.lisp Log: Make clisp error translation work. Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Fri Feb 3 15:26:05 2006 @@ -5,22 +5,45 @@ (in-package :usocket) +(defun remap-maybe-for-win32 (z &optional errorp) + (mapcar #'(lambda (x) + (list #-win32 (car x) + #+win32 (mapcar #'(lambda (y) + (+ 10000 y)) + (car x)) + (cdr x) + errorp)) + z)) + +(defparameter +clisp-error-map+ + (append (remap-maybe-for-win32 +unix-errno-condition-map+) + (remap-maybe-for-win32 +unix-errno-error-map+ t))) + (defun handle-condition (condition &optional (socket nil)) "Dispatch correct usocket condition." (typecase condition - (condition (error 'usocket-error - :real-condition condition - :socket socket)))) + (system::simple-os-error + (destructuring-bind + (&optional usock-err errorp) + (cdr (assoc (car (system::$format-arguments)) + +clisp-error-map+)) + (if usock-err + (if errorp + (error usock-err :socket socket) + (signal usock-err :socket socket)) + (error 'usocket-unkown-error + :socket socket + :real-error condition)))))) (defun socket-connect (host port &optional (type :stream)) (declare (ignore type)) - (let ((socket (socket:socket-connect port host + (let ((socket (socket:socket-connect port (host-to-hostname host) :element-type 'character :buffered t))) (make-socket :socket socket - :stream socket ;; the socket is a stream too - :host host - :port port)) + :stream socket))) ;; the socket is a stream too +;; :host host +;; :port port)) (defmethod socket-close ((usocket usocket)) "Close socket." Modified: usocket/trunk/condition.lisp ============================================================================== --- usocket/trunk/condition.lisp (original) +++ usocket/trunk/condition.lisp Fri Feb 3 15:26:05 2006 @@ -82,9 +82,9 @@ (condition (condition) (handle-condition condition ,socket)))) (defparameter +unix-errno-condition-map+ - `((11 . usocket-retry-condition) ;; EAGAIN - (35 . usocket-retry-condition) ;; EDEADLCK - (4 . usocket-interrupted-condition))) ;; EINTR + `(((11) . usocket-retry-condition) ;; EAGAIN + ((35) . usocket-retry-condition) ;; EDEADLCK + ((4) . usocket-interrupted-condition))) ;; EINTR (defparameter +unix-errno-error-map+ ;;### the first column is for non-(linux or srv4) systems @@ -117,7 +117,7 @@ (defun map-errno-condition (errno) - (cdr (assoc errno +unix-errno-error-map+))) + (cdr (assoc errno +unix-errno-error-map+ :test #'member))) (defun map-errno-error (errno)

1 0

[usocket-cvs] r28 - in usocket/trunk: . backend
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 15:24:31 2006 New Revision: 28 Modified: usocket/trunk/backend/sbcl.lisp usocket/trunk/usocket.lisp Log: Fix error where hostnames were erroneously not translated to vector quads. Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Fri Feb 3 15:24:31 2006 @@ -41,7 +41,9 @@ usock-error))) (if usock-error (error usock-error :socket socket) - (error 'usocket-unknown-error :real-error condition)))) + (error 'usocket-unknown-error + :socket socket + :real-error condition)))) (condition (let* ((usock-cond (cdr (assoc (type-of condition) +sbcl-condition-map+))) (usock-cond (if (functionp usock-cond) @@ -67,9 +69,10 @@ :buffering :full :element-type 'character)) ;;###FIXME: The above line probably needs an :external-format - (usocket (make-instance 'usocket :stream stream :socket socket))) + (usocket (make-instance 'usocket :stream stream :socket socket)) + (ip (host-to-vector-quad host))) (with-mapped-conditions (usocket) - (sb-bsd-sockets:socket-connect socket host port)) + (sb-bsd-sockets:socket-connect socket ip port)) usocket)) (defmethod socket-close ((usocket usocket)) Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Fri Feb 3 15:24:31 2006 @@ -97,11 +97,30 @@ ;; DNS helper functions ;; +#-clisp (defun get-host-by-name (name) (let ((hosts (get-hosts-by-name name))) (car hosts))) +#-clisp (defun get-random-host-by-name (name) (let ((hosts (get-hosts-by-name name))) (elt hosts (random (length hosts))))) +#-clisp +(defun host-to-vector-quad (host) + "Translate a host specification (vector quad, dotted quad or domain name) +to a vector quad." + (if (vectorp host) + host + (let* ((ip (ignore-errors + (dotted-quad-to-vector-quad host)))) + (if (and ip (= 4 (length ip))) + ip + (get-random-host-by-name host))))) + +(defun host-to-hostname (host) + "Translate a string or vector quad to a stringified hostname." + (if (stringp host) + host + (vector-quad-to-dotted-quad host)))

1 0

[usocket-cvs] r27 - usocket/trunk
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 15:19:43 2006 New Revision: 27 Modified: usocket/trunk/README Log: Update interface documentation. Modified: usocket/trunk/README ============================================================================== --- usocket/trunk/README (original) +++ usocket/trunk/README Fri Feb 3 15:19:43 2006 @@ -2,37 +2,50 @@ $Id$ -;; the backends must implement -;; -;; - handle-condition -;; - open -;; - close -;; - listen -;; - accept -;; - read-line -;; - write-sequence -;; - get-host-by-address -;; - get-host-by-name -;; -;; the backend must wrap all calls to its socket functions in a -;; handler-case/bind to make sure handle-condition is called. -;; open should take either the hostname or an vectorized ip - -usocket socket interface: +usocket interface: - usocket (class) - - socket-create (function) [ to create a passive socket ] - socket-connect (function) [ to create an active/connected socket ] + socket-connect host port + 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-close (method) - - socket-accept (method) - - socket-local-address (method) - - socket-peer-address (method) + socket-close socket + where socket a previously returned socket - socket-stream (usocket slot accessor), - the value of which satisfies the normal stream interface + socket-stream socket + the return value of which satisfies the normal stream interface -usocket name resolution interface: - - get-host-by-address - - get-host-by-name +Errors: + - usocket-address-in-use-error + - usocket-address-not-available-error + - usocket-bad-file-descriptor-error + - usocket-connection-refused-error + - usocket-invalid-argument-error + - usocket-no-buffers-error + - usocket-operation-not-supported-error + - usocket-operation-not-permitted-error + - usocket-protocol-not-supported-error + - usocket-socket-type-not-supported-error + - usocket-network-unreachable-error + - usocket-network-down-error + - usocket-network-reset-error + - usocket-host-down-error + - usocket-host-unreachable-error + - usocket-shutdown-error + - usocket-timeout-error + - usocket-unkown-error + +Non-fatal conditions: + - usocket-interrupted-condition + - usocket-unkown-condition + +TODO: + - socket-create (function) [ to create a passive socket ] + - socket-accept (method) + - socket-local-address (method) + - socket-peer-address (method)

1 0

[usocket-cvs] r26 - usocket/trunk
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 14:20:59 2006 New Revision: 26 Modified: usocket/trunk/package.lisp usocket/trunk/usocket.lisp Log: Remove/add interfaces to be implemented at this stage. Modified: usocket/trunk/package.lisp ============================================================================== --- usocket/trunk/package.lisp (original) +++ usocket/trunk/package.lisp Fri Feb 3 14:20:59 2006 @@ -13,6 +13,8 @@ (:export :socket-connect ; socket constructors and methods :socket-close + :with-connected-socket ; macros + :usocket ; socket object and accessors :socket-stream Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Fri Feb 3 14:20:59 2006 @@ -14,12 +14,13 @@ (stream :initarg :stream :accessor socket-stream) - (local-address ;; possibly need to eliminate - :initarg :local-address - :accessor local-address) - (local-port ;; possibly need to eliminate - :initarg :local-port - :accessor local-port))) +;; (local-address ;; possibly need to eliminate +;; :initarg :local-address +;; :accessor local-address) +;; (local-port ;; possibly need to eliminate +;; :initarg :local-port +;; :accessor local-port) + )) (defun make-socket (&key socket stream) (make-instance 'usocket

1 0

[usocket-cvs] r25 - in usocket/trunk: . backend
by ehuelsmann＠common-lisp.net 03 Feb '06

03 Feb '06

Author: ehuelsmann Date: Fri Feb 3 13:09:09 2006 New Revision: 25 Modified: usocket/trunk/backend/sbcl.lisp usocket/trunk/condition.lisp Log: Error translation for SBCL (non-Win32). Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Fri Feb 3 13:09:09 2006 @@ -5,12 +5,53 @@ (in-package :usocket) +(defun map-socket-error (sock-err) + (map-errno-error (sb-bsd-sockets::socket-error-errno sock-err))) + +(defparameter +sbcl-condition-map+ + '((interrupted-error . usocket-interrupted-condition))) + +(defparameter +sbcl-error-map+ + `((sb-bsd-sockets:address-in-use-error . usocket-address-in-use-error) + (sb-bsd-sockets::no-address-error . usocket-address-not-available-error) + (sb-bsd-sockets:bad-file-descriptor-error . usocket-bad-file-descriptor-error) + (sb-bsd-sockets:connection-refused-error . usocket-connection-refused-error) + (sb-bsd-sockets:invalid-argument-error . usocket-invalid-argument-error) + (no-buffers-error . usocket-no-buffers-error) + (operation-not-supported-error . usocket-operation-not-supported-error) + (operation-not-permitted-error . usocket-operation-not-permitted-error) + (protocol-not-supported-error . usocket-protocol-not-supported-error) + (socket-type-not-supported-error . usocket-socket-type-not-supported-error) + (network-unreachable-error . usocket-network-unreachable-error) + ;; (... . usocket-network-down-error) + (no-recovery-error . usocket-network-reset-error) + ;; (... . usocket-host-down-error) + ;; (... . usocket-host-unreachable-error) + ;; (... . usocket-shutdown-error) + (operation-timeout-error . usocket-timeout-error) + (sb-bsd-sockets:socket-error . ,#'map-socket-error))) + (defun handle-condition (condition &optional (socket nil)) "Dispatch correct usocket condition." (typecase condition - (condition (error 'usocket-error - :real-condition condition - :socket socket)))) + (error (let* ((usock-error (cdr (assoc (type-of condition) + +sbcl-error-map+))) + (usock-error (if (functionp usock-error) + (funcall usock-error condition) + usock-error))) + (if usock-error + (error usock-error :socket socket) + (error 'usocket-unknown-error :real-error condition)))) + (condition (let* ((usock-cond (cdr (assoc (type-of condition) + +sbcl-condition-map+))) + (usock-cond (if (functionp usock-cond) + (funcall usock-cond condition) + usock-cond))) + (if usock-cond + (signal usock-cond :socket socket) + (signal 'usocket-unkown-condition + :real-condition condition)))))) + (defun socket-connect (host port &optional (type :stream)) "Connect to `host' on `port'. `host' is assumed to be a string of @@ -27,24 +68,24 @@ :element-type 'character)) ;;###FIXME: The above line probably needs an :external-format (usocket (make-instance 'usocket :stream stream :socket socket))) - (handler-case (sb-bsd-sockets:socket-connect socket host port) - (condition (condition) (handle-condition condition usocket))) + (with-mapped-conditions (usocket) + (sb-bsd-sockets:socket-connect socket host port)) usocket)) (defmethod socket-close ((usocket usocket)) "Close socket." - (handler-case (sb-bsd-sockets:socket-close (socket usocket)) - (condition (condition) (handle-condition condition usocket)))) + (with-mapped-conditions (usocket) + (sb-bsd-sockets:socket-close (socket usocket)))) (defun get-host-by-address (address) - (handler-case (sb-bsd-sockets::host-ent-name - (sb-bsd-sockets:get-host-by-address address)) - (condition (condition) (handle-condition condition)))) + (with-mapped-conditions () + (sb-bsd-sockets::host-ent-name + (sb-bsd-sockets:get-host-by-address address)))) (defun get-hosts-by-name (name) - (handler-case (sb-bsd-sockets::host-ent-addresses - (sb-bsd-sockets:get-host-by-name name)) - (condition (condition) (handle-condition condition)))) + (with-mapped-conditions () + (sb-bsd-sockets::host-ent-addresses + (sb-bsd-sockets:get-host-by-name name)))) Modified: usocket/trunk/condition.lisp ============================================================================== --- usocket/trunk/condition.lisp (original) +++ usocket/trunk/condition.lisp Fri Feb 3 13:09:09 2006 @@ -44,7 +44,8 @@ (usocket-condition)) (define-condition usocket-unknown-condition (usocket-condition) - ((real-condition)) + ((real-condition :initarg :real-condition + :accessor usocket-real-condition)) (:documentation "")) @@ -70,5 +71,54 @@ (usocket-error)) (define-condition usocket-unknown-error (usocket-error) - ((real-error)) + ((real-error :initarg :real-error + :accessor usocket-real-error)) (:documentation "")) + + +(defmacro with-mapped-conditions ((&optional socket) &body body) + `(handler-case + (progn ,@body) + (condition (condition) (handle-condition condition ,socket)))) + +(defparameter +unix-errno-condition-map+ + `((11 . usocket-retry-condition) ;; EAGAIN + (35 . usocket-retry-condition) ;; EDEADLCK + (4 . usocket-interrupted-condition))) ;; EINTR + +(defparameter +unix-errno-error-map+ + ;;### the first column is for non-(linux or srv4) systems + ;; the second for linux + ;; the third for srv4 + ;;###FIXME: How do I determine on which Unix we're running + ;; (at least in clisp and sbcl; I know about cmucl...) + ;; The table below works under the assumption we'll *only* see + ;; socket associated errors... + `(((48 98) . usocket-address-in-use-error) + ((49 99) . usocket-address-not-available-error) + ((9) . usocket-bad-file-descriptor-error) + ((61 111) . usocket-connection-refused-error) + ((22) . usocket-invalid-argument-error) + ((55 105) . usocket-no-buffers-error) + ((12) . usocket-out-of-memory-error) + ((45 95) . usocket-operation-not-supported-error) + ((1) . usocket-operation-not-permitted-error) + ((43 92) . usocket-protocol-not-supported-error) + ((44 93) . usocket-socket-type-not-supported-error) + ((51 102) . usocket-network-unreachable-error) + ((50 100) . usocket-network-down-error) + ((52 102) . usocket-network-reset-error) + ((58 108) . usocket-already-shutdown-error) + ((60 110) . usocket-connection-timeout-error) + ((64 112) . usocket-host-down-error) + ((65 113) . usocket-host-unreachable-error))) + + + + +(defun map-errno-condition (errno) + (cdr (assoc errno +unix-errno-error-map+))) + + +(defun map-errno-error (errno) + (cdr (assoc errno +unix-errno-error-map+ :test #'member)))

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

usocket-cvs February 2006