1041571: -D option processing corrected (Eric Chen). Changed process_arguments()...

[nagiosplug.git] / plugins / check_ping.c

diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 2d7e24d498bfa2400320d59a779076c65f8f2caa..9fe71831684923d1fffa1816ce0c56c60a61eee3 100644 (file)
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -14,11 +14,13 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ $Id$
+ 
 ******************************************************************************/
 
 const char *progname = "check_ping";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -60,8 +62,6 @@ char *warn_text;
 
 
 
-
-\f
 int
 main (int argc, char **argv)
 {
@@ -78,13 +78,12 @@ main (int argc, char **argv)
        addresses = malloc (sizeof(char*) * max_addr);
        addresses[0] = NULL;
 
-       if (process_arguments (argc, argv) == ERROR)
-               usage (_("Could not parse arguments"));
+       if (process_arguments (argc, argv) != TRUE)
+               usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm */
        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
-               printf (_("Cannot catch SIGALRM"));
-               return STATE_UNKNOWN;
+               usage4 (_("Cannot catch SIGALRM"));
        }
 
        /* handle timeouts gracefully */
@@ -121,7 +120,7 @@ main (int argc, char **argv)
                if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) {
                        printf ("%s\n", cmd);
                        die (STATE_UNKNOWN,
-                                  _("Error: Could not interpret output from ping command\n"));
+                                  _("CRITICAL - Could not interpret output from ping command\n"));
                }
 
                if (pl >= cpl || rta >= crta || rta < 0)
@@ -159,9 +158,6 @@ main (int argc, char **argv)
 
 
 
-
-
-\f
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -198,8 +194,9 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':       /* usage */
-                       usage3 (_("Unknown argument"), optopt);
-                       break;
+                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+                       print_usage ();
+                       exit (STATE_UNKNOWN);
                case 'h':       /* help */
                        print_help ();
                        exit (STATE_OK);
@@ -270,8 +267,7 @@ process_arguments (int argc, char **argv)
 
        if (addresses[0] == NULL) {
                if (is_host (argv[c]) == FALSE) {
-                       printf (_("Invalid host name/address: %s\n\n"), argv[c]);
-                       return ERROR;
+                       usage2 (_("Invalid hostname/address"), argv[c]);
                } else {
                        addresses[0] = argv[c++];
                        n_addresses++;
@@ -336,6 +332,8 @@ process_arguments (int argc, char **argv)
        return validate_arguments ();
 }
 
+
+
 int
 get_threshold (char *arg, float *trta, int *tpl)
 {
@@ -350,6 +348,8 @@ get_threshold (char *arg, float *trta, int *tpl)
        return STATE_UNKNOWN;
 }
 
+
+
 int
 validate_arguments ()
 {
@@ -390,7 +390,7 @@ validate_arguments ()
 
        for (i=0; i<n_addresses; i++) {
                if (is_host(addresses[i]) == FALSE)
-                       usage2 (_("Invalid host name/address"), addresses[i]);
+                       usage2 (_("Invalid hostname/address"), addresses[i]);
        }
 
        return OK;
@@ -398,9 +398,6 @@ validate_arguments ()
 
 
 
-
-
-\f
 int
 run_ping (const char *cmd, const char *addr)
 {
@@ -445,7 +442,7 @@ run_ping (const char *cmd, const char *addr)
 
        /* check stderr, setting at least WARNING if there is output here */
        while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr))
-               if (! strstr(buf,"Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP"))
+               if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP"))
                        result = max_state (STATE_WARNING, error_scan (buf, addr));
 
        (void) fclose (child_stderr);
@@ -463,24 +460,22 @@ run_ping (const char *cmd, const char *addr)
 
 
 
-
-
 int
 error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
 {
        if (strstr (buf, "Network is unreachable"))
-               die (STATE_CRITICAL, _("PING CRITICAL - Network unreachable (%s)"), addr);
+               die (STATE_CRITICAL, _("CRITICAL - Network unreachable (%s)"), addr);
        else if (strstr (buf, "Destination Host Unreachable"))
-               die (STATE_CRITICAL, _("PING CRITICAL - Host Unreachable (%s)"), addr);
+               die (STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)"), addr);
        else if (strstr (buf, "unknown host" ))
-               die (STATE_CRITICAL, _("PING CRITICAL - Host not found (%s)"), addr);
+               die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)"), addr);
 
        if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
                if (warn_text == NULL)
                        warn_text = strdup (_(WARN_DUPLICATES));
                else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&
                         asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
-                       die (STATE_UNKNOWN, _("unable to realloc warn_text"));
+                       die (STATE_UNKNOWN, _("Unable to realloc warn_text"));
                return (STATE_WARNING);
        }
 
@@ -489,25 +484,13 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
 
 
 
-
-
-\f
-void
-print_usage (void)
-{
-       printf (\
-"Usage: %s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
-  [-p packets] [-t timeout] [-L] [-4|-6]\n", progname);
-       printf (_(UT_HLP_VRS), progname, progname);
-}
-
 void
 print_help (void)
 {
        print_revision (progname, revision);
 
-       printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>"));
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>");
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("Use ping to check connection statistics for a remote host.\n\n"));
 
@@ -545,3 +528,10 @@ the contrib area of the downloads section at http://www.nagios.org\n\n"));
 
        printf (_(UT_SUPPORT));
 }
+
+void
+print_usage (void)
+{
+       printf ("Usage: %s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n\
+                     [-p packets] [-t timeout] [-L] [-4|-6]\n", progname);
+}