X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_nt.c;h=c877f9cc6d4857b019c8b2590677aa7205524163;hb=25d1ee331dbe4977a4a1a756c67f32bd51d9b070;hp=1c9dc0adac0c1d29fce17a1c26093cca5f75c190;hpb=d714b3811dae812838c01b9b0bb1d766a62dcc2f;p=nagiosplug.git

diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 1c9dc0a..c877f9c 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -1,52 +1,63 @@
-/******************************************************************************
- *
- * CHECK_NT.C
- *
- * Program: Windows NT plugin for NetSaint
- * License: GPL
- * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
- *
- * Description:
- * 
- * This requires NSClient software to run on NT (http://nsclient.ready2run.nl/)
- *
- * License Information:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *****************************************************************************/
-
-//#include "stdlib.h"
-#include "config.h"
+/*****************************************************************************
+* 
+* Nagios check_nt plugin
+* 
+* License: GPL
+* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
+* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* 
+* Description:
+* 
+* This file contains the check_nt plugin
+* 
+* This plugin collects data from the NSClient service running on a
+* Windows NT/2000/XP/2003 server.
+* This plugin requires NSClient software to run on NT
+* (http://nsclient.ready2run.nl/)
+* 
+* 
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
+* 
+*****************************************************************************/
+
+const char *progname = "check_nt";
+const char *copyright = "2000-2007";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 
-#define CHECK_NONE	0
-#define CHECK_CLIENTVERSION  	1
-#define CHECK_CPULOAD  	2
-#define CHECK_UPTIME	3
-#define CHECK_USEDDISKSPACE	4
-#define CHECK_SERVICESTATE	5
-#define CHECK_PROCSTATE	6
-#define CHECK_MEMUSE	7
-#define CHECK_COUNTER	8
-#define CHECK_FILEAGE	9
-#define MAX_VALUE_LIST 30
-
-#define PORT	1248	
+enum checkvars {
+	CHECK_NONE,
+	CHECK_CLIENTVERSION,
+	CHECK_CPULOAD,
+	CHECK_UPTIME,
+	CHECK_USEDDISKSPACE,
+	CHECK_SERVICESTATE,
+	CHECK_PROCSTATE,
+	CHECK_MEMUSE,
+	CHECK_COUNTER,
+	CHECK_FILEAGE,
+	CHECK_INSTANCES
+};
+
+enum {
+	MAX_VALUE_LIST = 30,
+	PORT = 1248
+};
 
 char *server_address=NULL;
 char *volume_name=NULL;
@@ -56,51 +67,63 @@ char *req_password=NULL;
 unsigned long lvalue_list[MAX_VALUE_LIST];
 unsigned long warning_value=0L;
 unsigned long critical_value=0L;
-int check_value_list=FALSE;
 int check_warning_value=FALSE;
 int check_critical_value=FALSE;
-int vars_to_check=CHECK_NONE;
+enum checkvars vars_to_check = CHECK_NONE;
 int show_all=FALSE;
 
-const char *progname = "check_nt";
+char recv_buffer[MAX_INPUT_BUFFER];
 
+void fetch_data (const char* address, int port, const char* sendb);
 int process_arguments(int, char **);
-void print_usage(void);
-void print_help(void);
 void preparelist(char *string);
