Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding -x option which allows user to specify a threshold and check if atleast those many hosts are active #138

Merged
merged 6 commits into from
Oct 30, 2018
Merged

Adding -x option which allows user to specify a threshold and check if atleast those many hosts are active #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7338b4b
Adding -x option which allows user to specify a threshold and check i…
deepak0004 Oct 17, 2018
b18e930
Making the reqd changes
deepak0004 Oct 17, 2018
8e33dae
Adding travis ci tests for more coverage and rectifying a mistake
deepak0004 Oct 17, 2018
9812557
Changing the exit code as per travis ci
deepak0004 Oct 17, 2018
af9b3bf
Adding separate exit codes for success or failure, and printing the n…
deepak0004 Oct 27, 2018
03d821e
Removing flag variable and its dependencies, printing required and re…
deepak0004 Oct 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion ci/test-10-option-u-v.pl → ci/test-10-option-u-x.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w

use Test::Command tests => 6;
use Test::Command tests => 12;

# -u show targets that are unreachable
# -v show version
Expand All @@ -22,3 +22,19 @@
});
$cmd->stderr_is_eq("");
}

# fping -x
{
my $cmd = Test::Command->new(cmd => "fping -x 1 8.8.0.0 127.0.0.1");
$cmd->exit_is_num(0);
$cmd->stdout_is_eq("Enough hosts reachable (required: 1, reachable: 1)\n");
$cmd->stderr_is_eq("");
}

# fping -x
{
my $cmd = Test::Command->new(cmd => "fping -x 2 8.8.0.0 127.0.0.1");
$cmd->exit_is_num(1);
$cmd->stdout_is_eq("Not enough hosts reachable (required: 2, reachable: 1)\n");
$cmd->stderr_is_eq("");
}
4 changes: 4 additions & 0 deletions doc/fping.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ Show targets that are unreachable.

Print B<fping> version information.

=item B<-x>, B<--min_reachable>=I<N>

Given a list of hosts, this mode prints if number of active hosts>=N or not.

=back

=head1 EXAMPLES
Expand Down
23 changes: 20 additions & 3 deletions src/fping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ unsigned int interval = DEFAULT_INTERVAL * 100;
unsigned int perhost_interval = DEFAULT_PERHOST_INTERVAL * 100;
float backoff = DEFAULT_BACKOFF_FACTOR;
unsigned int ping_data_size = DEFAULT_PING_DATA_SIZE;
unsigned int count = 1;
unsigned int count = 1, min_reachable = 0;
unsigned int trials;
unsigned int report_interval = 0;
unsigned int ttl = 0;
Expand Down Expand Up @@ -414,6 +414,7 @@ int main(int argc, char** argv)
{ NULL, 'T', OPTPARSE_REQUIRED },
{ "unreach", 'u', OPTPARSE_NONE },
{ "version", 'v', OPTPARSE_NONE },
{ "min_reachable", 'x', OPTPARSE_REQUIRED },
{ 0, 0, 0 }
};

Expand Down Expand Up @@ -604,6 +605,11 @@ int main(int argc, char** argv)
printf("%s: comments to %s\n", prog, EMAIL);
exit(0);

case 'x':
if (!(min_reachable = (unsigned int)atoi(optparse_state.optarg)))
usage(1);
break;

case 'f':
filename = optparse_state.optarg;
break;
Expand Down Expand Up @@ -732,7 +738,7 @@ int main(int argc, char** argv)
exit(1);
}

if (alive_flag || unreachable_flag)
if (alive_flag || unreachable_flag || min_reachable)
verbose_flag = 0;

if (count_flag) {
Expand Down Expand Up @@ -1323,6 +1329,16 @@ void finish()
if (stats_flag)
print_global_stats();

if (min_reachable) {
if ((num_hosts-num_unreachable) >= min_reachable) {
printf("Enough hosts reachable (required: %d, reachable: %d)\n", min_reachable, num_hosts-num_unreachable);
exit(0);
} else {
printf("Not enough hosts reachable (required: %d, reachable: %d)\n", min_reachable, num_hosts-num_unreachable);
exit(1);
}
}

if (num_noaddress)
exit(2);
else if (num_alive != num_hosts)
Expand Down Expand Up @@ -2767,5 +2783,6 @@ void usage(int is_error)
fprintf(out, " -s, --stats print final stats\n");
fprintf(out, " -u, --unreach show targets that are unreachable\n");
fprintf(out, " -v, --version show version\n");
fprintf(out, " -x, --min_reachable=N shows if >=N hosts are reachable or not\n");
exit(is_error);
}
}