X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fname-service.lisp;h=165c2152f18413da85e330451d79d8f1c70c7a7a;hb=ecfd159f29d31d2cc08d4e5598346c04c9387636;hp=40c9cf53b3709d1e2f8bbb6ac50f0b8911ddd37c;hpb=faaefce871eb7e00b0c9d23321e5cdfce25f418d;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/name-service.lisp b/contrib/sb-bsd-sockets/name-service.lisp
index 40c9cf5..165c215 100644
--- a/contrib/sb-bsd-sockets/name-service.lisp
+++ b/contrib/sb-bsd-sockets/name-service.lisp
@@ -1,16 +1,15 @@
 (in-package :sb-bsd-sockets)
 
 (defclass host-ent ()
-  ;; Unfortunately the docstring generator can't currently create.
-  ((name :initarg :name :accessor host-ent-name
+  ((name :initarg :name :reader host-ent-name
          :documentation "The name of the host")
    ;; Deliberately not documented, since this isn't very useful,
    ;; and the data isn't available when using getaddrinfo(). Unfortunately
    ;; it is exported.
-   (aliases :initarg :aliases :accessor host-ent-aliases)
+   (aliases :initarg :aliases :reader host-ent-aliases)
    ;; presently always AF_INET. Not exported.
-   (address-type :initarg :type :accessor host-ent-address-type)
-   (addresses :initarg :addresses :accessor host-ent-addresses
+   (address-type :initarg :type :reader host-ent-address-type)
+   (addresses :initarg :addresses :reader host-ent-addresses
               :documentation "A list of addresses for this host."))
   (:documentation "This class represents the results of an address lookup."))
 
@@ -21,7 +20,7 @@
   (car (host-ent-addresses host-ent)))
 
 (defun make-host-ent (h &optional errno)
-  (when (sb-grovel::foreign-nullp h)
+  (when (sb-alien:null-alien h)
     (name-service-error "gethostbyname" errno))
   (let* ((length (sockint::hostent-length h))
          (aliases (loop for i = 0 then (1+ i)
@@ -36,6 +35,7 @@
                           (#.sockint::af-inet
                            ;; CLH: Work around x86-64 darwin bug here.
                            ;; The length is reported as 8, when it should be 4.
+                           ;; FIXME: this is rumored to be fixed in 10.5
                            #+(and darwin x86-64)
                            (progn
                              (assert (or (= length 4) (= length 8)))
@@ -109,7 +109,7 @@ weird stuff - see gethostbyname(3) or getaddrinfo(3) for the details."
                          ;; The same effective result can be multiple time
                          ;; in the list, with different socktypes. Only record
                          ;; each address once.
-                         (setf (host-ent-addresses host-ent)
+                         (setf (slot-value host-ent 'addresses)
                                (adjoin (naturalize-unsigned-byte-8-array address
                                                                          4)
                                        (host-ent-addresses host-ent)
@@ -125,6 +125,7 @@ weird stuff - see gethostbyname(3) or getaddrinfo(3) for the details."
   (assert (= (length address) 4))
   (sockint::with-sockaddr-in sockaddr ()
     (sb-alien:with-alien ((host-buf (array char #.ni-max-host)))
+      #+darwin (setf (sockint::sockaddr-in-len sockaddr) 16)
       (setf (sockint::sockaddr-in-family sockaddr) sockint::af-inet)
       (dotimes (i 4)
         (setf (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) i)
@@ -169,7 +170,7 @@ GET-NAME-SERVICE-ERRNO")
   (let ((condition (condition-for-name-service-error-code error-code)))
     (error condition :error-code error-code :syscall where)))
 
-(define-condition name-service-error (condition)
+(define-condition name-service-error (error)
   ((errno :initform nil :initarg :errno :reader name-service-error-errno)
    (error-code :initform nil :initarg :error-code
                :reader name-service-error-error-code)
@@ -229,8 +230,11 @@ GET-NAME-SERVICE-ERRNO")
     sockint::EAI-FAIL
     no-recovery-error)
 (define-name-service-condition
-    sockint::NO-ADDRESS  ;; Also defined as NO-DATA, with the same value
-    #-freebsd sockint::EAI-NODATA #+freebsd nil
+    ;; Also defined as NO-DATA, with the same value
+    sockint::NO-ADDRESS
+    ;; getaddrinfo() as of RFC 3493 can no longer distinguish between
+    ;; host no found and address not found
+    nil
     no-address-error)
 
 (defun condition-for-name-service-errno (err)