+int strtoularray(unsigned long *array, char *string, const char *delim);
+void print_help(void);
+void print_usage(void);
 
 int main(int argc, char **argv){
-	int result;
-	int return_code;
+
+/* should be 	int result = STATE_UNKNOWN; */
+
+	int return_code = STATE_UNKNOWN;
 	char *send_buffer=NULL;
-	char recv_buffer[MAX_INPUT_BUFFER];
 	char *output_message=NULL;
-	char *temp_buffer=NULL;
+	char *perfdata=NULL;
 	char *temp_string=NULL;
-	char *sep_string=NULL;
-	char *description=NULL;
+	char *temp_string_perf=NULL;
+	char *description=NULL,*counter_unit = NULL;
+	char *minval = NULL, *maxval = NULL, *errcvt = NULL;
+	char *fds=NULL, *tds=NULL;
 
 	double total_disk_space=0;
 	double free_disk_space=0;
 	double percent_used_space=0;
+	double warning_used_space=0;
+	double critical_used_space=0;
 	double mem_commitLimit=0;
 	double mem_commitByte=0;
-	unsigned long current_connections=0;
+	double fminval = 0, fmaxval = 0;
 	unsigned long utilization;
 	unsigned long uptime;
-	unsigned long cache_hits;
-	unsigned long cache_buffers;
-	unsigned long lru_time;
 	unsigned long age_in_minutes;
-	double counter_value;
+	double counter_value = 0.0;
 	int offset=0;
 	int updays=0;
 	int uphours=0;
 	int upminutes=0;
-	asprintf(&req_password,"None");
 
-	if(process_arguments(argc,argv)==ERROR)
-		usage("Could not parse arguments\n");
+	int isPercent = FALSE;
+	int allRight = FALSE;
+
+	setlocale (LC_ALL, "");
+	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);
@@ -108,354 +131,407 @@ int main(int argc, char **argv){
 	/* set socket timeout */
 	alarm(socket_timeout);
 
-	if (vars_to_check==CHECK_CLIENTVERSION) {
-			
-		asprintf(&send_buffer,strcat(req_password,"&1"));
-		result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-		if(result!=STATE_OK)
-			return result;
-		asprintf(&output_message,recv_buffer);
-		return_code=STATE_OK;
-	}
-	else if(vars_to_check==CHECK_CPULOAD){
-
-		if (check_value_list==TRUE) {																			
-			if (strtolarray(&lvalue_list,value_list,",")==TRUE) {
-				// -l parameters is present with only integers
-				return_code=STATE_OK;
-				asprintf(&temp_string,"CPU Load");
-				while (lvalue_list[0+offset]>0 && lvalue_list[0+offset]<=17280 && 
-							lvalue_list[1+offset]>=0 && lvalue_list[1+offset]<=100 && 
-							lvalue_list[2+offset]>=0 && lvalue_list[2+offset]<=100) {
-					// loop until one of the parameters is wrong or not present
-
-					// Send request and retrieve data
-					asprintf(&send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]);
-					result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-					if(result!=STATE_OK)
-						return result;
-
-					if (!strncmp(recv_buffer,"ERROR",5)) {
-						printf("NSClient - %s\n",recv_buffer);
-						exit(STATE_UNKNOWN);
-					}
+	switch (vars_to_check) {
 
-					utilization=strtoul(recv_buffer,NULL,10);
-
-					// Check if any of the request is in a warning or critical state
-					if(utilization >= lvalue_list[2+offset])
-						return_code=STATE_CRITICAL;
-					else if(utilization >= lvalue_list[1+offset] && return_code<STATE_WARNING)
-						return_code=STATE_WARNING;
-
-					asprintf(&output_message," %lu%% (%lu min average)", utilization, lvalue_list[0+offset]);
-					asprintf(&temp_string,"%s%s",temp_string,output_message);
-					offset+=3;	//move across the array 
-				}		
-				if (strlen(temp_string)>10) {
-					// we had at least on loop
-					asprintf(&output_message,"%s",temp_string);
-				}	
-				else
-					asprintf(&output_message,"%s","not enough values for -l parameters");
-					
-			} else 
-				asprintf(&output_message,"wrong -l parameter.");
+	case CHECK_CLIENTVERSION:
 
-		} else
-			asprintf(&output_message,"missing -l parameters");
-	}
+		asprintf(&send_buffer, "%s&1", req_password);
+		fetch_data (server_address, server_port, send_buffer);
+		if (value_list != NULL && strcmp(recv_buffer, value_list) != 0) {
+			asprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
+			return_code = STATE_WARNING;
+		} else {
+			asprintf (&output_message, "%s", recv_buffer);
+			return_code = STATE_OK;
+		}
+		break;
 
-	else if(vars_to_check==CHECK_UPTIME){
+	case CHECK_CPULOAD:
 
-		asprintf(&send_buffer,strcat(req_password,"&3"));
-		result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-		if(result!=STATE_OK)
-			return result;
+		if (value_list==NULL)
+			output_message = strdup (_("missing -l parameters"));
+		else if (strtoularray(lvalue_list,value_list,",")==FALSE)
+			output_message = strdup (_("wrong -l parameter."));
+		else {
+			/* -l parameters is present with only integers */
+			return_code=STATE_OK;
+			temp_string = strdup (_("CPU Load"));
+			temp_string_perf = strdup (" ");
+
+			/* loop until one of the parameters is wrong or not present */
+			while (lvalue_list[0+offset]> (unsigned long)0 &&
+						 lvalue_list[0+offset]<=(unsigned long)17280 &&
+						 lvalue_list[1+offset]> (unsigned long)0 &&
+						 lvalue_list[1+offset]<=(unsigned long)100 &&
+						 lvalue_list[2+offset]> (unsigned long)0 &&
+						 lvalue_list[2+offset]<=(unsigned long)100) {
+
+				/* Send request and retrieve data */
+				asprintf(&send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]);
+				fetch_data (server_address, server_port, send_buffer);
+
+				utilization=strtoul(recv_buffer,NULL,10);
+
+				/* Check if any of the request is in a warning or critical state */
+				if(utilization >= lvalue_list[2+offset])
+					return_code=STATE_CRITICAL;
+				else if(utilization >= lvalue_list[1+offset] && return_code<STATE_WARNING)
+					return_code=STATE_WARNING;
+
+				asprintf(&output_message,_(" %lu%% (%lu min average)"), utilization, lvalue_list[0+offset]);
+				asprintf(&temp_string,"%s%s",temp_string,output_message);
+				asprintf(&perfdata,_(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0+offset], utilization,
+				  lvalue_list[1+offset], lvalue_list[2+offset]);
+				asprintf(&temp_string_perf,"%s%s",temp_string_perf,perfdata);
+				offset+=3;	/* move across the array */
+			}
 
-		if (!strncmp(recv_buffer,"ERROR",5)) {
-			printf("NSClient - %s\n",recv_buffer);
-			exit(STATE_UNKNOWN);
+			if (strlen(temp_string)>10) {  /* we had at least one loop */
+				output_message = strdup (temp_string);
+				perfdata = temp_string_perf;
+			} else
+				output_message = strdup (_("not enough values for -l parameters"));
 		}
+		break;
 
+	case CHECK_UPTIME:
+
+		asprintf(&send_buffer, "%s&3", req_password);
+		fetch_data (server_address, server_port, send_buffer);
 		uptime=strtoul(recv_buffer,NULL,10);
-		updays = uptime / 86400; 			
+		updays = uptime / 86400;
 		uphours = (uptime % 86400) / 3600;
 		upminutes = ((uptime % 86400) % 3600) / 60;
-		asprintf(&output_message,"System Uptime : %u day(s) %u hour(s) %u minute(s)",updays,uphours, upminutes);
+		asprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes);
 		return_code=STATE_OK;
-	}
+		break;
 
