amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-07-03 09:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework IPv6 code to match RFC usage

Browse source
This commit is contained in:
duncan_ferguson 2009-04-07 17:17:30 +00:00
parent 22b8006d12
commit 8cbdcb88a9
1 changed files with 67 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

98
clusterssh/src/cssh.pl
View file

@ -874,42 +874,67 @@ sub setup_helper_script() {
} }
sub split_hostname { sub split_hostname {
my ($server) = @_; my ($connect_string) = @_;
logmsg( 3, 'split_hostname: server=' . $server ); my ( $server, $username, $port );
logmsg( 3, 'split_hostname: connect_string=' . $connect_string );
my $username = q{};
$username = $config{user} if ( $config{user} ); $username = $config{user} if ( $config{user} );
if ( $server =~ s/^(.*)@// ) { if ( $connect_string =~ s/^(.*)@// ) {
$username = $1; $username = $1;
} }
# try to cope with IPv6 addresses # cope with IPv6 addresses
# if $server contains '::' assume this is IPv6 address
# if there are 8 : in the address then can say its IPv6 + port # check for correct syntax of using [<IPv6 address>]
# otherwise how can you reliably tell its IPv6 + port when last # See http://tools.ietf.org/html/rfc2732 for more details
# octect is number, i.e. is 2001:db8::1428:2323 a host with if ( $connect_string =~ m/^\[([\w:]+)\](?::(\d+))?$/xsm ) {
# port 2323 or a full IPv6 address? logmsg( 3, 'connect_string contains IPv6 address' );
my $port = q{}; $server = $1;
if ( $server !~ m/::/ || ( $server =~ tr/:// ) == 7 ) { $port = $2;
if ( $server =~ s/:(\d+)$// ) {
$port = $1;
}
} }
else { else {
if ( $server =~ m/:(\d+)$/ ) {
our $seen_error; my $colon_count = $connect_string =~ tr/://;
warn 'Potentially ambiguous IPv6 address/port definition: ',
$server, $/; # See if there are exactly 7 colons - if so, assume pure IPv6
warn 'Assuming it is an IPv6 address only.', $/; if ( $colon_count == 7 ) {
if ( !$seen_error ) { $server = $connect_string;
warn '*** See documenation for more information.', $/; }
$seen_error = 1; else {
# if more than 1 but less than 8 colons and last octect is
# numbers only, warn about ambiguity
if ( $colon_count > 1
&& $colon_count < 8
&& $connect_string =~ m/:(\d+)$/ )
{
our $seen_error;
warn 'Potentially ambiguous IPv6 address/port definition: ',
$connect_string, $/;
warn 'Assuming it is an IPv6 address only.', $/;
$server = $connect_string;
if ( !$seen_error ) {
warn '*** See documenation for more information.', $/;
$seen_error = 1;
}
}
else {
# split out port from end of connect string
# could have an invalid IPv6 address here, but the connect
# method will warn # it cannot connect anyhow
# However, this also catchs IPv4 addresses, possibly with ports
( $server, $port ) = $connect_string =~ m/(.*)(?::(\d+))?$/;
} }
} }
} }
$port ||= q{};
$username ||= q{};
logmsg( 3, "username=$username, server=$server, port=$port" ); logmsg( 3, "username=$username, server=$server, port=$port" );
return ( $username, $server, $port ); return ( $username, $server, $port );
@ -945,7 +970,7 @@ sub open_client_windows(@) {
foreach (@_) { foreach (@_) {
next unless ($_); next unless ($_);
my ( $username, $server, $port_nb ) = split_hostname($_); my ( $username, $server, $port ) = split_hostname($_);
# see if we can find the hostname - if not, drop it # see if we can find the hostname - if not, drop it
my $gethost = check_host($server); my $gethost = check_host($server);
@ -973,15 +998,18 @@ sub open_client_windows(@) {
} }
} }
my $count = q{}; my $count;
while ( defined( $servers{ $server . q{ } . $count } ) ) { while ( defined( $servers{ $server . q{ } . $count } ) ) {
$count++; $count++;
} }
$server .= q{ } . $count; if ($count) {
$server .= q{ } . $count;
}
$servers{$server}{realname} = $_; $servers{$server}{connect_string} = $_;
$servers{$server}{username} = $username; $servers{$server}{realname} = $server;
$servers{$server}{port_nb} = $port_nb || ''; $servers{$server}{username} = $username;
$servers{$server}{port} = $port || '';
logmsg( 2, "Working on server $server for $_" ); logmsg( 2, "Working on server $server for $_" );
@ -1005,7 +1033,7 @@ sub open_client_windows(@) {
# affecting the main program # affecting the main program
$servers{$server}{realname} .= "==" if ( !$gethost ); $servers{$server}{realname} .= "==" if ( !$gethost );
my $exec my $exec
= "$config{terminal} $color $config{terminal_args} $config{terminal_allow_send_events} $config{terminal_title_opt} '$config{title}: $server' -font $config{terminal_font} -e \"$^X\" \"-e\" '$helper_script' '$servers{$server}{pipenm}' '$servers{$server}{realname}' '$servers{$server}{username}' '$servers{$server}{port_nb}'"; = "$config{terminal} $color $config{terminal_args} $config{terminal_allow_send_events} $config{terminal_title_opt} '$config{title}: $servers{$server}{connect_string}' -font $config{terminal_font} -e \"$^X\" \"-e\" '$helper_script' '$servers{$server}{pipenm}' '$servers{$server}{realname}' '$servers{$server}{username}' '$servers{$server}{port}'";
logmsg( 2, "Terminal exec line:\n$exec\n" ); logmsg( 2, "Terminal exec line:\n$exec\n" );
exec($exec) == 0 or warn("Failed: $!"); exec($exec) == 0 or warn("Failed: $!");
} }
@ -2537,10 +2565,18 @@ Possible work arounds include:
=item a. =item a.
Use square brackets around the IPv6 address, i.e.
[2001:db8::1428]:2323
or
[2001:db8::1428:2323]
as appropriate so there is no ambiguity
=item b.
Use the full IPv6 address if also using a port number - the 8th colon Use the full IPv6 address if also using a port number - the 8th colon
is assumed to be the port seperator. is assumed to be the port seperator.
=item b. =item c.
Define the IPv6 address in your /etc/hosts file, DNS or other name service Define the IPv6 address in your /etc/hosts file, DNS or other name service
lookup mechanism and use the hostname instead of the address. lookup mechanism and use the hostname instead of the address.