Code

scanf parsing fix for check_swap from tracker id 1123292. now use floor(3)
[nagiosplug.git] / plugins / check_tcp.c
index cbe859568a7b051cda21cf963a4848b4630fca9a..ad8b0429009d40037f474d71f1daeae56e6a14d8 100644 (file)
-/******************************************************************************
- *
- * This file is part of the Nagios Plugins.
- *
- * Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>
- *
- * The Nagios Plugins are free software; you can redistribute them
- * and/or modify them under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 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.
- *
- * $Id$
- *
- *****************************************************************************/
-
-#define PROGRAM check_tcp
-#define REVISION "$Revision$"
-#define DESCRIPTION "Check a TCP port"
-#define AUTHOR "Ethan Galstad"
-#define EMAIL "nagios@nagios.org"
-#define COPYRIGHTDATE "2002"
-
-#include "config.h"
+/*****************************************************************************
+
+ 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
+ (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.
+
+ $Id$
+*****************************************************************************/
+
+/* progname "check_tcp" changes depending on symlink called */
+char *progname;
+const char *revision = "$Revision$";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 
 #ifdef HAVE_SSL_H
-#include <rsa.h>
-#include <crypto.h>
-#include <x509.h>
-#include <pem.h>
-#include <ssl.h>
-#include <err.h>
-#endif
-
-#ifdef HAVE_OPENSSL_SSL_H
-#include <openssl/rsa.h>
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
+#  include <rsa.h>
+#  include <crypto.h>
+#  include <x509.h>
+#  include <pem.h>
+#  include <ssl.h>
+#  include <err.h>
+#else
+#  ifdef HAVE_OPENSSL_SSL_H
+#    include <openssl/rsa.h>
+#    include <openssl/crypto.h>
+#    include <openssl/x509.h>
+#    include <openssl/pem.h>
+#    include <openssl/ssl.h>
+#    include <openssl/err.h>
+#  endif
 #endif
 
 #ifdef HAVE_SSL
-SSL_CTX *ctx;
-SSL *ssl;
-int connect_SSL (void);
+static int check_cert = FALSE;
+static int days_till_exp;
+static char *randbuff = "";
+static SSL_CTX *ctx;
+static SSL *ssl;
+static X509 *server_cert;
+static int connect_SSL (void);
+static int check_certificate (X509 **);
+# define my_recv(buf, len) ((flags & FLAG_SSL) ? SSL_read(ssl, buf, len) : read(sd, buf, len))
+#else
+# define my_recv(buf, len) read(sd, buf, len)
 #endif
 
-#define TCP_PROTOCOL 1
-#define UDP_PROTOCOL 2
 
-int process_arguments (int, char **);
-void print_usage (void);
+/* int my_recv(char *, size_t); */
+static int process_arguments (int, char **);
 void print_help (void);
+void print_usage (void);
 
