summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--plugins/check_ping.c7
-rw-r--r--plugins/t/check_ping.t30
3 files changed, 37 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 7756de9..3490c28 100644
--- a/NEWS
+++ b/NEWS
@@ -3,11 +3,12 @@ This file documents the major additions and syntax changes between releases.
31.4.7 ?? 31.4.7 ??
4 check_procs uses /usr/ucb/ps if available - fixes pst3 problems on Solaris 4 check_procs uses /usr/ucb/ps if available - fixes pst3 problems on Solaris
5 Fixed MKINSTALLDIRS problem in po/ 5 Fixed MKINSTALLDIRS problem in po/
6 ./configure now detects if possible to compile check_mysql
6 Fixed broken HELO in check_smtp 7 Fixed broken HELO in check_smtp
8 check_icmp now allows to set a minimum number of hosts required for successs (-m)
9 check_ping times out 1 second quicker if host is unreachable
7 Root plugins installed with world executable 10 Root plugins installed with world executable
8 ./configure now detects if possible to compile check_mysql
9 check_sybase from contrib now maintained in NagiosExchange 11 check_sybase from contrib now maintained in NagiosExchange
10 check_icmp now allows to set a minimum number of hosts required for successs (-m)
11 12
121.4.6 5th February 2007 131.4.6 5th February 2007
13 Reduced number of DNS lookups in check_ping and netutils.c for IPv6 configurations 14 Reduced number of DNS lookups in check_ping and netutils.c for IPv6 configurations
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 9ddc252..211f74e 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -103,8 +103,13 @@ main (int argc, char **argv)
103 usage4 (_("Cannot catch SIGALRM")); 103 usage4 (_("Cannot catch SIGALRM"));
104 } 104 }
105 105
106 /* handle timeouts gracefully */ 106 /* If ./configure finds ping has timeout values, set plugin alarm slightly
107 * higher so that we can use response from command line ping */
108#ifdef PING_PACKETS_FIRST && PING_HAS_TIMEOUT
107 alarm (timeout_interval + 1); 109 alarm (timeout_interval + 1);
110#else
111 alarm (timeout_interval);
112#endif
108 113
109 for (i = 0 ; i < n_addresses ; i++) { 114 for (i = 0 ; i < n_addresses ; i++) {
110 115
diff --git a/plugins/t/check_ping.t b/plugins/t/check_ping.t
index b8323a0..c9a0904 100644
--- a/plugins/t/check_ping.t
+++ b/plugins/t/check_ping.t
@@ -9,7 +9,7 @@ use strict;
9use Test::More; 9use Test::More;
10use NPTest; 10use NPTest;
11 11
12plan tests => 18; 12plan tests => 20;
13 13
14my $successOutput = '/PING (ok|OK) - Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/'; 14my $successOutput = '/PING (ok|OK) - Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/';
15my $failureOutput = '/Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/'; 15my $failureOutput = '/Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/';
@@ -58,12 +58,38 @@ $res = NPTest->testCmd(
58is( $res->return_code, 2, "Old syntax, with forced critical" ); 58is( $res->return_code, 2, "Old syntax, with forced critical" );
59like( $res->output, $failureOutput, "Output OK" ); 59like( $res->output, $failureOutput, "Output OK" );
60 60
61
62# check_ping results will depend on whether the ping command discovered by
63# ./configure has a timeout option. If it does, then the timeout will
64# be set, so check_ping will always get a response. If it doesn't
65# then check_ping will timeout. We do 2 tests for check_ping's timeout
66# - 1 second
67# - 15 seconds
68# The latter should be higher than normal ping timeouts, so should always give a packet loss result
69open(F, "../config.h") or die "Cannot open ../config.h";
70@_ = grep /define PING_HAS_TIMEOUT 1|define PING_PACKETS_FIRST 1/, <F>;
71my $has_timeout;
72$has_timeout = 1 if (scalar @_ == 2); # Need both defined
73close F;
61$res = NPTest->testCmd( 74$res = NPTest->testCmd(
62 "./check_ping -H $host_nonresponsive -w 10,100% -c 10,100% -p 1 -t 1" 75 "./check_ping -H $host_nonresponsive -w 10,100% -c 10,100% -p 1 -t 1"
63 ); 76 );
64is( $res->return_code, 2, "Timeout - host nonresponsive" ); 77is( $res->return_code, 2, "Timeout 1 second - host nonresponsive" );
78if ($has_timeout) {
79 like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
80} else {
81 like( $res->output, '/timed out/', "Error contains 'timed out' string" );
82}
83
84$res = NPTest->testCmd(
85 "./check_ping -H $host_nonresponsive -w 10,100% -c 10,100% -p 1 -t 15"
86 );
87is( $res->return_code, 2, "Timeout 15 seconds - host nonresponsive" );
65like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" ); 88like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
66 89
90
91
92
67$res = NPTest->testCmd( 93$res = NPTest->testCmd(
68 "./check_ping $host_nonresponsive -p 1 -t 1 100 100 1000 10000" 94 "./check_ping $host_nonresponsive -p 1 -t 1 100 100 1000 10000"
69 ); 95 );