[ViewVC] Diff of: cvs/AnyEvent/lib/AnyEvent/DNS.pm

Comparing AnyEvent/lib/AnyEvent/DNS.pm (file contents):
Revision 1.63 by root, Wed Jun 4 22:47:27 2008 UTC vs.
Revision 1.96 by root, Mon Jun 29 21:00:32 2009 UTC

 use AnyEvent ();
 use AnyEvent::Handle ();
 use AnyEvent::Util qw(AF_INET6);
-our $VERSION = 4.13;
+our $VERSION = 4.45;
 our @DNS_FALLBACK = (v208.67.220.220, v208.67.222.222);
 =item AnyEvent::DNS::a $domain, $cb->(@addrs)
       my %pri;
       push @{ $pri{$_->[3]} }, [ @$_[3,4,5,6] ]
          for @_;
       # order by priority
-      for my $pri (sort { $a->[0] <=> $b->[0] } keys %pri) {
+      for my $pri (sort { $a <=> $b } keys %pri) {
          # order by weight
          my @rr = sort { $a->[1] <=> $b->[1] } @{ delete $pri{$pri} };
          my $sum; $sum += $_->[1] for @rr;
 C<$ENV{PERL_ANYEVENT_EDNS0}>, but when set to C<1>, AnyEvent::DNS will use
 EDNS0 in all requests.
 =cut
-our $EDNS0 = $ENV{PERL_ANYEVENT_EDNS0} * 1; # set to 1 to enable (partial) edns0
+our $EDNS0 = $ENV{PERL_ANYEVENT_EDNS0}*1; # set to 1 to enable (partial) edns0
 our %opcode_id = (
    query  => 0,
    iquery => 1,
    status => 2,
    mx    =>  15,
    txt   =>  16,
    aaaa  =>  28,
    srv   =>  33,
    naptr =>  35, # rfc2915
+   dname =>  39, # rfc2672
    opt   =>  41,
    spf   =>  99,
    tkey  => 249,
    tsig  => 250,
    ixfr  => 251,
     15 => sub { local $ofs = $ofs + 2 - length; ((unpack "n", $_), _dec_name) }, # mx
     16 => sub { unpack "(C/a*)*", $_ }, # txt
     28 => sub { AnyEvent::Socket::format_address ($_) }, # aaaa
     33 => sub { local $ofs = $ofs + 6 - length; ((unpack "nnn", $_), _dec_name) }, # srv
     35 => sub { # naptr
+       # requires perl 5.10, sorry
        my ($order, $preference, $flags, $service, $regexp, $offset) = unpack "nn C/a* C/a* C/a* .", $_;
        local $ofs = $ofs + $offset - length;
        ($order, $preference, $flags, $service, $regexp, _dec_name)
     },
+    39 => sub { local $ofs = $ofs - length; _dec_name }, # dname
     99 => sub { unpack "(C/a*)*", $_ }, # spf
 );
 sub _dec_rr {
    my $name = _dec_name;
 our $RESOLVER;
 sub resolver() {
    $RESOLVER || do {
-      $RESOLVER = new AnyEvent::DNS;
+      $RESOLVER = new AnyEvent::DNS untaint => 1;
       $RESOLVER->os_config;
       $RESOLVER
    }
 }
 =item reuse => $seconds
 The number of seconds (default: C<300>) that a query id cannot be re-used
 after a timeout. If there was no time-out then query ids can be reused
 immediately.
+=item untaint => $boolean
+When true, then the resolver will automatically untaint results, and might
+also ignore certain environment variables.
 =back
 =cut
    $self->_compile;
 }
 =item $resolver->os_config
-Tries so load and parse F</etc/resolv.conf> on portable operating systems. Tries various
+Tries so load and parse F</etc/resolv.conf> on portable operating
-egregious hacks on windows to force the DNS servers and searchlist out of the system.
+systems. Tries various egregious hacks on windows to force the DNS servers
+and searchlist out of the system.
 =cut
 sub os_config {
    my ($self) = @_;
 }
 sub _feed {
    my ($self, $res) = @_;
+   ($res) = $res =~ /^(.*)$/s
+      if AnyEvent::TAINT && $self->{untaint};
    $res = dns_unpack $res
       or return;
    my $id = $self->{id}{$res->{id}};
       $self->{id}{$req->[2]} = [AnyEvent->timer (after => $timeout, cb => sub {
          $NOW = time;
          # timeout, try next
-         &$do_retry;
+         &$do_retry if $do_retry;
       }), sub {
          my ($res) = @_;
          if ($res->{tc}) {
             # success, but truncated, so use tcp
    push @{ $self->{queue} }, [dns_pack $req, $cb];
    $self->_scheduler;
 }
-=item $resolver->resolve ($qname, $qtype, %options, $cb->($rcode, @rr))
+=item $resolver->resolve ($qname, $qtype, %options, $cb->(@rr))
 Queries the DNS for the given domain name C<$qname> of type C<$qtype>.
 A C<$qtype> is either a numerical query type (e.g. C<1> for A records) or
 a lowercase name (you have to look at the source to see which aliases are
 The callback will be invoked with a list of matching result records or
 none on any error or if the name could not be found.
 CNAME chains (although illegal) are followed up to a length of 10.
-The callback will be invoked with an result code in string form (noerror,
+The callback will be invoked with arraryefs of the form C<[$name, $type,
-formerr, servfail, nxdomain, notimp, refused and so on), or numerical
+$class, @data>], where C<$name> is the domain name, C<$type> a type string
-form if the result code is not supported. The remaining arguments are
+or number, C<$class> a class name and @data is resource-record-dependent
-arraryefs of the form C<[$name, $type, $class, @data>], where C<$name> is
+data. For C<a> records, this will be the textual IPv4 addresses, for C<ns>
-the domain name, C<$type> a type string or number, C<$class> a class name
+or C<cname> records this will be a domain name, for C<txt> records these
-and @data is resource-record-dependent data. For C<a> records, this will
+are all the strings and so on.
-be the textual IPv4 addresses, for C<ns> or C<cname> records this will be
-a domain name, for C<txt> records these are all the strings and so on.
 All types mentioned in RFC 1035, C<aaaa>, C<srv>, C<naptr> and C<spf> are
 decoded. All resource records not known to this module will have
 the raw C<rdata> field as fourth entry.

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing AnyEvent/lib/AnyEvent/DNS.pm (file contents): Revision 1.63 by root, Wed Jun 4 22:47:27 2008 UTC vs. Revision 1.96 by root, Mon Jun 29 21:00:32 2009 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent/DNS.pm (file contents):
Revision 1.63 by root, Wed Jun 4 22:47:27 2008 UTC vs.
Revision 1.96 by root, Mon Jun 29 21:00:32 2009 UTC