tyler.durden
/
squidanalyzer
mirror of https://github.com/darold/squidanalyzer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support to ipv6 address dns resolving, you need perl > 5.014. Thanks to Brian J. Murrell for the report.

This commit is contained in:
Darold Gilles 2016-02-02 16:04:18 +01:00
parent df7b0a4cbd
commit 562b8e40d8
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
SquidAnalyzer.pm
View File

@ -18,7 +18,7 @@ BEGIN {
use vars qw($VERSION $COPYRIGHT $AUTHOR @ISA @EXPORT $ZCAT_PROG $BZCAT_PROG $XZCAT_PROG $RM_PROG); use vars qw($VERSION $COPYRIGHT $AUTHOR @ISA @EXPORT $ZCAT_PROG $BZCAT_PROG $XZCAT_PROG $RM_PROG);
use POSIX qw/ strftime sys_wait_h /; use POSIX qw/ strftime sys_wait_h /;
use IO::File; use IO::File;
use Socket; use Socket ();
use Time::HiRes qw/ualarm/; use Time::HiRes qw/ualarm/;
use Time::Local qw/timelocal_nocheck timegm_nocheck/; use Time::Local qw/timelocal_nocheck timegm_nocheck/;
use Fcntl qw(:flock); use Fcntl qw(:flock);
@ -1773,19 +1773,40 @@ sub _gethostbyaddr
{ {
my ($self, $ip) = @_; my ($self, $ip) = @_;
my $host = undef; my $host = undef;
my $err = '';
unless(exists $CACHE{$ip}) { unless(exists $CACHE{$ip}) {
eval { eval {
local $SIG{ALRM} = sub { die "DNS lookup timeout.\n"; }; local $SIG{ALRM} = sub { die "DNS lookup timeout.\n"; };
ualarm $self->{DNSLookupTimeout}; ualarm $self->{DNSLookupTimeout};
$host = gethostbyaddr(inet_aton($ip), AF_INET); my @addrs = ();
if ($] < 5.014) {
$host = gethostbyaddr(inet_aton($ip), AF_INET);
} else {
# We also need to resolve IPV6 addresses
if ($ip =~ /^\d+\.\d+\.\d+\.\d+$/) {
($err, @addrs) = Socket::getaddrinfo( $ip, 0, { 'protocol' => Socket::IPPROTO_TCP, 'family' => Socket::AF_INET } );
} else {
($err, @addrs) = Socket::getaddrinfo( $ip, 0, { 'protocol' => Socket::IPPROTO_TCP, 'family' => Socket::AF_INET6 } );
}
}
for my $addr (@addrs) {
($err, $host) = Socket::getnameinfo( $addr->{addr});
last;
}
ualarm 0; ualarm 0;
}; };
if ($@) { if ($@) {
$CACHE{$ip} = undef; delete $CACHE{$ip};
if (!$self->{QuietMode}) { if (!$self->{QuietMode}) {
warn "_gethostbyaddr timeout reach for ip: $ip, timeout can be adjusted with directive DNSLookupTimeout\n"; warn "_gethostbyaddr timeout reach for ip: $ip, timeout can be adjusted with directive DNSLookupTimeout\n";
} }
} elsif ($err) {
delete $CACHE{$ip};
if (!$self->{QuietMode}) {
warn "_gethostbyaddr error resolving ip: $ip, $err\n";
}
} }
else { else {
$CACHE{$ip} = $host; $CACHE{$ip} = $host;