![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index e957c0538a898f3c3c5a427cb9ec2c8dbc36e395..3bbf44dc10813c94cf5371d9270085b4d840a811 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
-/******************************************************************************
-
- 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$
-
-******************************************************************************/
+/*****************************************************************************
+*
+* Nagios check_ssh plugin
+*
+* License: GPL
+* Copyright (c) 2000-2007 Nagios Plugins Development Team
+*
+* Description:
+*
+* This file contains the check_ssh plugin
+*
+* Try to connect to an SSH server at specified server and port
+*
+*
+* 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 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, see <http://www.gnu.org/licenses/>.
+*
+*
+*****************************************************************************/
const char *progname = "check_ssh";
-const char *revision = "$Revision$";
-const char *copyright = "2000-2004";
+const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+ /* Parse extra opts if any */
+ argv=np_extra_opts (&argc, argv, progname);
+
if (process_arguments (argc, argv) == ERROR)
usage4 (_("Could not parse arguments"));
/* initialize alarm signal handling */
signal (SIGALRM, socket_timeout_alarm_handler);
-
+
alarm (socket_timeout);
/* ssh_connect exits if error is found */
static struct option longopts[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
- {"host", required_argument, 0, 'H'},
+ {"host", required_argument, 0, 'H'}, /* backward compatibility */
+ {"hostname", required_argument, 0, 'H'},
{"port", required_argument, 0, 'p'},
{"use-ipv4", no_argument, 0, '4'},
{"use-ipv6", no_argument, 0, '6'},
switch (c) {
case '?': /* help */
- printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
- print_usage ();
- exit (STATE_UNKNOWN);
+ usage5 ();
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
#ifdef USE_IPV6
address_family = AF_INET6;
#else
- usage (_("IPv6 support not available\n"));
+ usage4 (_("IPv6 support not available"));
#endif
break;
case 'r': /* remote version */
port = atoi (optarg);
}
else {
- printf ("Port number nust be a positive integer: %s\n", optarg);
- usage ("");
+ usage2 (_("Port number must be a positive integer"), optarg);
}
}
-
}
c = optind;
char *buffer = NULL;
char *ssh_proto = NULL;
char *ssh_server = NULL;
- char rev_no[20];
+ static char *rev_no = VERSION;
+ struct timeval tv;
+ double elapsed_time;
- sscanf ("$Revision$", "$Revision: %[0123456789.]", rev_no);
+ gettimeofday(&tv, NULL);
result = my_tcp_connect (haddr, hport, &sd);
recv (sd, output, BUFF_SZ, 0);
if (strncmp (output, "SSH", 3)) {
printf (_("Server answer: %s"), output);
+ close(sd);
exit (STATE_CRITICAL);
}
else {
printf
(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
ssh_server, ssh_proto, remote_version);
+ close(sd);
exit (STATE_WARNING);
}
-
+
+ elapsed_time = (double)deltime(tv) / 1.0e6;
+
printf
- (_("SSH OK - %s (protocol %s)\n"),
- ssh_server, ssh_proto);
+ (_("SSH OK - %s (protocol %s) | %s\n"),
+ ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
+ FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
+ close(sd);
exit (STATE_OK);
}
}
char *myport;
asprintf (&myport, "%d", SSH_DFL_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
printf (COPYRIGHT, copyright, email);
- printf (_("Try to connect to an SSH server at specified server and port\n\n"));
+ printf ("%s\n", _("Try to connect to an SSH server at specified server and port"));
+
+ printf ("\n\n");
print_usage ();
- printf (_(UT_HELP_VRSN));
+ printf (UT_HELP_VRSN);
+ printf (UT_EXTRA_OPTS);
+
+ printf (UT_HOST_PORT, 'p', myport);
- printf (_(UT_HOST_PORT), 'p', myport);
+ printf (UT_IPv46);
- printf (_(UT_IPv46));
+ printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
- printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ printf (" %s\n", "-r, --remote-version=STRING");
+ printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
- printf (_("\
- -r, --remote-version=STRING\n\
- Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)\n"));
-
- printf (_(UT_VERBOSE));
+ printf (UT_VERBOSE);
- printf (_(UT_SUPPORT));
+ printf (UT_SUPPORT);
}
void
print_usage (void)
{
- printf ("\
-Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
+ printf ("%s\n", _("Usage:"));
+ printf ("%s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
}