upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-02-20 00:10:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Patch from Ollie Cook to define return code when expected value not received (#1082275).

Browse source 
Also included another change from Ollie Cook to do stricter matching of expected values from the beginning of the line. When a user defines an expected string this is changed to the old style strstr matching.


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1025 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Matthew Kent 2004-12-11 06:25:07 +00:00
parent 68eb45b44b
commit 1bc6f5e5fd
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
plugins/check_tcp.c
View file

@ -99,8 +99,8 @@ int verbose = FALSE;
int use_ssl = FALSE;
int sd = 0;
char *buffer;
int expect_mismatch_state = STATE_WARNING;
int exact_matching = TRUE;
int
main (int argc, char **argv)
@ -332,9 +332,15 @@ main (int argc, char **argv)
if (verbose)
printf ("%d %d\n", i, (int)server_expect_count);
if (i >= (int)server_expect_count)
die (STATE_WARNING, _("Invalid response from host\n"));
if (strstr (status, server_expect[i]))
break;
die (expect_mismatch_state, _("Unexpected response from host: %s\n"), status);
/* default expect gets exact matching */
if (exact_matching) {
if (strncmp(status, server_expect[i], strlen(server_expect[i])) == 0)
break;
} else {
if (strstr (status, server_expect[i]))
break;
}
}
}
}
@ -414,6 +420,7 @@ process_arguments (int argc, char **argv)
{"jail", required_argument, 0, 'j'},
{"delay", required_argument, 0, 'd'},
{"refuse", required_argument, 0, 'r'},
{"mismatch", required_argument, 0, 'M'},
{"use-ipv4", no_argument, 0, '4'},
{"use-ipv6", no_argument, 0, '6'},
{"verbose", no_argument, 0, 'v'},
@ -447,7 +454,7 @@ process_arguments (int argc, char **argv)
}
while (1) {
c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:",
c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
longopts, &option);
if (c == -1 || c == EOF || c == 1)
@ -524,6 +531,7 @@ process_arguments (int argc, char **argv)
break;
case 'e': /* expect string (may be repeated) */
EXPECT = NULL;
exact_matching = FALSE;
if (server_expect_count == 0)
server_expect = malloc (sizeof (char *) * (++server_expect_count));
else
@ -548,6 +556,16 @@ process_arguments (int argc, char **argv)
else
usage4 (_("Refuse must be one of ok, warn, crit"));
break;
case 'M':
if (!strncmp(optarg,"ok",2))
expect_mismatch_state = STATE_OK;
else if (!strncmp(optarg,"warn",4))
expect_mismatch_state = STATE_WARNING;
else if (!strncmp(optarg,"crit",4))
expect_mismatch_state = STATE_CRITICAL;
else
usage4 (_("Mismatch must be one of ok, warn, crit"));
break;
case 'd':
if (is_intpos (optarg))
delay = atoi (optarg);
@ -764,6 +782,8 @@ print_help (void)
printf (_("\
-r, --refuse=ok|warn|crit\n\
Accept tcp refusals with states ok, warn, crit (default: crit)\n\
-M, --mismatch=ok|warn|crit\n\
Accept expected string mismatches with states ok, warn, crit (default: warn)\n\
-j, --jail\n\
Hide output from TCP socket\n\
-m, --maxbytes=INTEGER\n\
@ -797,6 +817,6 @@ print_usage (void)
Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n\
[-s <send string>] [-e <expect string>] [-q <quit string>]\n\
[-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n\
[-r <refuse state>] [-v] [-4|-6] [-j] [-D <days to cert expiry>]\n\
[-S <use SSL>]\n", progname);
[-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
[-D <days to cert expiry>] [-S <use SSL>]\n", progname);
}