From df9cd86232a5528c9764e9b5b7a16f54cc9a0d96 Mon Sep 17 00:00:00 2001 From: mainzelm Date: Thu, 16 Jan 2003 13:07:14 +0000 Subject: [PATCH] Minor renamings. --- scheme/lib/dns.scm | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/scheme/lib/dns.scm b/scheme/lib/dns.scm index 4c8a2e9..7bbe844 100644 --- a/scheme/lib/dns.scm +++ b/scheme/lib/dns.scm @@ -1103,15 +1103,18 @@ (define *resolv.conf-cache*) (define *resolv.conf-cache-date* 0) -(define (parse-resolv.conf) +(define (resolv.conf) (let ((actual-m-time (file-info:mtime (file-info "/etc/resolv.conf")))) (if (> actual-m-time *resolv.conf-cache-date*) - (let ((contents (really-parse-resolv.conf "/etc/resolv.conf"))) - (set! *resolv.conf-cache* contents) - (set! *resolv.conf-cache-date* actual-m-time) - contents) - *resolv.conf-cache*))) + (parse-resolv.conf!)) + *resolv.conf-cache*)) +(define (parse-resolv.conf!) + (let ((actual-m-time (file-info:mtime (file-info "/etc/resolv.conf"))) + (contents (really-parse-resolv.conf "/etc/resolv.conf"))) + (set! *resolv.conf-cache* contents) + (set! *resolv.conf-cache-date* actual-m-time))) + (define (really-parse-resolv.conf file-name) ;; accumulate nameserver entries @@ -1199,7 +1202,7 @@ ;; Figure out the default name servers (define (dns-find-nameserver-list) - (cond ((assoc 'nameserver (parse-resolv.conf)) + (cond ((assoc 'nameserver (resolv.conf)) => (lambda (nameserver.list) (cdr nameserver.list))) (else '()))) @@ -1496,8 +1499,18 @@ (lambda () (dns-lookup-name name)))))) +(define (maybe-dns-lookup-ip ip-addr) + (call-with-current-continuation + (lambda (k) + (with-handler (lambda (cond more) + (if (dns-error? cond) + (k #f) + (more))) + (lambda () + (dns-lookup-ip ip-addr)))))) + (define (domains-for-search) - (let ((resolv.conf (parse-resolv.conf))) + (let ((resolv.conf (parse-resolv.conf!))) (cond ((assoc 'domain resolv.conf) => (lambda (pair) (list (cdr pair))))