-	else if(vars_to_check==CHECK_USEDDISKSPACE){
-
-		return_code=STATE_UNKNOWN;	
-		if (check_value_list==TRUE) {
-			if (strlen(value_list)==1) {
-				asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
-				result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-				if(result!=STATE_OK)
-					return result;
-		
-				if (!strncmp(recv_buffer,"ERROR",5)) {
-					printf("NSClient - %s\n",recv_buffer);
-					exit(STATE_UNKNOWN);
-				}
+	case CHECK_USEDDISKSPACE:
 
-				free_disk_space=atof(strtok(recv_buffer,"&"));
-				total_disk_space=atof(strtok(NULL,"&"));
+		if (value_list==NULL)
+			output_message = strdup (_("missing -l parameters"));
+		else if (strlen(value_list)!=1)
+			output_message = strdup (_("wrong -l argument"));
+		else {
+			asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
+			fetch_data (server_address, server_port, send_buffer);
+			fds=strtok(recv_buffer,"&");
+			tds=strtok(NULL,"&");
+			if(fds!=NULL)
+				free_disk_space=atof(fds);
+			if(tds!=NULL)
+				total_disk_space=atof(tds);
+
+			if (total_disk_space>0 && free_disk_space>=0) {
 				percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+				warning_used_space = ((float)warning_value / 100) * total_disk_space;
+				critical_used_space = ((float)critical_value / 100) * total_disk_space;
 
-				if (free_disk_space>=0) {
-					asprintf(&temp_string,"%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)",
-							value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824, percent_used_space,
-							 free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100); 
-
-
-					if(check_critical_value==TRUE && percent_used_space >= critical_value)
-						return_code=STATE_CRITICAL;
-					else if (check_warning_value==TRUE && percent_used_space >= warning_value)
-						return_code=STATE_WARNING;	
-					else
-						return_code=STATE_OK;	
+				asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
+				  value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
+				  percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
+				asprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
+				  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+				  critical_used_space / 1073741824, total_disk_space / 1073741824);
 
-					asprintf(&output_message,"%s",temp_string);
+				if(check_critical_value==TRUE && percent_used_space >= critical_value)
+					return_code=STATE_CRITICAL;
+				else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+					return_code=STATE_WARNING;
+				else
+					return_code=STATE_OK;
 
-				}
-				else {
-					asprintf(&output_message,"Free disk space : Invalid drive ");
-					return_code=STATE_UNKNOWN;
-				}		
+				output_message = strdup (temp_string);
+				perfdata = temp_string_perf;
+			} else {
+				output_message = strdup (_("Free disk space : Invalid drive"));
+				return_code=STATE_UNKNOWN;
 			}
-			else 
-				asprintf(&output_message,"wrong -l argument");
-		} else 
-			asprintf(&output_message,"missing -l parameters");
-			
-	}
+		}
+		break;
 
-	else if(vars_to_check==CHECK_SERVICESTATE || vars_to_check==CHECK_PROCSTATE){
+	case CHECK_SERVICESTATE:
+	case CHECK_PROCSTATE:
 
-		if (check_value_list==TRUE) {
-			preparelist(value_list);		// replace , between services with & to send the request
+		if (value_list==NULL)
+			output_message = strdup (_("No service/process specified"));
+		else {
+			preparelist(value_list);		/* replace , between services with & to send the request */
 			asprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
-				(show_all==TRUE)?"ShowAll":"ShowFail",value_list);
-			result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-			if(result!=STATE_OK)
-				return result;
-	
-			if (!strncmp(recv_buffer,"ERROR",5)) {
-				printf("NSClient - %s\n",recv_buffer);
-				exit(STATE_UNKNOWN);
-			}
+							 (show_all==TRUE) ? "ShowAll" : "ShowFail",value_list);
+			fetch_data (server_address, server_port, send_buffer);
 			return_code=atoi(strtok(recv_buffer,"&"));
 			temp_string=strtok(NULL,"&");
-			asprintf(&output_message, "%s",temp_string);
+			output_message = strdup (temp_string);
 		}
