X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_nwstat.c;h=81c5575266811f644a06f0fda50dfc738de71362;hb=1a5a83bb82c35d888229fe9f815fbc663c0f4d3c;hp=3c8d5b9647b294e5f3329b047337015bd8211684;hpb=ed62784a0b68959fd13fe5bc53a5aef4f17fbffa;p=nagiosplug.git
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 3c8d5b9..81c5575 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -5,8 +5,6 @@
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_nwstat plugin
@@ -28,12 +26,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_nwstat";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
@@ -170,6 +166,9 @@ 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"));
@@ -200,7 +199,7 @@ main(int argc, char **argv) {
/* check CPU load */
if (vars_to_check==LOAD1 || vars_to_check==LOAD5 || vars_to_check==LOAD15) {
-
+
switch(vars_to_check) {
case LOAD1:
temp_buffer = strdup ("1");
@@ -246,7 +245,7 @@ main(int argc, char **argv) {
temp_buffer,
utilization,
warning_value,
- critical_value);
+ critical_value);
/* check number of user connections */
} else if (vars_to_check==CONNS) {
@@ -454,7 +453,7 @@ main(int argc, char **argv) {
critical_value);
}
-
+
/* check % free space on volume */
} else if (vars_to_check==VPF) {
@@ -565,11 +564,11 @@ main(int argc, char **argv) {
result=STATE_WARNING;
asprintf (&output_message,_("Warning - NRM Status is suspect!"));
}
-
+
asprintf (&output_message,_("OK - NRM Status is good!"));
}
-
+
/* check packet receive buffers */
} else if (vars_to_check==UPRB || vars_to_check==PUPRB) {
@@ -824,7 +823,7 @@ main(int argc, char **argv) {
open_files,
warning_value,
critical_value);
-
+
/* check # of abended threads (Netware > 5.x only) */
} else if (vars_to_check==ABENDS) {
@@ -911,7 +910,7 @@ main(int argc, char **argv) {
-
+
/* check LRU sitting time in secondss */
} else if (vars_to_check==LRUS) {
@@ -974,7 +973,7 @@ main(int argc, char **argv) {
total_cache_buffers,
warning_value,
critical_value);
-
+
} else if (vars_to_check==DSVER) {
close(sd);
@@ -1002,7 +1001,7 @@ main(int argc, char **argv) {
recv_buffer[sizeof(recv_buffer)-1]=0;
recv_buffer[strlen(recv_buffer)-1]=0;
-
+
asprintf (&output_message,_("Up %s"),recv_buffer);
} else if (vars_to_check==NLM) {
@@ -1021,7 +1020,7 @@ main(int argc, char **argv) {
} else {
result=STATE_CRITICAL;
asprintf (&output_message,_("Module %s is not loaded"),nlm_name);
-
+
}
} else if (vars_to_check==NRMP) {
@@ -1310,7 +1309,7 @@ int process_arguments(int argc, char **argv) {
int option = 0;
static struct option longopts[] =
- {
+ {
{"port", required_argument,0,'p'},
{"timeout", required_argument,0,'t'},
{"critical", required_argument,0,'c'},
@@ -1357,7 +1356,7 @@ int process_arguments(int argc, char **argv) {
print_help();
exit(STATE_OK);
case 'V': /* version */
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
case 'H': /* hostname */
server_address=optarg;
@@ -1495,7 +1494,7 @@ int process_arguments(int argc, char **argv) {
nrmm_name = strdup (optarg+4);
if (!strcmp(nrmm_name,""))
nrmm_name = strdup ("AVAILABLE_CACHE_MEMORY");
-
+
}
else if (strncmp(optarg,"NRMS",4)==0) {
@@ -1503,7 +1502,7 @@ int process_arguments(int argc, char **argv) {
nrms_name = strdup (optarg+4);
if (!strcmp(nrms_name,""))
nrms_name = strdup ("USED_SWAP_SPACE");
-
+
}
else if (strncmp(optarg,"NSS1",4)==0) {
@@ -1511,7 +1510,7 @@ int process_arguments(int argc, char **argv) {
nss1_name = strdup (optarg+4);
if (!strcmp(nss1_name,""))
nss1_name = strdup ("CURRENTBUFFERCACHESIZE");
-
+
}
else if (strncmp(optarg,"NSS2",4)==0) {
@@ -1519,7 +1518,7 @@ int process_arguments(int argc, char **argv) {
nss2_name = strdup (optarg+4);
if (!strcmp(nss2_name,""))
nss2_name = strdup ("CACHEHITS");
-
+
}
else if (strncmp(optarg,"NSS3",4)==0) {
@@ -1527,7 +1526,7 @@ int process_arguments(int argc, char **argv) {
nss3_name = strdup (optarg+4);
if (!strcmp(nss3_name,""))
nss3_name = strdup ("CACHEGITPERCENT");
-
+
}
else if (strncmp(optarg,"NSS4",4)==0) {
@@ -1535,7 +1534,7 @@ int process_arguments(int argc, char **argv) {
nss4_name = strdup (optarg+4);
if (!strcmp(nss4_name,""))
nss4_name = strdup ("CURRENTOPENCOUNT");
-
+
}
else if (strncmp(optarg,"NSS5",4)==0) {
@@ -1543,7 +1542,7 @@ int process_arguments(int argc, char **argv) {
nss5_name = strdup (optarg+4);
if (!strcmp(nss5_name,""))
nss5_name = strdup ("CACHEMISSES");
-
+
}
@@ -1552,7 +1551,7 @@ int process_arguments(int argc, char **argv) {
nss6_name = strdup (optarg+4);
if (!strcmp(nss6_name,""))
nss6_name = strdup ("PENDINGWORKSCOUNT");
-
+
}
@@ -1561,7 +1560,7 @@ int process_arguments(int argc, char **argv) {
nss7_name = strdup (optarg+4);
if (!strcmp(nss7_name,""))
nss7_name = strdup ("CACHESIZE");
-
+
}
@@ -1594,7 +1593,7 @@ void print_help(void)
char *myport;
asprintf (&myport, "%d", PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad \n");
printf (COPYRIGHT, copyright, email);
@@ -1606,9 +1605,10 @@ void 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 (" %s\n", "-v, --variable=STRING");
printf (" %s\n", _("Variable to check. Valid variables include:"));
@@ -1664,7 +1664,7 @@ void print_help(void)
printf (" %s\n", "-o, --osversion");
printf (" %s\n", _("Include server version string in results"));
- printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
printf ("\n");
printf ("%s\n", _("Notes:"));
@@ -1675,13 +1675,13 @@ void print_help(void)
printf (" %s\n", _(" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
printf (" %s\n", _(" TCB, LRUS and LRUM."));
- printf (_(UT_SUPPORT));
+ printf (UT_SUPPORT);
}
void print_usage(void)
{
- printf (_("Usage:"));
+ printf ("%s\n", _("Usage:"));
printf ("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n",progname);
}