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

Added conditionals around INET6 references so IPv6

Browse Source 
will not be used on AIX systems for now.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@208 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2008-01-04 14:31:45 +00:00
parent 7c8fdba6ee
commit db049e6f2a
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
xCAT-server-2.0/sbin/xcatd
View File

@ -91,10 +91,20 @@ sub daemonize {
my %cmd_handlers;
sub do_installm_service {
#This function servers as a handler for messages from installing nodes
my $socket = IO::Socket::INET6->new(LocalPort=>$sport,
my $socket;
if (xCAT::Utils->isLinux()) {
$socket = IO::Socket::INET6->new(LocalPort=>$sport,
Proto => 'tcp',
ReuseAddr => 1,
Listen => 64);
} else {
$socket = IO::Socket::INET->new(LocalPort=>$sport,
Proto => 'tcp',
ReuseAddr => 1,
Listen => 64);
}
unless ($socket) {
syslog("local4|err","xcatd unable to open install monitor services on $sport");
die;
@ -103,7 +113,14 @@ sub do_installm_service {
$SIG{ALRM} = sub { die "XCATTIMEOUT"; };
my $conn;
next unless $conn = $socket->accept;
my @clients = gethostbyaddr($conn->peeraddr,AF_INET6);
my @clients;
if (xCAT::Utils->isLinux()) {
@clients = gethostbyaddr($conn->peeraddr,AF_INET6);
} else {
@clients = gethostbyaddr($conn->peeraddr,AF_INET);
}
my $validclient=0;
my $node;
foreach my $client (@clients) {
@ -161,9 +178,18 @@ sub do_udp_service { #This function opens up a UDP port
#Also, this throttles to handle one message at a time, so no forking either
#Explicitly, to handle whatever operations nodes periodically send during discover state
#Could be used for heartbeating and such as desired
my $socket = IO::Socket::INET6->new(LocalPort => $port,
my $socket;
if (xCAT::Utils->isLinux()) {
$socket = IO::Socket::INET6->new(LocalPort => $port,
Proto => 'udp',
Domain => AF_INET);
} else {
$socket = IO::Socket::INET->new(LocalPort => $port,
Proto => 'udp',
Domain => AF_INET);
}
openlog("xCAT UDP",'','local4');
unless ($socket) {
syslog("err","xCAT UDP service unable to open port $port: $!");
@ -297,7 +323,14 @@ until ($quit) {
if (defined $tmp->{value}) {
$domain = $tmp->{value};
}
if (xCAT::Utils->isLinux()) {
$peerhost = gethostbyaddr($connection->peeraddr,AF_INET6);
} else {
$peerhost = gethostbyaddr($connection->peeraddr,AF_INET);
}
unless ($peerhost) { $peerhost = gethostbyaddr($connection->peeraddr,AF_INET); }
$peerhost =~ s/\.$domain\.*$//;
$peerhost =~ s/-eth\d*$//;