-char *PROGNAME = NULL;
-char *SERVICE = NULL;
-char *SEND = NULL;
-char *EXPECT = NULL;
-char *QUIT = NULL;
-int PROTOCOL = 0;
-int PORT = 0;
-
-int server_port = 0;
-char *server_address = NULL;
-char *server_send = NULL;
-char *server_quit = NULL;
-char **server_expect = NULL;
-int server_expect_count = 0;
-char **warn_codes = NULL;
-int warn_codes_count = 0;
-char **crit_codes = NULL;
-int crit_codes_count = 0;
-int delay = 0;
-double warning_time = 0;
-int check_warning_time = FALSE;
-double critical_time = 0;
-int check_critical_time = FALSE;
-double elapsed_time = 0;
-int verbose = FALSE;
-int use_ssl = FALSE;
-int sd = 0;
+#define EXPECT server_expect[0]
+static char *SERVICE = "TCP";
+static char *SEND = NULL;
+static char *QUIT = NULL;
+static int PROTOCOL = IPPROTO_TCP; /* most common is default */
+static int PORT = 0;
+
+static char timestamp[17] = "";
+static int server_port = 0;
+static char *server_address = NULL;
+static char *server_send = NULL;
+static char *server_quit = NULL;
+static char **server_expect;
+static size_t server_expect_count = 0;
+static size_t maxbytes = 0;
+static char **warn_codes = NULL;
+static size_t warn_codes_count = 0;
+static char **crit_codes = NULL;
+static size_t crit_codes_count = 0;
+static unsigned int delay = 0;
+static double warning_time = 0;
+static double critical_time = 0;
+static double elapsed_time = 0;
+static long microsec;
+static int sd = 0;
+#define MAXBUF 1024
+static char buffer[MAXBUF];
+static int expect_mismatch_state = STATE_WARNING;
+
+#define FLAG_SSL 0x01
+#define FLAG_VERBOSE 0x02
+#define FLAG_EXACT_MATCH 0x04
+#define FLAG_TIME_WARN 0x08
+#define FLAG_TIME_CRIT 0x10
+#define FLAG_HIDE_OUTPUT 0x20
+static size_t flags = FLAG_EXACT_MATCH;
 
 int
 main (int argc, char **argv)
 {
-       int result;
+       int result = STATE_UNKNOWN;
        int i;
-       char *buffer = "";
-       char *status = "";
+       char *status = NULL;
        struct timeval tv;
-
-       if (strstr (argv[0], "check_udp")) {
-               asprintf (&PROGNAME, "check_udp");
-               asprintf (&SERVICE, "UDP");
-               SEND = NULL;
-               EXPECT = NULL;
-               QUIT = NULL;
-               PROTOCOL = UDP_PROTOCOL;
-               PORT = 0;
+       size_t len, match = -1;
+
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
+       /* determine program- and service-name quickly */
+       progname = strrchr(argv[0], '/');
+       if(progname != NULL) progname++;
+       else progname = argv[0];
+
+       len = strlen(progname);
+       if(len > 6 && !memcmp(progname, "check_", 6)) {
+               SERVICE = progname + 6;
+               for(i = 0; i < len - 6; i++)
+                       SERVICE[i] = toupper(SERVICE[i]);
        }
-       else if (strstr (argv[0], "check_tcp")) {
-               asprintf (&PROGNAME, "check_tcp");
-               asprintf (&SERVICE, "TCP");
-               SEND = NULL;
-               EXPECT = NULL;
-               QUIT = NULL;
-               PROTOCOL = TCP_PROTOCOL;
-               PORT = 0;
+
+       /* set up a resonable buffer at first (will be realloc()'ed if
+        * user specifies other options) */
+       server_expect = calloc(sizeof(char *), 2);
+
+       /* determine defaults for this service's protocol */
+       if (!strncmp(SERVICE, "UDP", 3)) {
+               PROTOCOL = IPPROTO_UDP;
        }
-       else if (strstr (argv[0], "check_ftp")) {
-               asprintf (&PROGNAME, "check_ftp");
-               asprintf (&SERVICE, "FTP");
-               SEND = NULL;
-               asprintf (&EXPECT, "220");
-               asprintf (&QUIT, "QUIT\r\n");
-               PROTOCOL = TCP_PROTOCOL;
+       else if (!strncmp(SERVICE, "FTP", 3)) {
+               EXPECT = "220";
+               QUIT = "QUIT\r\n";
                PORT = 21;
        }
-       else if (strstr (argv[0], "check_smtp")) {
-               asprintf (&PROGNAME, "check_smtp");
-               asprintf (&SERVICE, "SMTP");
-               SEND = NULL;
-               asprintf (&EXPECT, "220");
-               asprintf (&QUIT, "QUIT\r\n");
-               PROTOCOL = TCP_PROTOCOL;
-               PORT = 25;
-       }
-       else if (strstr (argv[0], "check_pop")) {
-               asprintf (&PROGNAME, "check_pop");
-               asprintf (&SERVICE, "POP");
-               SEND = NULL;
-               asprintf (&EXPECT, "+OK");
-               asprintf (&QUIT, "QUIT\r\n");
-               PROTOCOL = TCP_PROTOCOL;
+       else if (!strncmp(SERVICE, "POP", 3) || !strncmp(SERVICE, "POP3", 4)) {
+               EXPECT = "+OK";
+               QUIT = "QUIT\r\n";
                PORT = 110;
        }
-       else if (strstr (argv[0], "check_imap")) {
-               asprintf (&PROGNAME, "check_imap");
-               asprintf (&SERVICE, "IMAP");
-               SEND = NULL;
-               asprintf (&EXPECT, "* OK");
-               asprintf (&QUIT, "a1 LOGOUT\r\n");
-               PROTOCOL = TCP_PROTOCOL;
+       else if (!strncmp(SERVICE, "SMTP", 4)) {
+               EXPECT = "220";
+               QUIT = "QUIT\r\n";
+               PORT = 25;
+       }
+       else if (!strncmp(SERVICE, "IMAP", 4)) {
+               EXPECT = "* OK";
+               QUIT = "a1 LOGOUT\r\n";
                PORT = 143;
        }
 #ifdef HAVE_SSL
-       else if (strstr(argv[0],"check_simap")) {
-               asprintf (&PROGNAME, "check_simap");
-               asprintf (&SERVICE, "SIMAP");
-               SEND=NULL;
-               asprintf (&EXPECT, "* OK");
-               asprintf (&QUIT, "a1 LOGOUT\r\n");
-               PROTOCOL=TCP_PROTOCOL;
-               use_ssl=TRUE;
-               PORT=993;
+       else if (!strncmp(SERVICE, "SIMAP", 5)) {
+               EXPECT = "* OK";
+               QUIT = "a1 LOGOUT\r\n";
+               flags |= FLAG_SSL;
+               PORT = 993;
+       }
+       else if (!strncmp(SERVICE, "SPOP", 4)) {
+               EXPECT = "+OK";
+               QUIT = "QUIT\r\n";
+               flags |= FLAG_SSL;
+               PORT = 995;
+       }
+       else if (!strncmp(SERVICE, "SSMTP", 5)) {
+               EXPECT = "220";
+               QUIT = "QUIT\r\n";
+               flags |= FLAG_SSL;
+               PORT = 465;
        }
-       else if (strstr(argv[0],"check_spop")) {
-               asprintf (&PROGNAME, "check_spop");
-               asprintf (&SERVICE, "SPOP");
-               SEND=NULL;
-               asprintf (&EXPECT, "110");
-               asprintf (&QUIT, "QUIT\r\n");
-               PROTOCOL=TCP_PROTOCOL;
-               use_ssl=TRUE;
-               PORT=995;
+       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\'";
+               QUIT = "</stream:stream>\n";
+               flags |= FLAG_SSL | FLAG_HIDE_OUTPUT;
+               PORT = 5222;
+       }
+       else if (!strncmp (SERVICE, "NNTPS", 5)) {
+               server_expect_count = 2;
+               server_expect[0] = "200";
+               server_expect[1] = "201";
+               QUIT = "QUIT\r\n";
+               flags |= FLAG_SSL;
+               PORT = 563;
        }
 #endif
-       else if (strstr (argv[0], "check_nntp")) {
-               asprintf (&PROGNAME, "check_nntp");
-               asprintf (&SERVICE, "NNTP");
-               SEND = NULL;
-               EXPECT = NULL;
-               server_expect = realloc (server_expect, ++server_expect_count);
-               asprintf (&server_expect[server_expect_count - 1], "200");
-               server_expect = realloc (server_expect, ++server_expect_count);
-               asprintf (&server_expect[server_expect_count - 1], "201");
-               asprintf (&QUIT, "QUIT\r\n");
-               PROTOCOL = TCP_PROTOCOL;
+       else if (!strncmp (SERVICE, "NNTP", 4)) {
+               server_expect_count = 2;
+               server_expect = malloc(sizeof(char *) * server_expect_count);
+               server_expect[0] = strdup("200");
+               server_expect[1] = strdup("201");
+               QUIT = "QUIT\r\n";
                PORT = 119;
        }
-       else {
-               usage ("ERROR: Generic check_tcp called with unknown service\n");
-       }
+       /* fallthrough check, so it's supposed to use reverse matching */
+       else if (strcmp (SERVICE, "TCP"))
+               usage (_("CRITICAL - Generic check_tcp called with unknown service\n"));
 
-       asprintf (&server_address, "127.0.0.1");
+       server_address = "127.0.0.1";
        server_port = PORT;
        server_send = SEND;
        server_quit = QUIT;
+       status = NULL;
 
        if (process_arguments (argc, argv) == ERROR)
-               usage ("Could not parse arguments\n");
+               usage4 (_("Could not parse arguments"));
 
-       /* use default expect if none listed in process_arguments() */
-       if (EXPECT && server_expect_count == 0) {
-               server_expect = malloc (++server_expect_count);
-               server_expect[server_expect_count - 1] = EXPECT;
+       if(flags & FLAG_VERBOSE) {
+               printf("Using service %s\n", SERVICE);
+               printf("Port: %d\n", PORT);
+               printf("flags: 0x%x\n", flags);
        }
 
-       /* initialize alarm signal handling */
-       signal (SIGALRM, socket_timeout_alarm_handler);
+       if(EXPECT && !server_expect_count)
+               server_expect_count++;
 
-       /* set socket timeout */
+       /* set up the timer */
+       signal (SIGALRM, socket_timeout_alarm_handler);
        alarm (socket_timeout);
 
        /* try to connect to the host at the given port number */
        gettimeofday (&tv, NULL);
 #ifdef HAVE_SSL
-       if (use_ssl)
+       if (flags & FLAG_SSL && check_cert == TRUE) {
+               if (connect_SSL () != OK)
+                       die (STATE_CRITICAL,_("CRITICAL - Could not make SSL connection\n"));
+               if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
+                       result = check_certificate (&server_cert);
+                       X509_free(server_cert);
+               }
+               else {
+                       printf(_("CRITICAL - Cannot retrieve server certificate.\n"));
+                       result = STATE_CRITICAL;
+               }
+
+               SSL_shutdown (ssl);
+               SSL_free (ssl);
+               SSL_CTX_free (ctx);
+               close (sd);
+               return result;
+       }
+       else if (flags & FLAG_SSL)
                result = connect_SSL ();
        else
 #endif
-               {
-                       if (PROTOCOL == UDP_PROTOCOL)
-                               result = my_udp_connect (server_address, server_port, &sd);
-                       else                                                                                                    /* default is TCP */
-                               result = my_tcp_connect (server_address, server_port, &sd);
-               }
+               result = np_net_connect (server_address, server_port, &sd, PROTOCOL);
 
        if (result == STATE_CRITICAL)
                return STATE_CRITICAL;
 
        if (server_send != NULL) {              /* Something to send? */
-               asprintf (&server_send, "%s\r\n", server_send);
 #ifdef HAVE_SSL
-               if (use_ssl)
-                       SSL_write(ssl, server_send, strlen (server_send));
+               if (flags & FLAG_SSL)
+                       SSL_write(ssl, server_send, (int)strlen(server_send));
                else
 #endif
-                       send (sd, server_send, strlen (server_send), 0);
+                       send (sd, server_send, strlen(server_send), 0);
        }
 
        if (delay > 0) {
@@ -247,93 +269,133 @@ main (int argc, char **argv)
                sleep (delay);
        }
 
-       if (server_send || server_expect_count > 0) {
+       if(flags & FLAG_VERBOSE) {
+               printf("server_expect_count: %d\n", server_expect_count);
+               for(i = 0; i < server_expect_count; i++)
+                       printf("\t%d: %s\n", i, server_expect[i]);
+       }
+
+       /* if(len) later on, we know we have a non-NULL response */
+       len = 0;
+       if (server_expect_count) {
 
-               buffer = malloc (MAX_INPUT_BUFFER);
                /* watch for the expect string */
-#ifdef HAVE_SSL
-               if (use_ssl && SSL_read (ssl, buffer, MAX_INPUT_BUFFER - 1) > 0)
-                       asprintf (&status, "%s%s", status, buffer);
-               else
-#endif
-                       if (recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0) > 0)
-                               asprintf (&status, "%s%s", status, buffer);
-
-               /* return a CRITICAL status if we couldn't read any data */
-               if (status == NULL)
-                       terminate (STATE_CRITICAL, "No data received from host\n");
-
-               strip (status);
-
-               if (status && verbose)
-                       printf ("%s\n", status);
-
-               if (server_expect_count > 0) {
-                       for (i = 0;; i++) {
-                               if (verbose)
-                                       printf ("%d %d\n", i, server_expect_count);
-                               if (i >= server_expect_count)
-                                       terminate (STATE_WARNING, "Invalid response from host\n");
-                               if (strstr (status, server_expect[i]))
-                                       break;
+               while ((i = my_recv(buffer, sizeof(buffer))) > 0) {
+                       status = realloc(status, len + i + 1);
+                       memcpy(&status[len], buffer, i);
+                       len += i;
+
+                       /* stop reading if user-forced or data-starved */
+                       if(i < sizeof(buffer) || (maxbytes && len >= maxbytes))
+                               break;
+
+                       if (maxbytes && len >= maxbytes)
+                               break;
+               }
+
+               /* no data when expected, so return critical */
+               if (len == 0)
+                       die (STATE_CRITICAL, _("No data received from host\n"));
+
+               /* force null-termination and strip whitespace from end of output */
+               status[len--] = '\0';
+               /* print raw output if we're debugging */
+               if(flags & FLAG_VERBOSE)
+                       printf("received %d bytes from host\n#-raw-recv-------#\n%s\n#-raw-recv-------#\n",
+                              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;
                        }
                }
        }
 
-       if (server_quit)
+       if (server_quit != NULL) {
 #ifdef HAVE_SSL
-               if (use_ssl) {
-                       SSL_write (ssl, QUIT, strlen (QUIT));
+               if (flags & FLAG_SSL) {
+                       SSL_write (ssl, server_quit, (int)strlen(server_quit));
                        SSL_shutdown (ssl);
                        SSL_free (ssl);
                        SSL_CTX_free (ctx);
                }
                else
 #endif
-               send (sd, server_quit, strlen (server_quit), 0);
+                       send (sd, server_quit, strlen (server_quit), 0);
+       }
 
        /* close the connection */
        if (sd)
                close (sd);
 
-       elapsed_time = delta_time (tv);
+       microsec = deltime (tv);
+       elapsed_time = (double)microsec / 1.0e6;
 
-       if (check_critical_time == TRUE && elapsed_time > critical_time)
+       if (flags & FLAG_TIME_CRIT && elapsed_time > critical_time)
                result = STATE_CRITICAL;
-       else if (check_warning_time == TRUE && elapsed_time > warning_time)
+       else if (flags & FLAG_TIME_WARN && elapsed_time > warning_time)
+               result = STATE_WARNING;
+
+       /* did we get the response we hoped? */
+       if(match == -2 && result != STATE_CRITICAL)
                result = STATE_WARNING;
 
        /* reset the alarm */
        alarm (0);
 
-       printf
-               ("%s %s - %7.3f second response time on port %d",
-                SERVICE,
-                state_text (result), elapsed_time, server_port);
+       /* 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));
 
-       if (status && strlen(status) > 0)
-               printf (" [%s]", status);
+       if(match == -2 && len && !(flags & FLAG_HIDE_OUTPUT))
+               printf("Unexpected response from host: %s", status);
+       else
+               printf("%.3f second response time on port %d",
+                      elapsed_time, server_port);
 
-       printf ("|time=%7.3f\n", elapsed_time);
+       if (match != -2 && !(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);
+       else
+               printf("|%s",
+                               fperfdata ("time", elapsed_time, "s",
+                                  TRUE, warning_time,
+                                  TRUE, critical_time,
+                                  TRUE, 0,
+                                  TRUE, socket_timeout)
+                     );
+
+       putchar('\n');
        return result;
 }
 
 
 
-
-
-
-
 /* process command-line arguments */
-int
+static int
 process_arguments (int argc, char **argv)
 {
        int c;
 
-#ifdef HAVE_GETOPT_H
-       int option_index = 0;
-       static struct option long_options[] = {
+       int option = 0;
+       static struct option longopts[] = {
                {"hostname", required_argument, 0, 'H'},
                {"critical-time", required_argument, 0, 'c'},
                {"warning-time", required_argument, 0, 'w'},
@@ -344,17 +406,26 @@ process_arguments (int argc, char **argv)
                {"port", required_argument, 0, 'p'},
                {"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'},
                {"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'},
                {"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}
        };
-#endif
 
        if (argc < 2)
-               usage ("No arguments found\n");
+               usage4 (_("No arguments found"));
 
        /* backwards compatibility */
        for (c = 1; c < argc; c++) {
@@ -374,47 +445,55 @@ process_arguments (int argc, char **argv)
        }
 
        while (1) {
-#ifdef HAVE_GETOPT_H
-               c =
-                       getopt_long (argc, argv, "+hVvH:s:e:q:c:w:t:p:C:W:d:S", long_options,
-                                                                        &option_index);
-#else
-               c = getopt (argc, argv, "+hVvH:s:e:q:c:w:t:p:C:W:d:S");
-#endif
+               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)
                        break;
 
                switch (c) {
                case '?':                 /* print short usage statement if args not parsable */
-                       printf ("%s: Unknown argument: %s\n\n", my_basename (argv[0]), optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                case 'h':                 /* help */
                        print_help ();
                        exit (STATE_OK);
                case 'V':                 /* version */
-                       print_revision (PROGNAME, "$Revision$");
+                       print_revision (progname, revision);
                        exit (STATE_OK);
                case 'v':                 /* verbose mode */
-                       verbose = TRUE;
+                       flags |= FLAG_VERBOSE;
+                       break;
+               case '4':
+                       address_family = AF_INET;
+                       break;
+               case '6':
+#ifdef USE_IPV6
+                       address_family = AF_INET6;
+#else
+                       usage4 (_("IPv6 support not available"));
+#endif
                        break;
                case 'H':                 /* hostname */
                        if (is_host (optarg) == FALSE)
-                               usage ("Invalid host name/address\n");
+                               usage2 (_("Invalid hostname/address"), optarg);
                        server_address = optarg;
                        break;
                case 'c':                 /* critical */
                        if (!is_intnonneg (optarg))
-                               usage ("Critical threshold must be a nonnegative integer\n");
-                       critical_time = strtod (optarg, NULL);
-                       check_critical_time = TRUE;
+                               usage4 (_("Critical threshold must be a positive integer"));
+                       else
+                               critical_time = strtod (optarg, NULL);
+                       flags |= FLAG_TIME_CRIT;
+                       break;
+               case 'j':                 /* hide output */
+                       flags |= FLAG_HIDE_OUTPUT;
                        break;
                case 'w':                 /* warning */
                        if (!is_intnonneg (optarg))
-                               usage ("Warning threshold must be a nonnegative integer\n");
-                       warning_time = strtod (optarg, NULL);
-                       check_warning_time = TRUE;
+                               usage4 (_("Warning threshold must be a positive integer"));
+                       else
+                               warning_time = strtod (optarg, NULL);
+                       flags |= FLAG_TIME_WARN;
                        break;
                case 'C':
                        crit_codes = realloc (crit_codes, ++crit_codes_count);
@@ -426,116 +505,104 @@ process_arguments (int argc, char **argv)
                        break;
                case 't':                 /* timeout */
                        if (!is_intpos (optarg))
-                               usage ("Timeout interval must be a positive integer\n");
-                       socket_timeout = atoi (optarg);
+                               usage4 (_("Timeout interval must be a positive integer"));
+                       else
+                               socket_timeout = atoi (optarg);
                        break;
                case 'p':                 /* port */
                        if (!is_intpos (optarg))
-                               usage ("Server port must be a positive integer\n");
-                       server_port = atoi (optarg);
+                               usage4 (_("Port must be a positive integer"));
+                       else
+                               server_port = atoi (optarg);
                        break;
                case 's':
                        server_send = optarg;
                        break;
                case 'e': /* expect string (may be repeated) */
                        EXPECT = NULL;
+                       flags &= ~FLAG_EXACT_MATCH;
                        if (server_expect_count == 0)
-                               server_expect = malloc (++server_expect_count);
+                               server_expect = malloc (sizeof (char *) * (++server_expect_count));
                        else
-                               server_expect = realloc (server_expect, ++server_expect_count);
+                               server_expect = realloc (server_expect, sizeof (char *) * (++server_expect_count));
                        server_expect[server_expect_count - 1] = optarg;
                        break;
+               case 'm':
+                       if (!is_intpos (optarg))
+                               usage4 (_("Maxbytes must be a positive integer"));
+                       else
+                               maxbytes = strtol (optarg, NULL, 0);
                case 'q':
-                       server_quit = optarg;
+                       asprintf(&server_quit, "%s\r\n", optarg);
+                       break;
+               case 'r':
+                       if (!strncmp(optarg,"ok",2))
+                               econn_refuse_state = STATE_OK;
+                       else if (!strncmp(optarg,"warn",4))
+                               econn_refuse_state = STATE_WARNING;
+                       else if (!strncmp(optarg,"crit",4))
+                               econn_refuse_state = STATE_CRITICAL;
+                       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);
                        else
-                               usage ("Delay must be a positive integer\n");
+                               usage4 (_("Delay must be a positive integer"));
                        break;
+               case 'D': /* Check SSL cert validity - days 'til certificate expiration */
+#ifdef HAVE_SSL
+                       if (!is_intnonneg (optarg))
+                               usage2 (_("Invalid certificate expiration period"), optarg);
+                       days_till_exp = atoi (optarg);
+                       check_cert = TRUE;
+                       flags |= FLAG_SSL;
+                       break;
+#endif
+                       /* fallthrough if we don't have ssl */
                case 'S':
-#ifndef HAVE_SSL
-                       terminate (STATE_UNKNOWN,
-                               "SSL support not available. Install OpenSSL and recompile.");
+#ifdef HAVE_SSL
+                       flags |= FLAG_SSL;
+#else
+                       die (STATE_UNKNOWN, _("Invalid option - SSL is not available"));
 #endif
-                       use_ssl = TRUE;
                        break;
                }
        }
 
        if (server_address == NULL)
-               usage ("You must provide a server address\n");
-
-       return OK;
-}
-
-
-
-
-
-void
-print_usage (void)
-{
-       printf
-               ("Usage: %s -H host -p port [-w warn_time] [-c crit_time] [-s send]\n"
-                "         [-e expect] [-W wait] [-t to_sec] [-v]\n", PROGNAME);
-}
-
-
+               usage4 (_("You must provide a server address"));
 
-
-
-void
-print_help (void)
-{
-       print_revision (PROGNAME, "$Revision$");
-       printf
-               ("Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)\n\n"
-                "This plugin tests %s connections with the specified host.\n\n",
-                SERVICE);
-       print_usage ();
-       printf
-               ("Options:\n"
-                " -H, --hostname=ADDRESS\n"
-                "    Host name argument for servers using host headers (use numeric\n"
-                "    address if possible to bypass DNS lookup).\n"
-                " -p, --port=INTEGER\n"
-                "    Port number\n"
-                " -s, --send=STRING\n"
-                "    String to send to the server\n"
-                " -e, --expect=STRING\n"
-                "    String to expect in server response"
-                " -W, --wait=INTEGER\n"
-                "    Seconds to wait between sending string and polling for response\n"
-                " -w, --warning=DOUBLE\n"
-                "    Response time to result in warning status (seconds)\n"
-                " -c, --critical=DOUBLE\n"
-                "    Response time to result in critical status (seconds)\n"
-                " -t, --timeout=INTEGER\n"
-                "    Seconds before connection times out (default: %d)\n"
-                " -v"
-                "    Show details for command-line debugging (do not use with nagios server)\n"
-                " -h, --help\n"
-                "    Print detailed help screen\n"
-                " -V, --version\n"
-                "    Print version information\n", DEFAULT_SOCKET_TIMEOUT);
+       return TRUE;
 }
 
 
+/* SSL-specific functions */
 #ifdef HAVE_SSL
-int
+static int
 connect_SSL (void)
 {
   SSL_METHOD *meth;
 
   /* Initialize SSL context */
   SSLeay_add_ssl_algorithms ();
-  meth = SSLv2_client_method ();
+  meth = SSLv23_client_method ();
   SSL_load_error_strings ();
+  OpenSSL_add_all_algorithms();
   if ((ctx = SSL_CTX_new (meth)) == NULL)
     {
-      printf ("ERROR: Cannot create SSL context.\n");
+      printf (_("CRITICAL - Cannot create SSL context.\n"));
       return STATE_CRITICAL;
     }
 
@@ -549,19 +616,22 @@ connect_SSL (void)
   time (&start_time);
 
   /* Make TCP connection */
-  if (my_tcp_connect (server_address, server_port, &sd) == STATE_OK)
+  if (my_tcp_connect (server_address, server_port, &sd) == STATE_OK && was_refused == FALSE)
     {
     /* Do the SSL handshake */
       if ((ssl = SSL_new (ctx)) != NULL)
       {
         SSL_set_fd (ssl, sd);
-        if (SSL_connect (ssl) != -1)
+        if (SSL_connect(ssl) == 1)
           return OK;
-        ERR_print_errors_fp (stderr);
+        /* ERR_print_errors_fp (stderr); */
+       printf (_("CRITICAL - Cannot make  SSL connection "));
+        ERR_print_errors_fp (stdout);
+       /* printf("\n"); */
       }
       else
       {
-        printf ("ERROR: Cannot initiate SSL handshake.\n");
+        printf (_("CRITICAL - Cannot initiate SSL handshake.\n"));
       }
       SSL_free (ssl);
     }
@@ -571,5 +641,148 @@ connect_SSL (void)
 
   return STATE_CRITICAL;
 }
+
+static int
+check_certificate (X509 ** certificate)
+{
+  ASN1_STRING *tm;
+  int offset;
+  struct tm stamp;
+  int days_left;
+
+
+  /* Retrieve timestamp of certificate */
+  tm = X509_get_notAfter (*certificate);
+
+  /* Generate tm structure to process timestamp */
+  if (tm->type == V_ASN1_UTCTIME) {
+    if (tm->length < 10) {
+      printf (_("CRITICAL - Wrong time format in certificate.\n"));
+      return STATE_CRITICAL;
+    }
+    else {
+      stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
+      if (stamp.tm_year < 50)
+       stamp.tm_year += 100;
+      offset = 0;
+    }
+  }
+  else {
+    if (tm->length < 12) {
+      printf (_("CRITICAL - Wrong time format in certificate.\n"));
+      return STATE_CRITICAL;
+    }
+    else {
+                        stamp.tm_year =
+                         (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 +
+                         (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
+                        stamp.tm_year -= 1900;
+                        offset = 2;
+    }
+  }
+        stamp.tm_mon =
+         (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
+        stamp.tm_mday =
+         (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
+        stamp.tm_hour =
+         (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
+        stamp.tm_min =
+         (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
+        stamp.tm_sec = 0;
+        stamp.tm_isdst = -1;
+
+        days_left = (mktime (&stamp) - time (NULL)) / 86400;
+        snprintf
+         (timestamp, 16, "%02d/%02d/%04d %02d:%02d",
+          stamp.tm_mon + 1,
+          stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+
+        if (days_left > 0 && days_left <= days_till_exp) {
+         printf (_("Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
+         return STATE_WARNING;
+        }
+        if (days_left < 0) {
+         printf (_("Certificate expired on %s.\n"), timestamp);
+         return STATE_CRITICAL;
+        }
+
+        if (days_left == 0) {
+         printf (_("Certificate expires today (%s).\n"), timestamp);
+         return STATE_WARNING;
+        }
+
+        printf (_("Certificate will expire on %s.\n"), timestamp);
+
+        return STATE_OK;
+}
+#endif /* HAVE_SSL */
+
+
+void
+print_help (void)
+{
+       print_revision (progname, revision);
+
+       printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+       printf (COPYRIGHT, copyright, email);
+
+       printf (_("This plugin tests %s connections with the specified host.\n\n"),
+               SERVICE);
+
+       print_usage ();
+
+       printf (_(UT_HELP_VRSN));
+
+       printf (_(UT_HOST_PORT), 'p', "none");
+
+       printf (_(UT_IPv46));
+
+       printf (_("\
+ -s, --send=STRING\n\
+    String to send to the server\n\
+ -e, --expect=STRING\n\
+    String to expect in server response\n\
+ -q, --quit=STRING\n\
+    String to send server to initiate a clean close of the connection\n"));
+
+       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\
+    Close connection once more than this number of bytes are received\n\
+ -d, --delay=INTEGER\n\
+    Seconds to wait between sending string and polling for response\n"));
+
+#ifdef HAVE_SSL
+       printf (_("\
+ -D, --certificate=INTEGER\n\
+    Minimum number of days a certificate has to be valid.\n\
+ -S, --ssl\n\
+    Use SSL for the connection.\n"));
 #endif
 
+       printf (_(UT_WARN_CRIT));
+
+       printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+
+       printf (_(UT_VERBOSE));
+
+       printf (_(UT_SUPPORT));
+}
+
+
+void
+print_usage (void)
+{
+       printf ("\
+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>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n\
+                  [-D <days to cert expiry>] [-S <use SSL>]\n", progname);
+}
+