Imported Upstream version 1.4.16+git20130912

This commit is contained in:
Jan Wagner 2013-11-27 00:00:46 +01:00
parent ea90af2ba1
commit 01ca3b324f
14 changed files with 514 additions and 442 deletions

View file

@ -3,7 +3,7 @@
* Library for check_tcp
*
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
* Copyright (c) 1999-2013 Nagios Plugins Development Team
*
* Description:
*
@ -29,28 +29,47 @@
#include "common.h"
#include "utils_tcp.h"
int
np_expect_match(char* status, char** server_expect, int expect_count, int all, int exact_match, int verbose)
{
int match = 0;
int i;
for (i = 0; i < expect_count; i++) {
if (verbose)
printf ("looking for [%s] %s [%s]\n", server_expect[i],
(exact_match) ? "in beginning of" : "anywhere in",
status);
#define VERBOSE(message) \
do { \
if (flags & NP_MATCH_VERBOSE) \
puts(message); \
} while (0)
if ((exact_match && !strncmp(status, server_expect[i], strlen(server_expect[i]))) ||
(! exact_match && strstr(status, server_expect[i])))
{
if(verbose) puts("found it");
match += 1;
} else
if(verbose) puts("couldn't find it");
enum np_match_result
np_expect_match(char *status, char **server_expect, int expect_count, int flags)
{
int i, match = 0, partial = 0;
for (i = 0; i < expect_count; i++) {
if (flags & NP_MATCH_VERBOSE)
printf("looking for [%s] %s [%s]\n", server_expect[i],
(flags & NP_MATCH_EXACT) ?
"in beginning of" : "anywhere in",
status);
if (flags & NP_MATCH_EXACT) {
if (strncmp(status, server_expect[i], strlen(server_expect[i])) == 0) {
VERBOSE("found it");
match++;
continue;
} else if (strncmp(status, server_expect[i], strlen(status)) == 0) {
VERBOSE("found a substring");
partial++;
continue;
}
} else if (strstr(status, server_expect[i]) != NULL) {
VERBOSE("found it");
match++;
continue;
}
VERBOSE("couldn't find it");
}
if ((all == TRUE && match == expect_count) ||
(! all && match >= 1)) {
return TRUE;
} else
return FALSE;
if ((flags & NP_MATCH_ALL && match == expect_count) ||
(!(flags & NP_MATCH_ALL) && match >= 1))
return NP_MATCH_SUCCESS;
else if (partial > 0 || !(flags & NP_MATCH_EXACT))
return NP_MATCH_RETRY;
else
return NP_MATCH_FAILURE;
}