X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/cc0fa47a50532786e202ee24c6518e50ba6959e2..8e7c1366598806dff2b2e4fb2016efb5a78f42ec:/net.lisp diff --git a/net.lisp b/net.lisp index 28f10ef..751ecfd 100644 --- a/net.lisp +++ b/net.lisp @@ -1,7 +1,5 @@ ;;; -*-lisp-*- ;;; -;;; $Id$ -;;; ;;; Network (numbering) tools ;;; ;;; (c) 2006 Straylight/Edgeware @@ -27,7 +25,7 @@ ;;; Packaging. (defpackage #:net - (:use #:common-lisp #:mdw.base #:mdw.str #:collect) + (:use #:common-lisp #:mdw.base #:mdw.str #:collect #:net-sys) (:export #:ipaddr #:string-ipaddr #:ipaddr-byte #:ipaddr-string #:ipaddrp #:integer-netmask #:ipmask #:ipmask-cidl-slash #:make-ipnet #:string-ipnet #:ipnet #:ipnet-net #:ipnet-mask #:with-ipnet @@ -253,27 +251,6 @@ (return (- 4 i))))) ;;;-------------------------------------------------------------------------- -;;; Name resolution. - -(defun resolve-hostname (name) - "Resolve a hostname to an IP address using the DNS, or return nil." - #+cmu (let ((he (ext:lookup-host-entry name))) - (and he (ext:host-entry-addr he))) - #+clisp (let ((he (ext:resolve-host-ipaddr name))) - (and he (string-ipaddr (car (ext:hostent-addr-list he))))) - #+ecl (nth-value 2 (ext:lookup-host-entry name)) - #-(or cmu clisp ecl) nil) - -(defun canonify-hostname (name) - "Resolve a hostname to canonical form using the DNS, or return nil." - #+cmu (let ((he (ext:lookup-host-entry name))) - (and he (ext:host-entry-name he))) - #+clisp (let ((he (ext:resolve-host-ipaddr name))) - (and he (ext:hostent-name he))) - #+ecl (nth-value 0 (ext:lookup-host-entry name)) - #-(or cmu clisp ecl) name) - -;;;-------------------------------------------------------------------------- ;;; Host names and specifiers. (defun parse-ipaddr (addr)