X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Fsb-bsd-sockets%2Fname-service.lisp;h=03dd6c5ec210a0620c9aa5f316bbb2c6dbebe8b8;hb=095564c28a259002c7e34fd1d861f5bbd0a959b6;hp=7fc2892f65afc1a43e277b66e23dafd3d505a769;hpb=d4c7ab04ed10729a2cfa3321f4382d8a218ad958;p=sbcl.git
diff --git a/contrib/sb-bsd-sockets/name-service.lisp b/contrib/sb-bsd-sockets/name-service.lisp
index 7fc2892..03dd6c5 100644
--- a/contrib/sb-bsd-sockets/name-service.lisp
+++ b/contrib/sb-bsd-sockets/name-service.lisp
@@ -1,25 +1,21 @@
(in-package :sb-bsd-sockets)
-#|| Name Service
-
-
Presently name service is implemented by calling whatever -gethostbyname(2) uses. This may be any or all of /etc/hosts, NIS, DNS, -or something completely different. Typically it's controlled by -/etc/nsswitch.conf - -
Direct links to the asynchronous resolver(3) routines would be nice to have -eventually, so that we can do DNS lookups in parallel with other things -|# (defclass host-ent () ((name :initarg :name :accessor host-ent-name) (aliases :initarg :aliases :accessor host-ent-aliases) (address-type :initarg :type :accessor host-ent-address-type) ; presently always AF_INET - (addresses :initarg :addresses :accessor host-ent-addresses))) + (addresses :initarg :addresses :accessor host-ent-addresses)) + ;; FIXME: Our Texinfo documentation extracter need at least his to spit + ;; out the signature. Real documentation would be better... + (:documentation "")) -(defgeneric host-ent-address (host-ent)) +(defgeneric host-ent-address (host-ent) + ;; FIXME: Our Texinfo documentation extracter need at least his to spit + ;; out the signature. Real documentation would be better... + (:documentation "")) -(defmethod host-ent-address ((host-ent host-ent)) +(defmethod host-ent-address ((host-ent host-ent)) (car (host-ent-addresses host-ent))) ;(define-condition host-not-found-error (socket-error)) ; host unknown @@ -27,25 +23,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,15 +30,17 @@ 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 - (loop for i from 0 below length - collect (sb-alien:deref ad i))) + (assert (= length 4)) + (let ((addr (make-array 4 :element-type '(unsigned-byte 8)))) + (loop for i from 0 below length + do (setf (elt addr i) (sb-alien:deref ad i))) + addr)) (#.sockint::af-local (sb-alien:cast ad sb-alien:c-string)))))) (make-instance 'host-ent @@ -70,6 +49,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 @@ -77,6 +75,9 @@ grisly details." GET-NAME-SERVICE-ERRNO") (defun name-service-error (where) + ;; FIXME: Our Texinfo documentation extracter need at least his to spit + ;; out the signature. Real documentation would be better... + "" (get-name-service-errno) ;; Comment next to NETDB_INTERNAL in netdb.h says "See errno.". ;; This special case treatment hasn't actually been tested yet.