-		else 
-			asprintf(&output_message,"No service/process specified");
-	}
-
-	else if(vars_to_check==CHECK_MEMUSE) {
-		
-		asprintf(&send_buffer,"%s&7", req_password);
-		result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-		if (result!=STATE_OK)
-			return result;
+		break;
 
-		if (!strncmp(recv_buffer,"ERROR",5)) {
-			printf("NSClient - %s\n",recv_buffer);
-			exit(STATE_UNKNOWN);
-		}
+	case CHECK_MEMUSE:
 
+		asprintf(&send_buffer,"%s&7", req_password);
+		fetch_data (server_address, server_port, send_buffer);
 		mem_commitLimit=atof(strtok(recv_buffer,"&"));
 		mem_commitByte=atof(strtok(NULL,"&"));
 		percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
-		asprintf(&output_message,"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)", 
-			mem_commitLimit / 1048576, mem_commitByte / 1048567, percent_used_space,  
-			(mem_commitLimit - mem_commitByte) / 1048576, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
-	
+		warning_used_space = ((float)warning_value / 100) * mem_commitLimit;
+		critical_used_space = ((float)critical_value / 100) * mem_commitLimit;
+
+		/* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here,
+		which equals RAM + Pagefiles. */
+		asprintf(&output_message,_("Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"),
+		  mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space,
+		  (mem_commitLimit - mem_commitByte) / 1048567, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
+		asprintf(&perfdata,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567,
+		  warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567);
+
+		return_code=STATE_OK;
 		if(check_critical_value==TRUE && percent_used_space >= critical_value)
 			return_code=STATE_CRITICAL;
 		else if (check_warning_value==TRUE && percent_used_space >= warning_value)
-			return_code=STATE_WARNING;	
+			return_code=STATE_WARNING;
+
+		break;
+
+	case CHECK_COUNTER:
+
+
+		/*
+		CHECK_COUNTER has been modified to provide extensive perfdata information.
+		In order to do this, some modifications have been done to the code
+		and some constraints have been introduced.
+
+		1) For the sake of simplicity of the code, perfdata information will only be
+		 provided when the "description" field is added.
+
+		2) If the counter you're going to measure is percent-based, the code will detect
+		 the percent sign in its name and will attribute minimum (0%) and maximum (100%)
+		 values automagically, as well the ¨%" sign to graph units.
+
+		3) OTOH, if the counter is "absolute", you'll have to provide the following
+		 the counter unit - that is, the dimensions of the counter you're getting. Examples:
+		 pages/s, packets transferred, etc.
+
+		4) If you want, you may provide the minimum and maximum values to expect. They aren't mandatory,
+		 but once specified they MUST have the same order of magnitude and units of -w and -c; otherwise.
+		 strange things will happen when you make graphs of your data.
+		*/
+
+		if (value_list == NULL)
+			output_message = strdup (_("No counter specified"));
 		else
-			return_code=STATE_OK;	
-		
-	}
+		{
+			preparelist (value_list);	/* replace , between services with & to send the request */
+			isPercent = (strchr (value_list, '%') != NULL);
+
+			strtok (value_list, "&");	/* burn the first parameters */
+			description = strtok (NULL, "&");
+			counter_unit = strtok (NULL, "&");
+			asprintf (&send_buffer, "%s&8&%s", req_password, value_list);
+			fetch_data (server_address, server_port, send_buffer);
+			counter_value = atof (recv_buffer);
+
+			if (description == NULL)
+			asprintf (&output_message, "%.f", counter_value);
+			else if (isPercent)
+			{
+				counter_unit = strdup ("%");
+				allRight = TRUE;
+			}
 
-	else if(vars_to_check==CHECK_COUNTER) {
+			if ((counter_unit != NULL) && (!allRight))
+			{
+				minval = strtok (NULL, "&");
+				maxval = strtok (NULL, "&");
 
-		if (check_value_list==TRUE) {																			
-			preparelist(value_list);		// replace , between services with & to send the request
-			asprintf(&send_buffer,"%s&8&%s", req_password,value_list);
-			result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-			if (result!=STATE_OK)
-				return result;
-	
-			if (!strncmp(recv_buffer,"ERROR",5)) {
-				printf("NSClient - %s\n",recv_buffer);
-				exit(STATE_UNKNOWN);
+				/* All parameters specified. Let's check the numbers */
+
+				fminval = (minval != NULL) ? strtod (minval, &errcvt) : -1;
+				fmaxval = (minval != NULL) ? strtod (maxval, &errcvt) : -1;
+
+				if ((fminval == 0) && (minval == errcvt))
+					output_message = strdup (_("Minimum value contains non-numbers"));
+				else
+				{
+					if ((fmaxval == 0) && (maxval == errcvt))
+						output_message = strdup (_("Maximum value contains non-numbers"));
+					else
+						allRight = TRUE;	/* Everything is OK. */
+
+				}
 			}
+			else if ((counter_unit == NULL) && (description != NULL))
+				output_message = strdup (_("No unit counter specified"));
 
-			strtok(value_list,"&");			// burn the first parameters
-			description = strtok(NULL,"&");
-			counter_value = atof(recv_buffer);
-			if (description == NULL) 
-				asprintf(&output_message, "%.f", counter_value);
+			if (allRight)
+			{
+				/* Let's format the output string, finally... */
+					if (strstr(description, "%") == NULL) {
+						asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+					} else {
+						/* has formatting, will segv if wrong */
+						asprintf (&output_message, description, counter_value);
+					}
+					asprintf (&output_message, "%s |", output_message);
+					asprintf (&output_message,"%s %s", output_message,
+						fperfdata (description, counter_value,
+							counter_unit, 1, warning_value, 1, critical_value,
+							(!(isPercent) && (minval != NULL)), fminval,
+							(!(isPercent) && (minval != NULL)), fmaxval));
+			}
+		}
+
+		if (critical_value > warning_value)
+		{			/* Normal thresholds */
+			if (check_critical_value == TRUE && counter_value >= critical_value)
+				return_code = STATE_CRITICAL;
+			else if (check_warning_value == TRUE && counter_value >= warning_value)
+				return_code = STATE_WARNING;
 			else
-				asprintf(&output_message, description, counter_value);
-	
-			if (critical_value > warning_value) {
-				// Normal thresholds		
-				if(check_critical_value==TRUE && counter_value >= critical_value)
-					return_code=STATE_CRITICAL;
-				else if (check_warning_value==TRUE && counter_value >= warning_value)
-					return_code=STATE_WARNING;	
-				else
-					return_code=STATE_OK;	
-			} 
-			else {
-				// inverse thresholds		
-				if(check_critical_value==TRUE && counter_value <= critical_value)
-					return_code=STATE_CRITICAL;
-				else if (check_warning_value==TRUE && counter_value <= warning_value)
-					return_code=STATE_WARNING;	
-				else
-					return_code=STATE_OK;	
-			}	
-		
+				return_code = STATE_OK;
 		}
-		else {
-			asprintf(&output_message,"No counter specified");
-			result=STATE_UNKNOWN;
+		else
+		{			/* inverse thresholds */
+			return_code = STATE_OK;
+			if (check_critical_value == TRUE && counter_value <= critical_value)
+				return_code = STATE_CRITICAL;
+			else if (check_warning_value == TRUE && counter_value <= warning_value)
+				return_code = STATE_WARNING;
 		}
-	}
-	else if(vars_to_check==CHECK_FILEAGE) {
+	break;
 
-		if (check_value_list==TRUE) {																			
-			preparelist(value_list);		// replace , between services with & to send the request
-			asprintf(&send_buffer,"%s&9&%s", req_password,value_list);
-			result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
-			if (result!=STATE_OK)
-				return result;
-	
-			if (!strncmp(recv_buffer,"ERROR",5)) {
-				printf("NSClient - %s\n",recv_buffer);
-				exit(STATE_UNKNOWN);
-			}
+	case CHECK_FILEAGE:
 
+		if (value_list==NULL)
+			output_message = strdup (_("No counter specified"));
+		else {
+			preparelist(value_list);		/* replace , between services with & to send the request */
+			asprintf(&send_buffer,"%s&9&%s", req_password,value_list);
+			fetch_data (server_address, server_port, send_buffer);
 			age_in_minutes = atoi(strtok(recv_buffer,"&"));
 			description = strtok(NULL,"&");
-			asprintf(&output_message, description);
-	
-			if (critical_value > warning_value) {
-				// Normal thresholds		
+			output_message = strdup (description);
+
+			if (critical_value > warning_value) {        /* Normal thresholds */
 				if(check_critical_value==TRUE && age_in_minutes >= critical_value)
 					return_code=STATE_CRITICAL;
 				else if (check_warning_value==TRUE && age_in_minutes >= warning_value)
-					return_code=STATE_WARNING;	
+					return_code=STATE_WARNING;
 				else
-					return_code=STATE_OK;	
-			} 
-			else {
-				// inverse thresholds		
+					return_code=STATE_OK;
+			}
+			else {                                       /* inverse thresholds */
 				if(check_critical_value==TRUE && age_in_minutes <= critical_value)
 					return_code=STATE_CRITICAL;
 				else if (check_warning_value==TRUE && age_in_minutes <= warning_value)
-					return_code=STATE_WARNING;	
+					return_code=STATE_WARNING;
 				else
-					return_code=STATE_OK;	
-			}	
-		
+					return_code=STATE_OK;
+			}
 		}
+		break;
+
+	case CHECK_INSTANCES:
+		if (value_list==NULL)
+			output_message = strdup (_("No counter specified"));
 		else {
-			asprintf(&output_message,"No file specified");
-			result=STATE_UNKNOWN;
+			asprintf(&send_buffer,"%s&10&%s", req_password,value_list);
+			fetch_data (server_address, server_port, send_buffer);
+			if (!strncmp(recv_buffer,"ERROR",5)) {
+				printf("NSClient - %s\n",recv_buffer);
+				exit(STATE_UNKNOWN);
+			}
+			asprintf(&output_message,"%s",recv_buffer);
+			return_code=STATE_OK;
 		}
+		break;
+
+	case CHECK_NONE:
+	default:
+		usage4 (_("Please specify a variable to check"));
+		break;
+
 	}
 
 	/* reset timeout */
 	alarm(0);
 
-	printf("%s\n",output_message);
-
+	if (perfdata==NULL)
+		printf("%s\n",output_message);
+	else
+		printf("%s | %s\n",output_message,perfdata);
 	return return_code;
 }
 
 
+
 /* process command-line arguments */
 int process_arguments(int argc, char **argv){
 	int c;
 
-#ifdef HAVE_GETOPT_H
-	int option_index = 0;
-	static struct option long_options[] =
-	{ 
+	int option = 0;
+	static struct option longopts[] =
+	{
 		{"port",     required_argument,0,'p'},
 		{"timeout",  required_argument,0,'t'},
 		{"critical", required_argument,0,'c'},
 		{"warning",  required_argument,0,'w'},
 		{"variable", required_argument,0,'v'},
 		{"hostname", required_argument,0,'H'},
+		{"params",   required_argument,0,'l'},
+		{"secret",   required_argument,0,'s'},
+		{"display",  required_argument,0,'d'},
+		{"unknown-timeout", no_argument, 0, 'u'},
 		{"version",  no_argument,      0,'V'},
 		{"help",     no_argument,      0,'h'},
 		{0,0,0,0}
 	};
-#endif
 
 	/* no options were supplied */
 	if(argc<2) return ERROR;
 
 	/* backwards compatibility */
 	if (! is_option(argv[1])) {
-		server_address=argv[1];
+		server_address = strdup(argv[1]);
 		argv[1]=argv[0];
 		argv=&argv[1];
 		argc--;
 	}
 
-  for (c=1;c<argc;c++) {
-    if(strcmp("-to",argv[c])==0)
-      strcpy(argv[c],"-t");
-    else if (strcmp("-wv",argv[c])==0)
-      strcpy(argv[c],"-w");
-    else if (strcmp("-cv",argv[c])==0)
-      strcpy(argv[c],"-c");
+	for (c=1;c<argc;c++) {
+		if(strcmp("-to",argv[c])==0)
+			strcpy(argv[c],"-t");
+		else if (strcmp("-wv",argv[c])==0)
+			strcpy(argv[c],"-w");
+		else if (strcmp("-cv",argv[c])==0)
+			strcpy(argv[c],"-c");
 	}
 
-	while (1){
-#ifdef HAVE_GETOPT_H
-		c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:",long_options,&option_index);
-#else
-		c = getopt(argc,argv,"+hVH:t:c:w:p:v:l:s:d:");
-#endif
+	while (1) {
+		c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:u",longopts,&option);
 
 		if (c==-1||c==EOF||c==1)
 			break;
 
-		switch (c)
-			{
+		switch (c) {
 			case '?': /* print short usage statement if args not parsable */
-				printf("%s: Unknown argument: %s\n\n",progname,optarg);
-				print_usage();
-				exit(STATE_UNKNOWN);
+			usage5 ();
 			case 'h': /* help */
 				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;
+				server_address = optarg;
 				break;
 			case 's': /* password */
-				asprintf(&req_password,optarg);
+				req_password = optarg;
 				break;
 			case 'p': /* port */
 				if (is_intnonneg(optarg))
 					server_port=atoi(optarg);
 				else
-					terminate(STATE_UNKNOWN,"Server port an integer (seconds)\nType '%s -h' for additional help\n",progname);
+					die(STATE_UNKNOWN,_("Server port must be an integer\n"));
 				break;
 			case 'v':
 				if(strlen(optarg)<4)
@@ -478,12 +554,13 @@ int process_arguments(int argc, char **argv){
 					vars_to_check=CHECK_COUNTER;
 				else if(!strcmp(optarg,"FILEAGE"))
 					vars_to_check=CHECK_FILEAGE;
+				else if(!strcmp(optarg,"INSTANCES"))
+					vars_to_check=CHECK_INSTANCES;
 				else
 					return ERROR;
 				break;
 			case 'l': /* value list */
-				asprintf(&value_list,"%s",optarg);
-				check_value_list=TRUE;
+				value_list = optarg;
 				break;
 			case 'w': /* warning threshold */
 				warning_value=strtoul(optarg,NULL,10);
@@ -497,6 +574,9 @@ int process_arguments(int argc, char **argv){
 				if (!strcmp(optarg,"SHOWALL"))
 					show_all = TRUE;
 				break;
+			case 'u':
+				socket_timeout_state=STATE_UNKNOWN;
+				break;
 			case 't': /* timeout */
 				socket_timeout=atoi(optarg);
 				if(socket_timeout<=0)
@@ -504,95 +584,183 @@ int process_arguments(int argc, char **argv){
 			}
 
 	}
+	if (server_address == NULL)
+		usage4 (_("You must provide a server address or host name"));
 
 	if (vars_to_check==CHECK_NONE)
 		return ERROR;
 
+	if (req_password == NULL)
+		req_password = strdup (_("None"));
+
 	return OK;
 }
 
 
-void print_usage(void)
-{
-	printf("Usage: %s -H host -v variable [-p port] [-w warning] [-c critical] [-l params] [-d SHOWALL] [-t timeout]\n",progname);
-}
 
+void fetch_data (const char *address, int port, const char *sendb) {
+	int result;
 
-void print_help(void)
-{
-	print_revision(progname,"$Revision$");
-	printf
-		("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n\n"
-		 "This plugin attempts to contact the NSClient service running on a Windows NT/2000/XP server to\n"
-		 "gather the requested system information.\n\n");
-	print_usage();
-  printf
-		("\nOptions:\n"
-		 "-H, --hostname=HOST\n"
-		 "   Name of the host to check\n"
-		 "-p, --port=INTEGER\n"
-		 "   Optional port number (default: %d)\n"
-		 "-s <password>\n"
-		 "   Password needed for the request\n"
-		 "-v, --variable=STRING\n"
-		 "   Variable to check.  Valid variables are:\n"
-		 "      CLIENTVERSION = Get the NSClient version\n"
-		 "      CPULOAD = Average CPU load on last x minutes. Request a -l parameter with the following syntax:\n"
-		 "        -l <minutes range>,<warning threshold>,<critical threshold>. <minute range> should be less than 24*60.\n"
-		 "        Thresholds are percentage and up to 10 requests can be done in one shot. ie: -l 60,90,95,120,90,95\n"
-		 "      UPTIME = Get the uptime of the machine. No specific parameters. No warning or critical threshold\n"
-		 "      USEDDISKSPACE = Size and percentage of disk use. Request a -l parameter containing the drive letter only.\n"
-		 "                      Warning and critical thresholds can be specified with -w and -c.\n"
-		 "      MEMUSE = Memory use. Warning and critical thresholds can be specified with -w and -c.\n" 
-		 "      SERVICESTATE = Check the state of one or several services. Request a -l parameters with the following syntax:\n"
-		 "        -l <service1>,<service2>,<service3>,... You can specify -d SHOWALL in case you want to see working services\n"
-		 "        in the returned string.\n"
-		 "      PROCSTATE = Check if one or several process are running. Same syntax as SERVICESTATE.\n"
-		 "      COUNTER = Check any performance counter of Windows NT/2000. Request a -l parameters with the following syntax:\n"
-		 "        -l \"\\\\<performance object>\\\\counter\",\"<description>\"  The <description> parameter is optional and \n"
-		 "        is given to a printf output command which require a float parameters. Some examples:\n"
-		 "          \"Paging file usage is %%.2f %%%%\" or \"%%.f %%%% paging file used.\"\n"
-		 " -w, --warning=INTEGER\n"
-		 "   Threshold which will result in a warning status\n"
-		 " -c, --critical=INTEGER\n"
-		 "   Threshold which will result in a critical status\n"
-		 " -t, --timeout=INTEGER\n"
-		 "   Seconds before connection attempt times out (default: %d)\n"
-		 "-h, --help\n"
-		 "   Print this help screen\n"
-		 "-V, --version\n"
-		 "   Print version information\n\n"
-		 "Notes:\n"
-		 " - The NSClient service should be running on the server to get any information.\n"
-		 " - Critical thresholds should be lower than warning thresholds\n", PORT, DEFAULT_SOCKET_TIMEOUT);
+	result=process_tcp_request(address, port, sendb, recv_buffer,sizeof(recv_buffer));
+
+	if(result!=STATE_OK)
+		die (result, _("could not fetch information from server\n"));
+
+	if (!strncmp(recv_buffer,"ERROR",5))
+		die (STATE_UNKNOWN, "NSClient - %s\n",recv_buffer);
 }
 
-int strtolarray(unsigned long *array, char *string, char *delim) {
-	// split a <delim> delimited string into a long array
+int strtoularray(unsigned long *array, char *string, const char *delim) {
+	/* split a <delim> delimited string into a long array */
 	int idx=0;
 	char *t1;
 
 	for (idx=0;idx<MAX_VALUE_LIST;idx++)
-		array[idx]=-1;
-	
+		array[idx]=0;
+
 	idx=0;
 	for(t1 = strtok(string,delim);t1 != NULL; t1 = strtok(NULL, delim)) {
 		if (is_numeric(t1) && idx<MAX_VALUE_LIST) {
 			array[idx]=strtoul(t1,NULL,10);
 			idx++;
-		} else  
+		} else
 			return FALSE;
-	}		
+	}
 	return TRUE;
 }
 
 void preparelist(char *string) {
-	// Replace all , with & which is the delimiter for the request
+	/* Replace all , with & which is the delimiter for the request */
 	int i;
 
-	for (i = 0; i < strlen(string); i++)
+	for (i = 0; (size_t)i < strlen(string); i++)
 		if (string[i] == ',') {
 			string[i]='&';
 		}
 }
 
+
+
+void print_help(void)
+{
+	print_revision(progname, NP_VERSION);
+
+	printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
+	printf (COPYRIGHT, copyright, email);
+
+	printf ("%s\n", _("This plugin collects data from the NSClient service running on a"));
+	printf ("%s\n", _("Windows NT/2000/XP/2003 server."));
+
+	printf ("\n\n");
+
+	print_usage();
+
+	printf (UT_HELP_VRSN);
+	printf (UT_EXTRA_OPTS);
+
+	printf ("%s\n", _("Options:"));
+	printf (" %s\n", "-H, --hostname=HOST");
+	printf ("   %s\n", _("Name of the host to check"));
+	printf (" %s\n", "-p, --port=INTEGER");
+	printf ("   %s", _("Optional port number (default: "));
+	printf ("%d)\n", PORT);
+	printf (" %s\n", "-s, --secret=<password>");
+	printf ("   %s\n", _("Password needed for the request"));
+	printf (" %s\n", "-w, --warning=INTEGER");
+	printf ("   %s\n", _("Threshold which will result in a warning status"));
+	printf (" %s\n", "-c, --critical=INTEGER");
+	printf ("   %s\n", _("Threshold which will result in a critical status"));
+	printf (" %s\n", "-t, --timeout=INTEGER");
+	printf ("   %s", _("Seconds before connection attempt times out (default: "));
+	printf (" %s\n", "-l, --params=<parameters>");
+	printf ("   %s", _("Parameters passed to specified check (see below)"));
+	printf (" %s\n", "-d, --display={SHOWALL}");
+	printf ("   %s", _("Display options (currently only SHOWALL works)"));
+	printf (" %s\n", "-u, --unknown-timeout");
+	printf ("   %s", _("Return UNKNOWN on timeouts"));
+	printf ("%d)\n", DEFAULT_SOCKET_TIMEOUT);
+	printf (" %s\n", "-h, --help");
+	printf ("   %s\n", _("Print this help screen"));
+	printf (" %s\n", "-V, --version");
+	printf ("   %s\n", _("Print version information"));
+	printf (" %s\n", "-v, --variable=STRING");
+	printf ("   %s\n\n", _("Variable to check"));
+	printf ("%s\n", _("Valid variables are:"));
+	printf (" %s", "CLIENTVERSION =");
+	printf (" %s\n", _("Get the NSClient version"));
+	printf ("  %s\n", _("If -l <version> is specified, will return warning if versions differ."));
+	printf (" %s\n", "CPULOAD =");
+	printf ("  %s\n", _("Average CPU load on last x minutes."));
+	printf ("  %s\n", _("Request a -l parameter with the following syntax:"));
+	printf ("  %s\n", _("-l <minutes range>,<warning threshold>,<critical threshold>."));
+	printf ("  %s\n", _("<minute range> should be less than 24*60."));
+	printf ("  %s\n", _("Thresholds are percentage and up to 10 requests can be done in one shot."));
+	printf ("  %s\n", "ie: -l 60,90,95,120,90,95");
+	printf (" %s\n", "UPTIME =");
+	printf ("  %s\n", _("Get the uptime of the machine."));
+	printf ("  %s\n", _("No specific parameters. No warning or critical threshold"));
+	printf (" %s\n", "USEDDISKSPACE =");
+	printf ("  %s\n", _("Size and percentage of disk use."));
+	printf ("  %s\n", _("Request a -l parameter containing the drive letter only."));
+	printf ("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
+	printf (" %s\n", "MEMUSE =");
+	printf ("  %s\n", _("Memory use."));
+	printf ("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
+	printf (" %s\n", "SERVICESTATE =");
+	printf ("  %s\n", _("Check the state of one or several services."));
+	printf ("  %s\n", _("Request a -l parameters with the following syntax:"));
+	printf ("  %s\n", _("-l <service1>,<service2>,<service3>,..."));
+	printf ("  %s\n", _("You can specify -d SHOWALL in case you want to see working services"));
+	printf ("  %s\n", _("in the returned string."));
+	printf (" %s\n", "PROCSTATE =");
+	printf ("  %s\n", _("Check if one or several process are running."));
+	printf ("  %s\n", _("Same syntax as SERVICESTATE."));
+	printf (" %s\n", "COUNTER =");
+	printf ("  %s\n", _("Check any performance counter of Windows NT/2000."));
+	printf ("	%s\n", _("Request a -l parameters with the following syntax:"));
+	printf ("	%s\n", _("-l \"\\\\<performance object>\\\\counter\",\"<description>"));
+	printf ("	%s\n", _("The <description> parameter is optional and is given to a printf "));
+	printf ("  %s\n", _("output command which requires a float parameter."));
+	printf ("  %s\n", _("If <description> does not include \"%%\", it is used as a label."));
+	printf ("  %s\n", _("Some examples:"));
+	printf ("  %s\n", "\"Paging file usage is %%.2f %%%%\"");
+	printf ("  %s\n", "\"%%.f %%%% paging file used.\"");
+	printf (" %s\n", "INSTANCES =");
+	printf ("  %s\n", _("Check any performance counter object of Windows NT/2000."));
+	printf ("  %s\n", _("Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"));
+	printf ("  %s\n", _("<counter object> is a Windows Perfmon Counter object (eg. Process),"));
+	printf ("  %s\n", _("if it is two words, it should be enclosed in quotes"));
+	printf ("  %s\n", _("The returned results will be a comma-separated list of instances on "));
+	printf ("  %s\n", _(" the selected computer for that object."));
+	printf ("  %s\n", _("The purpose of this is to be run from command line to determine what instances"));
+	printf ("  %s\n", _(" are available for monitoring without having to log onto the Windows server"));
+	printf ("  %s\n", _("  to run Perfmon directly."));
+	printf ("  %s\n", _("It can also be used in scripts that automatically create Nagios service"));
+	printf ("  %s\n", _(" configuration files."));
+	printf ("  %s\n", _("Some examples:"));
+	printf ("  %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"));
+
+	printf ("%s\n", _("Notes:"));
+	printf (" %s\n", _("- The NSClient service should be running on the server to get any information"));
+	printf ("   %s\n", "(http://nsclient.ready2run.nl).");
+	printf (" %s\n", _("- Critical thresholds should be lower than warning thresholds"));
+	printf (" %s\n", _("- Default port 1248 is sometimes in use by other services. The error"));
+	printf ("   %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\"."));
+	printf ("   %s\n", _("One fix for this is to change the port to something else on check_nt "));
+	printf ("   %s\n", _("and on the client service it\'s connecting to."));
+#ifdef NP_EXTRA_OPTS
+	printf (" -%s", UT_EXTRA_OPTS_NOTES);
+#endif
+
+	printf (UT_SUPPORT);
+}
+
+
+
+void print_usage(void)
+{
+	printf (_("Usage:"));
+	printf ("%s -H host -v variable [-p port] [-w warning] [-c critical]\n",progname);
+	printf ("[-l params] [-d SHOWALL] [-u] [-t timeout]\n");
+}
+