![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index d78189fc793100e146b2f0da3fe79ec8a66609b4..bd0a2451a44a9ec54d2c973ba378c75c9364e5b2 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
#include "netutils.h"
#include "utils.h"
-#define PROGNAME "check_ssh"
+const char *progname = "check_ssh";
+#define REVISION "$Revision$"
#ifndef MSG_DONTWAIT
#define MSG_DONTWAIT 0
int verbose = FALSE;
int process_arguments (int, char **);
-int call_getopt (int, char **);
int validate_arguments (void);
void print_help (void);
void print_usage (void);
-char *ssh_resolve (char *hostname);
int ssh_connect (char *haddr, short hport);
int
main (int argc, char **argv)
{
+ int result;
if (process_arguments (argc, argv) == ERROR)
usage ("Could not parse arguments\n");
alarm (socket_timeout);
/* ssh_connect exits if error is found */
- ssh_connect (ssh_resolve (server_name), port);
+ result = ssh_connect (server_name, port);
alarm (0);
- return (STATE_OK);
+ return (result);
}
process_arguments (int argc, char **argv)
{
int c;
-
- if (argc < 2)
- return ERROR;
-
- for (c = 1; c < argc; c++)
- if (strcmp ("-to", argv[c]) == 0)
- strcpy (argv[c], "-t");
-
- c = 0;
- while (c += (call_getopt (argc - c, &argv[c]))) {
- if (argc <= c)
- break;
- if (server_name == NULL) {
- server_name = argv[c];
- }
- else if (port == -1) {
- if (is_intpos (argv[c])) {
- port = atoi (argv[c]);
- }
- else {
- print_usage ();
- exit (STATE_UNKNOWN);
- }
- }
- }
-
- return validate_arguments ();
-}
-
-
-/************************************************************************
-*
-* Run the getopt until we encounter a non-option entry in the arglist
-*
-*-----------------------------------------------------------------------*/
-
-int
-call_getopt (int argc, char **argv)
-{
- int c, i = 1;
+ char *tmp = NULL;
#ifdef HAVE_GETOPT_H
int option_index = 0;
};
#endif
+ if (argc < 2)
+ return ERROR;
+
+ for (c = 1; c < argc; c++)
+ if (strcmp ("-to", argv[c]) == 0)
+ strcpy (argv[c], "-t");
+
while (1) {
#ifdef HAVE_GETOPT_H
c = getopt_long (argc, argv, "+Vhvt:H:p:", long_options, &option_index);
#else
c = getopt (argc, argv, "+Vhvt:H:p:");
#endif
-
if (c == -1 || c == EOF)
break;
- i++;
- switch (c) {
- case 't':
- case 'H':
- case 'p':
- i++;
- }
-
switch (c) {
case '?': /* help */
usage ("");
case 'V': /* version */
- print_revision (my_basename (argv[0]), "$Revision$");
+ print_revision (progname, REVISION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
socket_timeout = atoi (optarg);
break;
case 'H': /* host */
+ if (is_host (optarg) == FALSE)
+ usage ("Invalid hostname/address\n");
server_name = optarg;
break;
case 'p': /* port */
}
}
- return i;
+
+ c = optind;
+ if (server_name == NULL && c < argc) {
+ if (is_host (argv[c])) {
+ server_name = argv[c++];
+ }
+ }
+
+ if (port == -1 && c < argc) {
+ if (is_intpos (argv[c])) {
+ port = atoi (argv[c++]);
+ }
+ else {
+ print_usage ();
+ exit (STATE_UNKNOWN);
+ }
+ }
+
+ return validate_arguments ();
}
int
}
-/************************************************************************
-*
-* Resolve hostname into IP address
-*
-*-----------------------------------------------------------------------*/
-
-char *
-ssh_resolve (char *hostname)
-{
- struct hostent *host;
-
- host = gethostbyname (hostname);
- if (!host) {
- herror (hostname);
- exit (STATE_CRITICAL);
- }
- return (host->h_addr);
-}
-
-
/************************************************************************
*
* Try to connect to SSH server at specified server and port
int
ssh_connect (char *haddr, short hport)
{
- int s;
- struct sockaddr_in addr;
- int addrlen;
- int len;
+ int sd;
+ int result;
char *output = NULL;
char *buffer = NULL;
char *ssh_proto = NULL;
sscanf ("$Revision$", "$Revision: %[0123456789.]", revision);
- addrlen = sizeof (addr);
- memset (&addr, 0, addrlen);
- addr.sin_port = htons (hport);
- addr.sin_family = AF_INET;
- bcopy (haddr, (void *) &addr.sin_addr.s_addr, 4);
-
- s = socket (AF_INET, SOCK_STREAM, 0);
- if (!s) {
- printf ("socket(): %s for %s:%d\n", strerror (errno), server_name, hport);
- exit (STATE_CRITICAL);
- }
+ result = my_tcp_connect (haddr, hport, &sd);
- if (connect (s, (struct sockaddr *) &addr, addrlen)) {
- printf ("connect(): %s for %s:%d\n", strerror (errno), server_name,
- hport);
- exit (STATE_CRITICAL);
- }
+ if (result != STATE_OK)
+ return result;
output = (char *) malloc (BUFF_SZ + 1);
memset (output, 0, BUFF_SZ + 1);
- recv (s, output, BUFF_SZ, 0);
+ recv (sd, output, BUFF_SZ, 0);
if (strncmp (output, "SSH", 3)) {
printf ("Server answer: %s", output);
exit (STATE_CRITICAL);
if (verbose)
printf ("%s\n", output);
ssh_proto = output + 4;
- ssh_server = ssh_proto + strspn (ssh_proto, "0123456789-. ");
- ssh_proto[strspn (ssh_proto, "0123456789-. ")] = 0;
+ ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789. ");
+ ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
printf
- ("SSH ok - protocol version %s - server version %s\n",
- ssh_proto, ssh_server);
- buffer =
- ssprintf (buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, revision);
- send (s, buffer, strlen (buffer), MSG_DONTWAIT);
+ ("SSH OK - %s (protocol %s)\n",
+ ssh_server, ssh_proto);
+ asprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, revision);
+ send (sd, buffer, strlen (buffer), MSG_DONTWAIT);
if (verbose)
printf ("%s\n", buffer);
exit (STATE_OK);
void
print_help (void)
{
- print_revision (PROGNAME, "$Revision$");
+ print_revision (progname, REVISION);
printf ("Copyright (c) 1999 Remi Paulmier (remi@sinfomic.fr)\n\n");
print_usage ();
printf ("by default, port is %d\n", SSH_DFL_PORT);
("Usage:\n"
" %s -t [timeout] -p [port] <host>\n"
" %s -V prints version info\n"
- " %s -h prints more detailed help\n", PROGNAME, PROGNAME, PROGNAME);
+ " %s -h prints more detailed help\n", progname, progname, progname);
}
/* end of check_ssh.c */