![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index a977077c3fce99b0586d0f697b22c29299d0c382..156765edac0d2234447a88235b7f3fd4c9cb7ad9 100644 (file)
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
/*****************************************************************************
-*
+*
* Nagios check_tcp plugin
-*
+*
* License: GPL
-* Copyright (c) 1999-2006 nagios-plugins team
-*
-* Last Modified: $Date$
-*
+* Copyright (c) 1999-2008 Nagios Plugins Development Team
+*
* Description:
-*
+*
* This file contains the check_tcp plugin
-*
-* License Information:
-*
-* This program is free software; you can redistribute it and/or modify
+*
+*
+* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
+* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
-*
+*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-*
+*
* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* $Id$
*
/* progname "check_tcp" changes depending on symlink called */
char *progname;
-const char *revision = "$Revision$";
-const char *copyright = "1999-2006";
+const char *copyright = "1999-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
#include "netutils.h"
#include "utils.h"
+#include "utils_tcp.h"
#ifdef HAVE_SSL
static int check_cert = FALSE;
#define FLAG_TIME_WARN 0x08
#define FLAG_TIME_CRIT 0x10
#define FLAG_HIDE_OUTPUT 0x20
+#define FLAG_MATCH_ALL 0x40
static size_t flags = FLAG_EXACT_MATCH;
int
int i;
char *status = NULL;
struct timeval tv;
- size_t len, match = -1;
+ size_t len;
+ int match = -1;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
server_quit = QUIT;
status = NULL;
+ /* Parse extra opts if any */
+ argv=np_extra_opts (&argc, argv, progname);
+
if (process_arguments (argc, argv) == ERROR)
usage4 (_("Could not parse arguments"));
(int)len + 1, status);
while(isspace(status[len])) status[len--] = '\0';
- for (i = 0; i < server_expect_count; i++) {
- match = -2; /* tag it so we know if we tried and failed */
- if (flags & FLAG_VERBOSE)
- printf ("looking for [%s] %s [%s]\n", server_expect[i],
- (flags & FLAG_EXACT_MATCH) ? "in beginning of" : "anywhere in",
- status);
-
- /* match it. math first in short-circuit */
- if ((flags & FLAG_EXACT_MATCH && !strncmp(status, server_expect[i], strlen(server_expect[i]))) ||
- (!(flags & FLAG_EXACT_MATCH) && strstr(status, server_expect[i])))
- {
- if(flags & FLAG_VERBOSE) puts("found it");
- match = i;
- break;
- }
- }
+ match = np_expect_match(status,
+ server_expect,
+ server_expect_count,
+ (flags & FLAG_MATCH_ALL ? TRUE : FALSE),
+ (flags & FLAG_EXACT_MATCH ? TRUE : FALSE),
+ (flags & FLAG_VERBOSE ? TRUE : FALSE));
}
if (server_quit != NULL) {
}
#ifdef HAVE_SSL
np_net_ssl_cleanup();
-#endif
+#endif
if (sd) close (sd);
microsec = deltime (tv);
result = STATE_WARNING;
/* did we get the response we hoped? */
- if(match == -2 && result != STATE_CRITICAL)
+ if(match == FALSE && result != STATE_CRITICAL)
result = expect_mismatch_state;
/* reset the alarm */
* the response we were looking for. if-else */
printf("%s %s - ", SERVICE, state_text(result));
- if(match == -2 && len && !(flags & FLAG_HIDE_OUTPUT))
+ if(match == FALSE && len && !(flags & FLAG_HIDE_OUTPUT))
printf("Unexpected response from host/socket: %s", status);
else {
- if(match == -2)
+ if(match == FALSE)
printf("Unexpected response from host/socket on ");
else
printf("%.3f second response time on ", elapsed_time);
printf("socket %s", server_address);
}
- if (match != -2 && !(flags & FLAG_HIDE_OUTPUT) && len)
+ if (match != FALSE && !(flags & FLAG_HIDE_OUTPUT) && len)
printf (" [%s]", status);
/* perf-data doesn't apply when server doesn't talk properly,
* so print all zeroes on warn and crit. Use fperfdata since
* localisation settings can make different outputs */
- if(match == -2)
+ if(match == FALSE)
printf ("|%s",
fperfdata ("time", elapsed_time, "s",
(flags & FLAG_TIME_WARN ? TRUE : FALSE), 0,
{"critical-codes", required_argument, 0, 'C'},
{"warning-codes", required_argument, 0, 'W'},
{"timeout", required_argument, 0, 't'},
- {"protocol", required_argument, 0, 'P'},
+ {"protocol", required_argument, 0, 'P'}, /* FIXME: Unhandled */
{"port", required_argument, 0, 'p'},
- {"escape", required_argument, 0, 'E'},
+ {"escape", no_argument, 0, 'E'},
+ {"all", no_argument, 0, 'A'},
{"send", required_argument, 0, 's'},
{"expect", required_argument, 0, 'e'},
{"maxbytes", required_argument, 0, 'm'},
{"verbose", no_argument, 0, 'v'},
{"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
-#ifdef HAVE_SSL
{"ssl", no_argument, 0, 'S'},
{"certificate", required_argument, 0, 'D'},
-#endif
{0, 0, 0, 0}
};
}
while (1) {
- c = getopt_long (argc, argv, "+hVv46EH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
+ c = getopt_long (argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
longopts, &option);
if (c == -1 || c == EOF || c == 1)
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'v': /* verbose mode */
flags |= FLAG_VERBOSE;
asprintf(&server_send, "%s", optarg);
break;
case 'e': /* expect string (may be repeated) */
- EXPECT = NULL;
flags &= ~FLAG_EXACT_MATCH;
if (server_expect_count == 0)
server_expect = malloc (sizeof (char *) * (++server_expect_count));
die (STATE_UNKNOWN, _("Invalid option - SSL is not available"));
#endif
break;
+ case 'A':
+ flags |= FLAG_MATCH_ALL;
+ break;
}
}
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
print_usage ();
- printf (_(UT_HELP_VRSN));
+ printf (UT_HELP_VRSN);
+ printf (UT_EXTRA_OPTS);
- printf (_(UT_HOST_PORT), 'p', "none");
+ printf (UT_HOST_PORT, 'p', "none");
- printf (_(UT_IPv46));
+ printf (UT_IPv46);
printf (" %s\n", "-E, --escape");
printf (" %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option"));
printf (" %s\n", "-s, --send=STRING");
printf (" %s\n", _("String to send to the server"));
printf (" %s\n", "-e, --expect=STRING");
- printf (" %s\n", _("String to expect in server response"));
+ printf (" %s %s\n", _("String to expect in server response"), _("(may be repeated)"));
+ printf (" %s\n", "-A, --all");
+ printf (" %s\n", _("All expect strings need to occur in server response. Default is any"));
printf (" %s\n", "-q, --quit=STRING");
printf (" %s\n", _("String to send server to initiate a clean close of the connection"));
- printf (" %s\n", "-r, --refuse=ok|warn|crit");
- printf (" %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)"));
+ printf (" %s\n", "-r, --refuse=ok|warn|crit");
+ printf (" %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
printf (" %s\n", "-M, --mismatch=ok|warn|crit");
printf (" %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
printf (" %s\n", "-j, --jail");
printf (" %s\n", _("Use SSL for the connection."));
#endif
- printf (_(UT_WARN_CRIT));
+ printf (UT_WARN_CRIT);
+
+ printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
- printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ printf (UT_VERBOSE);
- printf (_(UT_VERBOSE));
+#ifdef NP_EXTRA_OPTS
+ printf ("\n");
+ printf ("%s\n", _("Notes:"));
+ printf (UT_EXTRA_OPTS_NOTES);
+#endif
- printf (_(UT_SUPPORT));
+ printf (UT_SUPPORT);
}