0.8.12.40:

[sbcl.git] / contrib / sb-bsd-sockets / name-service.lisp

diff --git a/contrib/sb-bsd-sockets/name-service.lisp b/contrib/sb-bsd-sockets/name-service.lisp
index 7fc2892..8015908 100644 (file)
--- a/contrib/sb-bsd-sockets/name-service.lisp
+++ b/contrib/sb-bsd-sockets/name-service.lisp
@@ -27,25 +27,6 @@ eventually, so that we can do DNS lookups in parallel with other things
 ;(define-condition no-recovery-error (socket-error)) ; name server error
 ;(define-condition try-again-error (socket-error)) ; temporary
 
-(defun get-host-by-name (host-name)
-  "Returns a HOST-ENT instance for HOST-NAME or throws some kind of condition.
-HOST-NAME may also be an IP address in dotted quad notation or some other
-weird stuff - see gethostbyname(3) for grisly details."
-  (make-host-ent (sockint::gethostbyname host-name)))
-
-(defun get-host-by-address (address)
-  "Returns a HOST-ENT instance for ADDRESS, which should be a vector of
- (integer 0 255), or throws some kind of error.  See gethostbyaddr(3) for
-grisly details."
-  (sockint::with-in-addr packed-addr ()
-    (let ((addr-vector (coerce address 'vector)))
-      (loop for i from 0 below (length addr-vector)
-           do (setf (sb-alien:deref (sockint::in-addr-addr packed-addr) i)
-                    (elt addr-vector i)))
-      (make-host-ent (sockint::gethostbyaddr packed-addr
-                                            4
-                                            sockint::af-inet)))))
-
 (defun make-host-ent (h)
   (if (sb-grovel::foreign-nullp h) (name-service-error "gethostbyname"))
   (let* ((length (sockint::hostent-length h))
@@ -53,10 +34,9 @@ grisly details."
                        for al = (sb-alien:deref (sockint::hostent-aliases h) i)
                        while al
                        collect al))
-        (address0 (sockint::hostent-addresses h))
         (addresses 
          (loop for i = 0 then (1+ i)
-               for ad = (sb-alien:deref address0 i)
+               for ad = (sb-alien:deref (sockint::hostent-addresses h) i)
                until (sb-alien:null-alien ad)
                collect (ecase (sockint::hostent-type h)
                          (#.sockint::af-inet
@@ -70,6 +50,25 @@ grisly details."
                    :aliases aliases
                    :addresses addresses)))
 
+(defun get-host-by-name (host-name)
+  "Returns a HOST-ENT instance for HOST-NAME or throws some kind of condition.
+HOST-NAME may also be an IP address in dotted quad notation or some other
+weird stuff - see gethostbyname(3) for grisly details."
+  (make-host-ent (sockint::gethostbyname host-name)))
+
+(defun get-host-by-address (address)
+  "Returns a HOST-ENT instance for ADDRESS, which should be a vector of
+ (integer 0 255), or throws some kind of error.  See gethostbyaddr(3) for
+grisly details."
+  (sockint::with-in-addr packed-addr ()
+    (let ((addr-vector (coerce address 'vector)))
+      (loop for i from 0 below (length addr-vector)
+           do (setf (sb-alien:deref (sockint::in-addr-addr packed-addr) i)
+                    (elt addr-vector i)))
+      (make-host-ent (sockint::gethostbyaddr packed-addr
+                                            4
+                                            sockint::af-inet)))))
+
 ;;; The remainder is my fault - gw
 
 (defvar *name-service-errno* 0