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

-Expose more capability, for multiple address returns and requesting only v4 or v6 addresses

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8747 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2011-01-26 15:43:26 +00:00
parent 020ed21772
commit d0c5d7439b
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
perl-xCAT/xCAT/NetworkUtils.pm
View File

@@ -132,7 +132,7 @@ sub gethostname()
{
if ($socket6support) # the getaddrinfo and getnameinfo supports both IPv4 and IPv6
{
my ($family, $socket, $protocol, $ip, $name) = Socket6::getaddrinfo($iporhost,0);
my ($family, $socket, $protocol, $ip, $name) = Socket6::getaddrinfo($iporhost,0,AF_UNSPEC,SOCK_STREAM,6); #specifically ask for TCP capable records, maximizing chance of no more than one return per v4/v6
my $host = (Socket6::getnameinfo($ip))[0];
if ($host eq $iporhost) # can not resolve
{
@@ -223,8 +223,16 @@ sub getipaddr
{
if ($socket6support) # the getaddrinfo and getnameinfo supports both IPv4 and IPv6
{
my ($family, $socket, $protocol, $ip, $name) = Socket6::getaddrinfo($iporhost,0);
if ($ip)
my @returns;
my $family=AF_UNSPEC;
if ($extraarguments{OnlyV6}) {
$family=AF_INET6;
} elsif ($extraarguments{OnlyV4}) {
$family=AF_INET;
}
my @addrinfo = Socket6::getaddrinfo($iporhost,0,$family,SOCK_STREAM,6);
my ($family, $socket, $protocol, $ip, $name) = splice(@addrinfo,0,5);
while ($ip)
{
if ($extraarguments{GetNumber}) { #return a BigInt for compare, e.g. for comparing ip addresses for determining if they are in a common network or range
my $ip = (Socket6::getnameinfo($ip, Socket6::NI_NUMERICHOST()))[0];
@@ -233,12 +241,17 @@ sub getipaddr
$bignumber->blsft(32);
$bignumber->badd($_);
}
return $bignumber;
push(@returns,$bignumber);
} else {
return (Socket6::getnameinfo($ip, Socket6::NI_NUMERICHOST()))[0];
push @returns,(Socket6::getnameinfo($ip, Socket6::NI_NUMERICHOST()))[0];
}
if (scalar @addrinfo and $extraargumests{GetAllAddresses}) {
($family, $socket, $protocol, $ip, $name) = splice(@addrinfo,0,5);
} else {
$ip=0;
}
}
return undef;
return @returns;
}
else
{