Changeset 13377

Timestamp:

Jan 11, 2010, 9:59:39 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

Define a few keyword identifiers for errors returned by getaddrinfo.
The keywords are really more suited to the errors returned in h_errno
by gethostbyaddr, but the meaning is similar, and the
gethostbyaddr-style names are perhaps a little more familiar.

In socket-error: A socket-error will never be signaled as a result of
a nameserver error, so don't worry about calling %gai-strerror in that
case.

In socket-error: When signaling a socket-creation-error, look in
*gai-error-identifiers* for an identifier keyword when nameserver-p is
true, and call the appropriate error string getter.

Note that on Windows, the error codes returned by getaddrinfo map to
regular Windows error codes: %windows-error-string therefore does the
job. On Unix systems, the EAI_xxx codes may overlap the system error
numbers, and the separate function %gai-strerror is required.

Export socket-creation-error and its readers from the CCL and
OPENMCL-SOCKET packages.

File:

• trunk/source/level-1/l1-sockets.lisp (modified) (6 diffs)

trunk/source/level-1/l1-sockets.lisp

@@ -48 +48 @@
             SOCKET-ERROR-IDENTIFIER
             SOCKET-ERROR-SITUATION
+            SOCKET-CREATION-ERROR
+            SOCKET-CREATION-ERROR-CODE
+            SOCKET-CREATION-ERROR-IDENTIFIER
+            SOCKET-CREATION-ERROR-SITUATION
             WITH-OPEN-SOCKET))
   #+windows-target
@@ -134 +138 @@
                 "SOCKET-ERROR-IDENTIFIER"
                 "SOCKET-ERROR-SITUATION"
+                "SOCKET-CREATION-ERROR"
+                "SOCKET-CREATION-ERROR-CODE"
+                "SOCKET-CREATION-ERROR-IDENTIFIER"
+                "SOCKET-CREATION-ERROR-SITUATION"
                 "WITH-OPEN-SOCKET")
   (:export  "MAKE-SOCKET"
@@ -162 +170 @@
             "SOCKET-ERROR-IDENTIFIER"
             "SOCKET-ERROR-SITUATION"
+            "SOCKET-CREATION-ERROR"
+            "SOCKET-CREATION-ERROR-CODE"
+            "SOCKET-CREATION-ERROR-IDENTIFIER"
+            "SOCKET-CREATION-ERROR-SITUATION"
             "WITH-OPEN-SOCKET"))
-
-
 
 (define-condition socket-error (simple-stream-error)
   ((code :initarg :code :reader socket-error-code)
    (identifier :initform :unknown :initarg :identifier :reader socket-error-identifier)
-   (Situation :initarg :situation :reader socket-error-situation)))
+   (situation :initarg :situation :reader socket-error-situation)))
 
 (define-condition socket-creation-error (simple-error)
@@ -175 +185 @@
    (identifier :initform :unknown :initarg :identifier :reader socket-creation-error-identifier)
    (situation :initarg :situation :reader socket-creation-error-situation)))
+
+(defparameter *gai-error-identifiers*
+  (list #$EAI_AGAIN :try-again
+        #$EAI_FAIL :no-recovery
+        #$EAI_NONAME :host-not-found))
 
 (defvar *socket-error-identifiers*
@@ -229 +244 @@
       (format nil "Unknown nameserver error ~d" err)
       (%get-cstring p))))
-    
-
 
 (defun socket-error (stream where errno &optional nameserver-p)
   "Creates and signals (via error) one of two socket error 
 conditions, based on the state of the arguments."
-  #+windows-target (declare (ignore nameserver-p))
   (when (< errno 0)
     (setq errno (- errno)))
@@ -244 +256 @@
                            :identifier (getf *socket-error-identifiers* errno :unknown)
                            :situation where
-                           ;; TODO: this is a constant arg, there is a way to put this
-                           ;; in the class definition, just need to remember how...
                            :format-control "~a (error #~d) during ~a"
                            :format-arguments (list
-                                              #+windows-target
-                                              (%windows-error-string errno)
-                                              #-windows-target
-                                              (if nameserver-p
-                                                (%gai-strerror errno)
-                                                (%strerror errno))
+                                              #+windows-target
+                                              (%windows-error-string errno)
+                                              #-windows-target
+                                              (%strerror errno)
                                               errno where)))
-    (error (make-condition 'socket-creation-error
-                           :code errno
-                           :identifier (getf *socket-error-identifiers* errno :unknown)
-                           :situation where
-                           ;; TODO: this is a constant arg, there is a way to put this
-                           ;; in the class definition, just need to remember how...
-                           :format-control "~a (error #~d) during socket creation or nameserver operation in ~a"
-                           :format-arguments (list
-                                              #+windows-target
-                                              (%windows-error-string errno)
-                                              #-windows-target
-                                              (if nameserver-p
-                                                (%gai-strerror errno)
-                                                (%strerror errno))
-                                              errno where)))))
-    
-
+    (let ((identifiers (if nameserver-p
+                         *gai-error-identifiers*
+                         *socket-error-identifiers*)))
+      (error (make-condition 'socket-creation-error
+                             :code errno
+                             :identifier (getf identifiers errno :unknown)
+                             :situation where
+                             :format-control "~a (error #~d) during socket creation or nameserver operation in ~a"
+                             :format-arguments (list
+                                                #+windows-target
+                                                (%windows-error-string errno)
+                                                #-windows-target
+                                                (if nameserver-p
+                                                  (%gai-strerror errno)
+                                                  (%strerror errno))
+                                                errno where))))))
 
 ;; If true, this will try to allow other cooperative processes to run