check_host: Allocate a large-enough buffer for the host table.

[nagiosplug.git] / plugins / check_ssh.c

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 869b803ea90b8afe2ee612398ce023944755d80d..3bbf44dc10813c94cf5371d9270085b4d840a811 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ssh plugin
@@ -27,12 +25,10 @@
 * 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";
 
@@ -70,12 +66,15 @@ main (int argc, char **argv)
        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 */
@@ -126,7 +125,7 @@ process_arguments (int argc, char **argv)
                case '?':                                                                       /* help */
                        usage5 ();
                case 'V':                                                                       /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
@@ -215,9 +214,11 @@ ssh_connect (char *haddr, int hport, char *remote_version)
        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);
 
@@ -252,10 +253,13 @@ ssh_connect (char *haddr, int hport, char *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);
        }
@@ -269,7 +273,7 @@ print_help (void)
        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);
@@ -280,20 +284,21 @@ print_help (void)
 
        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 (_(UT_VERBOSE));
 
-       printf (_(UT_SUPPORT));
+       printf (UT_VERBOSE);
+
+       printf (UT_SUPPORT);
 }
 
 
@@ -301,7 +306,7 @@ print_help (void)
 void
 print_usage (void)
 {
-  printf (_("Usage:"));
+  printf ("%s\n", _("Usage:"));
        printf ("%s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
 }