X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fname-service.lisp;h=8015908093ffba4457e458335d08b88e7b0fc79b;hb=ecae2f9323086c64d026d4ce719590907f486c63;hp=5f038595820f4622c36374d94363a771530bf3a3;hpb=10d2c05ea44ca0837091434fe2223c0c31687615;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/name-service.lisp b/contrib/sb-bsd-sockets/name-service.lisp
index 5f03859..8015908 100644
--- a/contrib/sb-bsd-sockets/name-service.lisp
+++ b/contrib/sb-bsd-sockets/name-service.lisp
@@ -17,6 +17,8 @@ eventually, so that we can do DNS lookups in parallel with other things
 					; presently always AF_INET
    (addresses :initarg :addresses :accessor host-ent-addresses)))
 
+(defgeneric host-ent-address (host-ent))
+
 (defmethod host-ent-address ((host-ent host-ent))
   (car (host-ent-addresses host-ent)))
 
@@ -25,50 +27,47 @@ 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 make-host-ent (h)
+  (if (sb-grovel::foreign-nullp h) (name-service-error "gethostbyname"))
+  (let* ((length (sockint::hostent-length h))
+	 (aliases (loop for i = 0 then (1+ i)
+			for al = (sb-alien:deref (sockint::hostent-aliases h) i)
+			while al
+			collect al))
+	 (addresses 
+	  (loop for i = 0 then (1+ 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
+			   (loop for i from 0 below length
+				 collect (sb-alien:deref ad i)))
+			  (#.sockint::af-local
+			   (sb-alien:cast ad sb-alien:c-string))))))
+    (make-instance 'host-ent
+                   :name (sockint::hostent-name h)
+		   :type (sockint::hostent-type h)
+                   :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."
-  (let ((h (sockint::gethostbyname host-name)))
-    (make-host-ent h)))
+  (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
+ (integer 0 255), or throws some kind of error.  See gethostbyaddr(3) for
 grisly details."
-  (let ((packed-addr (sockint::allocate-in-addr)))
-    (loop for i from 0 to 3 
-	  do (setf (sockint::in-addr-addr packed-addr i) (elt address i)))
-    (make-host-ent
-     (sb-sys:without-gcing
-      (sockint::gethostbyaddr (sockint::array-data-address packed-addr)
-			      4
-			      sockint::af-inet)))))
-
-(defun make-host-ent (h)
-  (if (sockint::foreign-nullp h) (name-service-error "gethostbyname"))
-  (let* ((local-h (sockint::foreign-vector h 1 sockint::size-of-hostent))
-	 (length (sockint::hostent-length local-h))
-	 (aliases 
-	  (loop for i = 0 then (1+ i)
-		for al = (sb-sys:sap-ref-sap
-			  (sb-sys:int-sap (sockint::hostent-aliases local-h))
-			  (* i 4))
-		until (= (sb-sys:sap-int al) 0) 
-		collect (sb-c-call::%naturalize-c-string al)))
-	 (address0 (sb-sys:sap-ref-sap (sb-sys:int-sap (sockint::hostent-addresses local-h)) 0))
-	 (addresses 
-	  (loop for i = 0 then (+ length i)
-		for ad = (sb-sys:sap-ref-32 address0 i)
-		while (> ad 0)
-		collect
-		(sockint::foreign-vector (sb-sys:sap+ address0 i) 1 length))))
-    (make-instance 'host-ent
-                   :name (sb-c-call::%naturalize-c-string
-			  (sb-sys:int-sap (sockint::hostent-name local-h)))
-		   :type (sockint::hostent-type local-h)
-                   :aliases aliases
-                   :addresses addresses)))
+  (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
 
@@ -128,7 +127,7 @@ GET-NAME-SERVICE-ERRNO")
 	(sb-alien:alien-funcall
 	 (sb-alien:extern-alien "get_h_errno" (function integer)))))
 
-#-solaris
+#-(and cmu solaris)
 (progn
   #+sbcl
   (sb-alien:define-alien-routine "hstrerror"
@@ -141,4 +140,3 @@ GET-NAME-SERVICE-ERRNO")
   (defun get-name-service-error-message (num)
   (hstrerror num))
 )
-