X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_tcp.c;h=178bd5688dec52abeeb72667b595ba7c65709ab5;hb=0aa751937455c4af4e49ccf6ba469c0b4ca8a4d0;hp=00105f9f9d6a9d707fb0bd4eb2eafb1afe213faf;hpb=d8ecf6bfc264717c611a983fe8ccb0488669791a;p=nagiosplug.git

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 00105f9..178bd56 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,31 +1,27 @@
 /*****************************************************************************
-*
+* 
 * 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$
 * 
@@ -33,13 +29,13 @@
 
 /* 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;
@@ -90,6 +86,7 @@ static int expect_mismatch_state = STATE_WARNING;
 #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
@@ -99,7 +96,8 @@ main (int argc, char **argv)
 	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);
@@ -112,7 +110,7 @@ main (int argc, char **argv)
 
 	len = strlen(progname);
 	if(len > 6 && !memcmp(progname, "check_", 6)) {
-		SERVICE = progname + 6;
+		SERVICE = strdup(progname + 6);
 		for(i = 0; i < len - 6; i++)
 			SERVICE[i] = toupper(SERVICE[i]);
 	}
@@ -166,9 +164,9 @@ main (int argc, char **argv)
 	}
 	else if (!strncmp(SERVICE, "JABBER", 6)) {
 		SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
-		EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
+		EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'";
 		QUIT = "</stream:stream>\n";
-		flags |= FLAG_SSL | FLAG_HIDE_OUTPUT;
+		flags |= FLAG_HIDE_OUTPUT;
 		PORT = 5222;
 	}
 	else if (!strncmp (SERVICE, "NNTPS", 5)) {
@@ -204,6 +202,9 @@ main (int argc, char **argv)
 	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"));
 
@@ -298,22 +299,12 @@ main (int argc, char **argv)
 			       (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) {
@@ -321,7 +312,7 @@ main (int argc, char **argv)
 	}
 #ifdef HAVE_SSL
 	np_net_ssl_cleanup();
-#endif 
+#endif
 	if (sd) close (sd);
 
 	microsec = deltime (tv);
@@ -333,7 +324,7 @@ main (int argc, char **argv)
 		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 */
@@ -342,33 +333,43 @@ main (int argc, char **argv)
 	/* this is a bit stupid, because we don't want to print the
 	 * response time (which can look ok to the user) if we didn't get
 	 * the response we were looking for. if-else */
-	printf(_("%s %s - "), SERVICE, state_text(result));
+	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 {
-		printf("%.3f second response time on ", elapsed_time);
+		if(match == FALSE)
+			printf("Unexpected response from host/socket on ");
+		else
+			printf("%.3f second response time on ", elapsed_time);
 		if(server_address[0] != '/')
 			printf("port %d", server_port);
 		else
 			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 */
-	if(match == -2)
-		printf ("|time=%fs;0.0;0.0;0.0;0.0", elapsed_time);
+	 * so print all zeroes on warn and crit. Use fperfdata since
+	 * localisation settings can make different outputs */
+	if(match == FALSE)
+		printf ("|%s",
+				fperfdata ("time", elapsed_time, "s",
+				(flags & FLAG_TIME_WARN ? TRUE : FALSE), 0,
+				(flags & FLAG_TIME_CRIT ? TRUE : FALSE), 0,
+				TRUE, 0,
+				TRUE, socket_timeout)
+			);
 	else
 		printf("|%s",
 				fperfdata ("time", elapsed_time, "s",
-		                   TRUE, warning_time,
-		                   TRUE, critical_time,
-		                   TRUE, 0,
-		                   TRUE, socket_timeout)
-		      );
+				(flags & FLAG_TIME_WARN ? TRUE : FALSE), warning_time,
+				(flags & FLAG_TIME_CRIT ? TRUE : FALSE), critical_time,
+				TRUE, 0,
+				TRUE, socket_timeout)
+			);
 
 	putchar('\n');
 	return result;
@@ -391,14 +392,15 @@ process_arguments (int argc, char **argv)
 		{"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'},
 		{"quit", required_argument, 0, 'q'},
-		{"jail", required_argument, 0, 'j'},
+		{"jail", no_argument, 0, 'j'},
 		{"delay", required_argument, 0, 'd'},
 		{"refuse", required_argument, 0, 'r'},
 		{"mismatch", required_argument, 0, 'M'},
@@ -407,10 +409,8 @@ process_arguments (int argc, char **argv)
 		{"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}
 	};
 
@@ -435,7 +435,7 @@ process_arguments (int argc, char **argv)
 	}
 
 	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)
@@ -443,12 +443,12 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':                 /* print short usage statement if args not parsable */
-			usage2 (_("Unknown argument"), optarg);
+			usage5 ();
 		case 'h':                 /* help */
 			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;
@@ -507,7 +507,6 @@ process_arguments (int argc, char **argv)
 				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));
@@ -520,6 +519,7 @@ process_arguments (int argc, char **argv)
 				usage4 (_("Maxbytes must be a positive integer"));
 			else
 				maxbytes = strtol (optarg, NULL, 0);
+			break;
 		case 'q':
 			if (escape)
 				server_quit = np_escaped_string(optarg);
@@ -571,13 +571,16 @@ process_arguments (int argc, char **argv)
 			die (STATE_UNKNOWN, _("Invalid option - SSL is not available"));
 #endif
 			break;
+		case 'A':
+			flags |= FLAG_MATCH_ALL;
+			break;
 		}
 	}
 
 	if (server_address == NULL)
 		usage4 (_("You must provide a server address"));
 	else if (server_address[0] != '/' && is_host (server_address) == FALSE)
-		die (STATE_CRITICAL, "%s: %s - %s\n", progname, _("Invalid hostname, address or socket"), server_address);
+		die (STATE_CRITICAL, "%s %s - %s: %s\n", SERVICE, state_text(STATE_CRITICAL), _("Invalid hostname, address or socket"), server_address);
 
 	return TRUE;
 }
@@ -586,7 +589,7 @@ process_arguments (int argc, char **argv)
 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);
@@ -596,23 +599,26 @@ print_help (void)
 
 	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."));
+  printf ("    %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option"));
   printf ("    %s\n", _("Default: nothing added to send, \\r\\n added to end of quit"));
   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");
@@ -629,20 +635,20 @@ print_help (void)
   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);
 
-	printf (_(UT_SUPPORT));
+	printf (UT_SUPPORT);
 }
 
 
 void
 print_usage (void)
 {
-	printf (_("Usage:"));
+	printf ("%s\n", _("Usage:"));
   printf ("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n",progname);
   printf ("[-e <expect string>] [-q <quit string>][-m <maximum bytes>] [-d <delay>]\n");
   printf ("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");