Mailing List Archive

Author: sidney
Date: Mon May 2 21:13:37 2005
New Revision: 167857

URL: http://svn.apache.org/viewcvs?rev=167857&view=rev
Log:
Create a wrapper method in DnsResolver to call the underlying resolver nameservers function to avoid ugly bypass of class encapsulation I introduced in Dns.pm in my last patch

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?rev=167857&r1=167856&r2=167857&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Mon May 2 21:13:37 2005
@@ -623,7 +623,7 @@
# but only uses the first in a background query like we use.
# Try the different nameservers here in case the first one is not woorking

- my @nameservers = $self->{resolver}->get_resolver->nameservers();
+ my @nameservers = $self->{resolver}->nameservers();
dbg("dns: testing resolver nameservers: ".join(", ", @nameservers));
my $ns;
while( $ns = shift(@nameservers)) {
@@ -650,7 +650,7 @@
}
last if $IS_DNS_AVAILABLE;
dbg("dns: NS lookups failed, removing nameserver $ns from list");
- $self->{resolver}->get_resolver->nameservers(@nameservers);
+ $self->{resolver}->nameservers(@nameservers);
$self->{resolver}->connect_sock(); # reconnect socket to new nameserver
}


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?rev=167857&r1=167856&r2=167857&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm Mon May 2 21:13:37 2005
@@ -120,6 +120,18 @@
return $self->{res};
}

+=item $res->nameservers()
+
+Wrapper for Net::DNS::Reslolver->nameservers to get or set list of nameservers
+
+=cut
+
+sub nameservers {
+ my $self = shift;
+ my $res = $self->{res};
+ return $res->nameservers(@_) if $res;
+}
+
=item $res->connect_sock()

Re-connect to the first nameserver listed in C</etc/resolv.conf> or similar