Many fixes to snapshot scripts

[nagiosplug.git] / plugins / check_ping.c

diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index ac43a0c459d25afa78622c64f1f38760c0faf401..8c4c0e64f4f2584b9ddf3ecfa34d3bf375537918 100644 (file)
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ping 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_ping";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -92,6 +88,9 @@ main (int argc, char **argv)
        addresses = malloc (sizeof(char*) * max_addr);
        addresses[0] = NULL;
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -109,7 +108,7 @@ main (int argc, char **argv)
 #endif
 
        for (i = 0 ; i < n_addresses ; i++) {
-               
+
 #ifdef PING6_COMMAND
                if (address_family != AF_INET && is_inet6_addr(addresses[i]))
                        rawcmd = strdup(PING6_COMMAND);
@@ -147,8 +146,8 @@ main (int argc, char **argv)
                else if (pl >= wpl || rta >= wrta)
                        this_result = STATE_WARNING;
                else if (pl >= 0 && rta >= 0)
-                       this_result = max_state (STATE_OK, this_result);        
-       
+                       this_result = max_state (STATE_OK, this_result);
+
                if (n_addresses > 1 && this_result != STATE_UNKNOWN)
                        die (STATE_OK, "%s is alive\n", addresses[i]);
 
@@ -162,7 +161,16 @@ main (int argc, char **argv)
                                                        state_text (this_result), warn_text, pl, rta);
                if (display_html == TRUE)
                        printf ("</A>");
-               printf ("\n");
+
+               /* Print performance data */
+               printf("|%s", fperfdata ("rta", (double) rta, "ms",
+                                         wrta>0?TRUE:FALSE, wrta,
+                                         crta>0?TRUE:FALSE, crta,
+                                         TRUE, 0, FALSE, 0));
+               printf(" %s\n", perfdata ("pl", (long) pl, "%",
+                                         wpl>0?TRUE:FALSE, wpl,
+                                         cpl>0?TRUE:FALSE, cpl,
+                                         TRUE, 0, FALSE, 0));
 
                if (verbose >= 2)
                        printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
@@ -219,7 +227,7 @@ process_arguments (int argc, char **argv)
                        exit (STATE_OK);
                        break;
                case 'V':       /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                        break;
                case 't':       /* timeout period */
@@ -358,7 +366,7 @@ get_threshold (char *arg, float *trta, int *tpl)
                return OK;
        else if (strpbrk (arg, ",:") && strstr (arg, "%") && sscanf (arg, "%f%*[:,]%d%%", trta, tpl) == 2)
                return OK;
-       else if (strstr (arg, "%") && sscanf (arg, "%d%%", tpl) == 1) 
+       else if (strstr (arg, "%") && sscanf (arg, "%d%%", tpl) == 1)
                return OK;
 
        usage2 (_("%s: Warning threshold must be integer or percentage!\n\n"), arg);
@@ -543,7 +551,7 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
        printf (COPYRIGHT, copyright, email);
@@ -555,6 +563,7 @@ print_help (void)
        print_usage ();
 
        printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
 
        printf (_(UT_IPv46));
 
@@ -583,6 +592,12 @@ print_help (void)
   printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));
   printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));
 
+#ifdef NP_EXTRA_OPTS
+  printf ("\n");
+  printf ("%s\n", _("Notes:"));
+  printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
+
        printf (_(UT_SUPPORT));
 }