135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for broken [#82] (/etc/hosts check during ARP IP resolv)

Browse Source
This commit is contained in:
Oliver Gorwits
2014-04-20 23:33:42 +01:00
parent 3edef4719d
commit 68152d15a3
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -9,6 +9,7 @@
* Search for localenv could not find $HOME * Search for localenv could not find $HOME
* Fixes to allow output of get_init_file to be used as init script * Fixes to allow output of get_init_file to be used as init script
* Legitimate for same MAC to be in two VLANs on same switchport * Legitimate for same MAC to be in two VLANs on same switchport
* Fix for broken [#82] (/etc/hosts check during ARP IP resolv)
2.025001 - 2014-04-08 2.025001 - 2014-04-08

30
Netdisco/lib/App/Netdisco/Util/DNS.pm
View File

@@ -5,7 +5,6 @@ use warnings;
use Dancer ':script'; use Dancer ':script';
use Net::DNS; use Net::DNS;
use AnyEvent::DNS::EtcHosts;
use AnyEvent::DNS; use AnyEvent::DNS;
use NetAddr::IP::Lite ':lower'; use NetAddr::IP::Lite ':lower';
@@ -95,6 +94,22 @@ addresses which resolved.
=cut =cut
# AE::DNS::EtcHosts only works for A/AAAA/SRV, but we want PTR.
# this loads+parses /etc/hosts file using AE. dirty hack.
BEGIN {
use AnyEvent::Socket 'format_address';
use AnyEvent::DNS::EtcHosts;
AnyEvent::DNS::EtcHosts::_load_hosts_unless(sub{},AE::cv);
no AnyEvent::DNS::EtcHosts; # unimport
$AnyEvent::DNS::EtcHosts::HOSTS{$_}
= [ map { [ format_address $_->[0] ] }
@{$AnyEvent::DNS::EtcHosts::HOSTS{$_}} ]
for keys %AnyEvent::DNS::EtcHosts::HOSTS;
}
sub hostnames_resolve_async { sub hostnames_resolve_async {
my $ips = shift; my $ips = shift;
@@ -104,9 +119,18 @@ sub hostnames_resolve_async {
my $done = AE::cv; my $done = AE::cv;
$done->begin( sub { shift->send } ); $done->begin( sub { shift->send } );
foreach my $hash_ref (@$ips) { IP: foreach my $hash_ref (@$ips) {
my $ip = $hash_ref->{'ip'} || $hash_ref->{'alias'}; my $ip = $hash_ref->{'ip'} || $hash_ref->{'alias'};
next if no_resolve($ip); next IP if no_resolve($ip);
# check /etc/hosts file and short-circuit if found
foreach my $name (reverse sort keys %AnyEvent::DNS::EtcHosts::HOSTS) {
if ($AnyEvent::DNS::EtcHosts::HOSTS{$name}->[0]->[0] eq $ip) {
$hash_ref->{'dns'} = $name;
next IP;
}
}
$done->begin; $done->begin;
AnyEvent::DNS::reverse_lookup $ip, AnyEvent::DNS::reverse_lookup $ip,
sub { $hash_ref->{'dns'} = shift; $done->end; }; sub { $hash_ref->{'dns'} = shift; $done->end; };