arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipv6 fix, replace the Socket library calls with NetworkUtils subroutines

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6038 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc
2010-05-10 08:23:59 +00:00
parent badd067c44
commit dd0e3f7f35
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
perl-xCAT/xCAT/InstUtils.pm
View File

@@ -83,10 +83,9 @@ sub getnimprime
my $hostname;
if ($nimprime)
{
if ($nimprime =~ /\d+\.\d+\.\d+\.\d+/)
if (($nimprime =~ /\d+\.\d+\.\d+\.\d+/) || ($nimprime =~ /:/))
{
my $packedaddr = inet_aton($nimprime);
$hostname = gethostbyaddr($packedaddr, AF_INET);
$hostname = xCAT::NetworkUtils->gethostname($nimprime);
}
else
{
@@ -125,10 +124,9 @@ sub myxCATname
# read the site table, master attrib
my $hostname = xCAT::Utils->get_site_Master();
if ($hostname =~ /\d+\.\d+\.\d+\.\d+/)
if (($hostname =~ /\d+\.\d+\.\d+\.\d+/) || ($hostname =~ /:/))
{
my $packedaddr = inet_aton($hostname);
$name = gethostbyaddr($packedaddr, AF_INET);
$name = xCAT::NetworkUtils->gethostname($hostname);
}
else
{
@@ -640,7 +638,7 @@ sub get_server_nodes
{
# get ip of node xcatmaster attribute
my $xcatmaster = $xcatmasters->{$node}->[0]->{xcatmaster};
$serv = inet_ntoa(inet_aton($xcatmaster));
$serv = xCAT::NetworkUtils->getipaddr($xcatmaster);
}
else
{