xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-04 10:35:12 +00:00
Code Issues Releases Wiki Activity

Adding port 22 for unprivileged node ping (#4324) (#5699)

Browse Source
This commit is contained in:
Bin Xu
2018-10-12 17:01:37 +08:00
committed by yangsong
parent 0c0854aa2b
commit 40d74ace1b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-client/bin/pping
View File

@@ -199,9 +199,10 @@ sub nmap_pping {
@nmap_options = xCAT::TableUtils->get_site_attribute("nmapoptions");
$more_options = $nmap_options[0];
}
open(FPING, "nmap -PE --system-dns --unprivileged --send-ip -sP $more_options " . join(' ', @$nodes) . " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
# Added port 22 for unprivileged case (#4324)
open(NMAP, "nmap -PE --system-dns --send-ip -sP --unprivileged -PA80,443,22 $more_options " . join(' ', @$nodes) . " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
my $node;
while (<FPING>) {
while (<NMAP>) {
if (/Host (.*) \(.*\) appears to be up/) {
$node = $1;
unless ($deadnodes{$node}) {

2
xCAT-server/lib/xcat/plugins/nodestat.pm
View File

@@ -658,7 +658,7 @@ sub process_request_nmap {
if ($ip6 and scalar(@ip6s)) {
open($fping, "nmap --unprivileged -6 -PS$ports,3001 -n --send-ip -p $ports,3001 $more_options " . join(' ', @ip6s) . " 2> /dev/null|") or die("Can't start nmap: $!");
} elsif (not $ip6 and scalar(@ips)) {
open($fping, "nmap --unprivileged -PE -n --send-ip -p $ports,3001 $more_options " . join(' ', @ips) . " 2> /dev/null|") or die("Can't start nmap: $!");
open($fping, "nmap --unprivileged -PA80,443,22 -PE -n --send-ip -p $ports,3001 $more_options " . join(' ', @ips) . " 2> /dev/null|") or die("Can't start nmap: $!");
} else { next; }
while (<$fping>) {
if (/Interesting ports on ([^ ]*)[: ]/ or /Nmap scan report for ([^ ]*)/) {