diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 2e16e6510afcebad9832b2715e8b505fc58cc50e..3bbf44dc10813c94cf5371d9270085b4d840a811 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ssh plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ssh";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
case '?': /* help */
usage5 ();
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
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);
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);
print_usage ();
- printf (_(UT_HELP_VRSN));
- printf (_(UT_EXTRA_OPTS));
+ 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 (_(UT_VERBOSE));
-
-#ifdef NP_EXTRA_OPTS
- printf ("\n");
- printf ("%s\n", _("Notes:"));
- printf (_(UT_EXTRA_OPTS_NOTES));
-#endif
+ printf (UT_VERBOSE);
- printf (_(UT_SUPPORT));
+ printf (UT_SUPPORT);
}
void
print_usage (void)
{
- printf (_("Usage:"));
+ printf ("%s\n", _("Usage:"));
printf ("%s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
}