From 89db7676c417c6db80b23aef3e1c70c5258ba6b8 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 23 Oct 2008 18:24:11 -0500 Subject: [PATCH] dns.forwarding: Use new 'ask-servers' --- extra/dns/forwarding/forwarding.factor | 7 +++++-- extra/dns/resolver/resolver.factor | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/extra/dns/forwarding/forwarding.factor b/extra/dns/forwarding/forwarding.factor index 6d4fece949..4b7db30abd 100644 --- a/extra/dns/forwarding/forwarding.factor +++ b/extra/dns/forwarding/forwarding.factor @@ -2,7 +2,8 @@ USING: kernel sequences combinators accessors locals random combinators.short-circuit io.sockets - dns dns.util dns.cache.rr dns.cache.nx ; + dns dns.util dns.cache.rr dns.cache.nx + dns.resolver ; IN: dns.forwarding @@ -99,7 +100,9 @@ IN: dns.forwarding MSG additional-section>> [ cache-add ] each MSG ; -: answer-from-server ( msg servers -- msg ) random ask-server cache-message ; +! : answer-from-server ( msg servers -- msg ) random ask-server cache-message ; + +: answer-from-server ( msg servers -- msg ) ask-servers cache-message ; :: find-answer ( MSG SERVERS -- msg ) { [ MSG answer-from-cache ] [ MSG SERVERS answer-from-server ] } 0|| ; diff --git a/extra/dns/resolver/resolver.factor b/extra/dns/resolver/resolver.factor index f7983965d5..32ad23669c 100644 --- a/extra/dns/resolver/resolver.factor +++ b/extra/dns/resolver/resolver.factor @@ -60,7 +60,7 @@ IN: dns.resolver ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: dns-ip ( name -- ips ) +: dns-ip4 ( name -- ips ) fully-qualified [let | MSG [ A IN query boa query->message dns-servers ask-servers ] | MSG rcode>> NO-ERROR = @@ -68,3 +68,5 @@ IN: dns.resolver [ "dns-ip: rcode = " MSG rcode>> unparse append throw ] if ] ; +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +