![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 09f8f143eece6f42d3d8eb60c2c5ec59ea5224a2..b6c60c244ebf5ea73446fc28ca8a0a017e3fb3f4 100644 (file)
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ $Id$
+
******************************************************************************/
const char *progname = "check_smtp";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
void print_help (void);
void print_usage (void);
+#ifdef HAVE_REGEX_H
+#include <regex.h>
+char regex_expect[MAX_INPUT_BUFFER] = "";
+regex_t preg;
+regmatch_t pmatch[10];
+char timestamp[10] = "";
+char errbuf[MAX_INPUT_BUFFER];
+int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+int eflags = 0;
+int errcode, excode;
+#endif
+
int server_port = SMTP_PORT;
char *server_address = NULL;
char *server_expect = NULL;
-
-
-\f
int
main (int argc, char **argv)
{
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
- usage (_("Invalid command arguments supplied\n"));
+ if (process_arguments (argc, argv) == ERROR)
+ usage4 (_("Could not parse arguments"));
/* initialize the HELO command with the localhostname */
#ifndef HOST_MAX_BYTES
if (verbose)
printf("%s", buffer);
strip (buffer);
- if (n < nresponses && strstr(buffer, responses[n])!=buffer) {
- result = STATE_WARNING;
- printf (_("SMTP %s - Invalid response '%s' to command '%s'\n"), state_text (result), buffer, commands[n]);
+ if (n < nresponses) {
+#ifdef HAVE_REGEX_H
+ cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+ //strncpy (regex_expect, responses[n], sizeof (regex_expect) - 1);
+ //regex_expect[sizeof (regex_expect) - 1] = '\0';
+ errcode = regcomp (&preg, responses[n], cflags);
+ if (errcode != 0) {
+ regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+ printf (_("Could Not Compile Regular Expression"));
+ return ERROR;
+ }
+ excode = regexec (&preg, buffer, 10, pmatch, eflags);
+ if (excode == 0) {
+ result = STATE_OK;
+ }
+ else if (excode == REG_NOMATCH) {
+ result = STATE_WARNING;
+ printf (_("SMTP %s - Invalid response '%s' to command '%s'\n"), state_text (result), buffer, commands[n]);
+ }
+ else {
+ regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
+ printf (_("Execute Error: %s\n"), errbuf);
+ result = STATE_UNKNOWN;
+ }
+#else
+ if (strstr(buffer, responses[n])!=buffer) {
+ result = STATE_WARNING;
+ printf (_("SMTP %s - Invalid response '%s' to command '%s'\n"), state_text (result), buffer, commands[n]);
+ }
+#endif
}
n++;
}
microsec = deltime (tv);
elapsed_time = (double)microsec / 1.0e6;
- if (check_critical_time && elapsed_time > (double) critical_time)
- result = STATE_CRITICAL;
- else if (check_warning_time && elapsed_time > (double) warning_time)
- result = STATE_WARNING;
+ if (result == STATE_OK) {
+ if (check_critical_time && elapsed_time > (double) critical_time)
+ result = STATE_CRITICAL;
+ else if (check_warning_time && elapsed_time > (double) warning_time)
+ result = STATE_WARNING;
+ }
printf (_("SMTP %s - %.3f sec. response time%s%s|%s\n"),
state_text (result), elapsed_time,
verbose?", ":"", verbose?buffer:"",
- perfdata ("time", microsec, "us",
- check_warning_time, (long)(1000000*warning_time),
- check_critical_time, (long)(1000000*critical_time),
+ fperfdata ("time", elapsed_time, "s",
+ (int)check_warning_time, warning_time,
+ (int)check_critical_time, critical_time,
TRUE, 0, FALSE, 0));
return result;
-
-
-\f
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
server_address = optarg;
}
else {
- usage (_("Invalid host name\n"));
+ usage2 (_("Invalid hostname/address"), optarg);
}
break;
case 'p': /* port */
if (is_intpos (optarg))
server_port = atoi (optarg);
else
- usage (_("Server port must be a positive integer\n"));
+ usage4 (_("Port must be a positive integer"));
break;
case 'f': /* from argument */
from_arg = optarg;
check_critical_time = TRUE;
}
else {
- usage (_("Critical time must be a nonnegative integer\n"));
+ usage4 (_("Critical time must be a positive integer"));
}
break;
case 'w': /* warning time threshold */
check_warning_time = TRUE;
}
else {
- usage (_("Warning time must be a nonnegative integer\n"));
+ usage4 (_("Warning time must be a positive integer"));
}
break;
case 'v': /* verbose */
socket_timeout = atoi (optarg);
}
else {
- usage (_("Time interval must be a nonnegative integer\n"));
+ usage4 (_("Time interval must be a positive integer"));
}
break;
case '4':
#ifdef USE_IPV6
address_family = AF_INET6;
#else
- usage (_("IPv6 support not available\n"));
+ usage4 (_("IPv6 support not available"));
#endif
break;
case 'V': /* version */
print_help ();
exit (STATE_OK);
case '?': /* help */
- usage (_("Invalid argument\n"));
+ printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+ print_usage ();
+ exit (STATE_UNKNOWN);
}
}
if (is_host (argv[c]))
server_address = argv[c];
else
- usage (_("Invalid host name"));
+ usage2 (_("Invalid hostname/address"), argv[c]);
}
else {
asprintf (&server_address, "127.0.0.1");
-
-
int
validate_arguments (void)
{
-
-
-\f
void
print_help (void)
{
print_revision (progname, revision);
- printf (_("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n"));
- printf (_(COPYRIGHT), copyright, email);
+ printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
+ printf (COPYRIGHT, copyright, email);
- printf(_("\
-This plugin will attempt to open an SMTP connection with the host.\n\n"));
+ printf(_("This plugin will attempt to open an SMTP connection with the host.\n\n"));
print_usage ();
-
-
void
print_usage (void)
{
printf ("\
Usage: %s -H host [-p port] [-e expect] [-C command] [-f from addr]\n\
- [-w warn] [-c crit] [-t timeout] [-n] [-v] [-4|-6]\n", progname);
- printf (_(UT_HLP_VRS), progname, progname);
+ [-w warn] [-c crit] [-t timeout] [-n] [-v] [-4|-6]\n", progname);
}
-
-
-