(defmethod host-ent-address ((host-ent host-ent))
(car (host-ent-addresses host-ent)))
+#-sb-bsd-sockets-addrinfo
(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)
:aliases aliases
:addresses addresses)))
+(declaim (inline naturalize-unsigned-byte-8-array))
(defun naturalize-unsigned-byte-8-array (array length)
(let ((addr (make-array 4 :element-type '(unsigned-byte 8))))
(dotimes (i length)
;;; Resolving
+#-sb-bsd-sockets-addrinfo
+(sb-ext:defglobal **gethostby-lock** (sb-thread:make-mutex :name "gethostby lock"))
+
(defun get-host-by-name (host-name)
"Returns a HOST-ENT instance for HOST-NAME or signals a NAME-SERVICE-ERROR.
HOST-NAME may also be an IP address in dotted quad notation or some other
#+sb-bsd-sockets-addrinfo
(get-address-info host-name)
#-sb-bsd-sockets-addrinfo
- (make-host-ent (sockint::gethostbyname host-name)))
+ (sb-thread::with-system-mutex (**gethostby-lock** :allow-with-interrupts t)
+ (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
#+sb-bsd-sockets-addrinfo
(get-name-info address)
#-sb-bsd-sockets-addrinfo
- (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)))))
+ (sb-thread::with-system-mutex (**gethostby-lock** :allow-with-interrupts t)
+ (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))))))
;;; Emulate the above two functions with getaddrinfo / getnameinfo
#+sb-bsd-sockets-addrinfo
+(declaim (inline get-address-info))
+#+sb-bsd-sockets-addrinfo
(defun get-address-info (node)
- (sb-alien:with-alien ((res (* (* sockint::addrinfo)) :local
- (sb-alien:make-alien (* sockint::addrinfo))))
- (let ((err (sockint::getaddrinfo node nil nil res)))
+ (declare (optimize speed))
+ (sb-alien:with-alien ((info (* sockint::addrinfo)))
+ (let* ((err (sockint::getaddrinfo node nil nil (sb-alien:addr info)))
+ (to-free info))
(if (zerop err)
(let ((host-ent (make-instance 'host-ent
:name node
:type sockint::af-inet
:aliases nil
:addresses nil)))
- (loop for sap = (sb-alien:deref res) then (sockint::addrinfo-next info)
- until (sb-alien::null-alien sap)
- for info = (sb-alien:cast sap (* sockint::addrinfo))
+ (loop until (sb-alien::null-alien info)
;; Only handle AF_INET currently.
- do (when (eq (sockint::addrinfo-family info) sockint::af-inet)
- (let* ((sockaddr (sockint::addrinfo-addr info))
- (address (sockint::sockaddr-in-addr sockaddr)))
- ;; The same effective result can be multiple time
- ;; in the list, with different socktypes. Only record
- ;; each address once.
- (setf (slot-value host-ent 'addresses)
- (adjoin (naturalize-unsigned-byte-8-array address
- 4)
- (host-ent-addresses host-ent)
- :test 'equalp)))))
- (sockint::free-addrinfo (sb-alien:deref res))
+ do
+ (when (eq (sockint::addrinfo-family info) sockint::af-inet)
+ (let* ((sockaddr (sockint::addrinfo-addr info))
+ (address (sockint::sockaddr-in-addr sockaddr)))
+ ;; The same effective result can be multiple time
+ ;; in the list, with different socktypes. Only record
+ ;; each address once.
+ (setf (slot-value host-ent 'addresses)
+ (adjoin (naturalize-unsigned-byte-8-array address
+ 4)
+ (host-ent-addresses host-ent)
+ :test 'equalp))))
+ (setf info (sockint::addrinfo-next info)))
+ (sockint::freeaddrinfo to-free)
host-ent)
(addrinfo-error "getaddrinfo" err)))))
(defconstant ni-max-host 1025)
#+sb-bsd-sockets-addrinfo
+(declaim (inline get-name-info))
+#+sb-bsd-sockets-addrinfo
(defun get-name-info (address)
+ (declare (optimize speed)
+ (vector address))
(assert (= (length address) 4))
(sockint::with-sockaddr-in sockaddr ()
(sb-alien:with-alien ((host-buf (array char #.ni-max-host)))
(dotimes (i 4)
(setf (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) i)
(aref address i)))
- (let ((err (sockint::getnameinfo (sb-alien:alien-sap sockaddr)
+ (let ((err (sockint::getnameinfo sockaddr
(sb-alien:alien-size sockint::sockaddr-in :bytes)
(sb-alien:cast host-buf (* char)) ni-max-host
nil 0
(let ((*name-service-errno* (get-name-service-errno errno)))
;; Comment next to NETDB_INTERNAL in netdb.h says "See errno.".
;; This special case treatment hasn't actually been tested yet.
- #-win32
- (if (= *name-service-errno* sockint::NETDB-INTERNAL)
+ (if (and #-win32 (= *name-service-errno* sockint::NETDB-INTERNAL))
(socket-error where)
(let ((condition
(condition-for-name-service-errno *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)
projects / sbcl.git / blobdiff