RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marsadm: rework ssh port probing

This commit is contained in:
Thomas Schoebel-Theuer 2019-07-08 12:24:19 +02:00
parent 900ed3cbd8
commit 2d77d0c396
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
userspace/marsadm
View File

@ -138,24 +138,27 @@ sub make_ssh_cmd {
my $port; my $port;
my $real_peer; my $real_peer;
my $peer_ip = get_link("$mars/ips/ip-$peer", 2); my $peer_ip = get_link("$mars/ips/ip-$peer", 2);
# workaround firewall hell at some installations...
RETRY:
for my $this_peer ($peer, $peer_ip) { for my $this_peer ($peer, $peer_ip) {
next unless defined($this_peer); next unless defined($this_peer);
# check whether machine is reachable
if (system("ping -c1 $this_peer")) { if (system("ping -c1 $this_peer")) {
lwarn "cannot ping '$this_peer'\n"; lwarn "cannot ping '$this_peer'\n";
next; next;
} }
# first try given parameters, then port 22, then ssh_config defaults # first try given parameters, then port 22, then ssh_config defaults
if (!system("$ssh -p $ssh_port root\@$this_peer \"$ssh_probe\"")) { my %seen = ();
($real_peer, $port) = ($this_peer, $ssh_port); foreach my $try_port ($ssh_port, 22, 0) {
last; next if defined($seen{$try_port});
} elsif (!system("$ssh -p 22 root\@$this_peer \"$ssh_probe\"")) { $seen{$try_port} = 1;
($real_peer, $port) = ($this_peer, 22); my $opt_port = $try_port ? "-p $try_port" : "";
last; if (!system("$ssh $opt_port root\@$this_peer \"$ssh_probe\"")) {
} elsif (!system("$ssh root\@$this_peer \"$ssh_probe\"")) { ($real_peer, $port) = ($this_peer, $try_port);
($real_peer, $port) = ($this_peer, 0); last RETRY;
last; }
lwarn "SSH to '$this_peer' does not work on port '$try_port'\n";
} }
lwarn "SSH to '$this_peer' does not work on any port\n";
} }
ldie "SSH to '$peer' does not work\n" unless defined($port); ldie "SSH to '$peer' does not work\n" unless defined($port);
$ssh_ips{$peer} = $real_peer; $ssh_ips{$peer} = $real_peer;