From 7293793c1ad6890095a7860495838bc4d431b506 Mon Sep 17 00:00:00 2001 From: ligc Date: Mon, 10 May 2010 09:04:59 +0000 Subject: [PATCH] ipv6 fix, replace the Socket library calls with NetworkUtils subroutines git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6042 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/nodestat.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/nodestat.pm b/xCAT-server/lib/xcat/plugins/nodestat.pm index dccba9668..74e0a01be 100644 --- a/xCAT-server/lib/xcat/plugins/nodestat.pm +++ b/xCAT-server/lib/xcat/plugins/nodestat.pm @@ -16,6 +16,7 @@ use IO::Handle; use Getopt::Long; use Data::Dumper; use xCAT::GlobalDef; +use xCAT::NetworkUtils; my %nodesetstats; @@ -496,15 +497,15 @@ sub process_request_nmap { my %unknownnodes; foreach (@nodes) { $unknownnodes{$_}=1; - my $packed_ip = undef; - $packed_ip = gethostbyname($_); - if( !defined $packed_ip) { + my $ip = undef; + $ip = xCAT::NetworkUtils->getipaddr($_); + if( !defined $ip) { my %rsp; $rsp{name}=[$_]; $rsp{data} = [ "Please make sure $_ exists in /etc/hosts or DNS" ]; $callback->({node=>[\%rsp]}); } else { - $nodebyip{inet_ntoa($packed_ip)} = $_; + $nodebyip{$ip} = $_; } } @@ -529,8 +530,7 @@ sub process_request_nmap { if (/Interesting ports on ([^ ]*) /) { $currnode=$1; my $nip; - if ($nip = gethostbyname($currnode)) { - $nip = inet_ntoa($nip); #reverse lookup may not resemble the nodename, key by ip + if ($nip = xCAT::NetworkUtils->getipaddr($currnode)) { #reverse lookup may not resemble the nodename, key by ip if ($nodebyip{$nip}) { $currnode = $nodebyip{$nip}; } @@ -615,7 +615,7 @@ sub process_request_port { foreach (@nodes) { $unknownnodes{$_}=1; my $packed_ip = undef; - $packed_ip = gethostbyname($_); + $packed_ip = xCAT::NetworkUtils->getipaddr($_); if( !defined $packed_ip) { my %rsp; $rsp{name}=[$_];