Code

print_help and print_usage() cleanup
[nagiosplug.git] / plugins / check_nt.c
index 85c67531faabee25d9ea1e9edfb5b35a141410d6..4826d68722dda72c89ebea4d1f0ecfb7a8659450 100644 (file)
@@ -2,7 +2,7 @@
  *
  * CHECK_NT.C
  *
- * Program: Windows NT plugin for NetSaint
+ * Program: Windows NT plugin for Nagios
  * License: GPL
  * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
  *
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ * $Id$
+ *
  *****************************************************************************/
 
-#include "config.h"
+const char *progname = "check_nt";
+const char *revision = "$Revision$";
+const char *copyright = "2003-2004";
+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
+};
+
+enum {
+       MAX_VALUE_LIST = 30,
+       PORT = 1248
+};
 
 char *server_address=NULL;
 char *volume_name=NULL;
@@ -55,33 +65,41 @@ 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;
+
+/* 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 *perfdata=NULL;
        char *temp_string=NULL;
-       char *description=NULL;
+       char *temp_string_perf=NULL;
+       char *description=NULL,*counter_unit = NULL;
+       char *minval = NULL, *maxval = NULL, *errcvt = 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;
+       double fminval = 0, fmaxval = 0;
        unsigned long utilization;
        unsigned long uptime;
        unsigned long age_in_minutes;
@@ -91,10 +109,15 @@ int main(int argc, char **argv){
        int uphours=0;
        int upminutes=0;
 
-       asprintf(&req_password,"None");
+       int isPercent = FALSE;
+       int allRight = FALSE;
+
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
 
-       if(process_arguments(argc,argv)==ERROR)
-               usage("Could not parse arguments\n");
+       if(process_arguments(argc,argv) != TRUE)
+               usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
        signal(SIGALRM,socket_timeout_alarm_handler);
@@ -102,253 +125,279 @@ 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;
-
-       }
+       switch (vars_to_check) {
 
-       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]>(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) {
-                                       /* 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);
-                                       }
-
-                                       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.");
-
-               } else
-                       asprintf(&output_message,"missing -l parameters");
-       }
+       case CHECK_CLIENTVERSION:
 
-       else if(vars_to_check==CHECK_UPTIME){
-
-               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 (!strncmp(recv_buffer,"ERROR",5)) {
-                       printf("NSClient - %s\n",recv_buffer);
-                       exit(STATE_UNKNOWN);
+               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;
+
+       case CHECK_CPULOAD:
 
+               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 (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;                        
                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;
-       }
-
-       else if(vars_to_check==CHECK_USEDDISKSPACE){
+               break;
 
-               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,"&"));
-                               percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
-
-                               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(&output_message,"%s",temp_string);
+               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);
+                       free_disk_space=atof(strtok(recv_buffer,"&"));
+                       total_disk_space=atof(strtok(NULL,"&"));
+                       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);
+                               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);
+
+                               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) {
+               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");
-       }
+               break;
 
-       else if(vars_to_check==CHECK_MEMUSE) {
+       case 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;
-
-               if (!strncmp(recv_buffer,"ERROR",5)) {
-                       printf("NSClient - %s\n",recv_buffer);
-                       exit(STATE_UNKNOWN);
-               }
-
+               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;      
-               else
-                       return_code=STATE_OK;   
-               
-       }
 
-       else if(vars_to_check==CHECK_COUNTER) {
+               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
+               {
+                       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;
+                            }
+
+                       if ((counter_unit != NULL) && (!allRight))
+                       {       
+                               minval = strtok (NULL, "&");
+                               maxval = strtok (NULL, "&");
+
+                               /* 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. */
 
-               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);
-                       }
+                               }
+                       }
+                       else if ((counter_unit == NULL) && (description != NULL))
+                               output_message = strdup (_("No unit counter specified"));
+
+                       if (allRight)
+                       {
+                               /* Let's format the output string, finally... */
+
+                               asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+                               output_message = strcat (output_message, "|");
+                               output_message = strcat (output_message,
+                                                       fperfdata (description, counter_value, counter_unit,
+                                                                  1, warning_value, 1, critical_value,
+                                                                  (!(isPercent) && (minval != NULL)), fminval,
+                                                                  (!(isPercent) && (minval != NULL)), fmaxval));
+                       }
+               }
 
-                       strtok(value_list,"&");                 /* burn the first parameters */
-                       description = strtok(NULL,"&");
-                       counter_value = atof(recv_buffer);
-                       if (description == NULL) 
-                               asprintf(&output_message, "%.f", counter_value);
-                       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;   
-                       }       
-               
+               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 {
-                       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;
+               
+       case CHECK_FILEAGE:
 
-               if (check_value_list==TRUE) {                                                                                                                                                   
+               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);
-                       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);
-                       }
-
+                       fetch_data (server_address, server_port, send_buffer);
                        age_in_minutes = atoi(strtok(recv_buffer,"&"));
                        description = strtok(NULL,"&");
-                       asprintf(&output_message, description);
+                       output_message = strdup (description);
        
-                       if (critical_value > warning_value) {
-                               /* Normal thresholds */
+                       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)
@@ -356,38 +405,42 @@ int main(int argc, char **argv){
                                else
                                        return_code=STATE_OK;   
                        } 
-                       else {
-                               /* inverse thresholds */
+                       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;      
                                else
                                        return_code=STATE_OK;   
-                       }       
-               
-               }
-               else {
-                       asprintf(&output_message,"No file specified");
-                       result=STATE_UNKNOWN;
+                       }
                }
+               break;
+
+       case CHECK_NONE:
+       default:
+               usage (_("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;
 
-       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'},
@@ -405,7 +458,7 @@ int process_arguments(int argc, char **argv){
 
        /* backwards compatibility */
        if (! is_option(argv[1])) {
-               server_address=argv[1];
+               server_address = strdup(argv[1]);
                argv[1]=argv[0];
                argv=&argv[1];
                argc--;
@@ -421,7 +474,7 @@ int process_arguments(int argc, char **argv){
        }
 
        while (1){
-               c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:",long_options,&option_index);
+               c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:",longopts,&option);
 
                if (c==-1||c==EOF||c==1)
                        break;
@@ -439,16 +492,17 @@ int process_arguments(int argc, char **argv){
                                print_revision(progname,"$Revision$");
                                exit(STATE_OK);
                        case 'H': /* hostname */
-                               server_address=optarg;
+                               if (server_address)     free(server_address);
+                               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
-                                       die(STATE_UNKNOWN,"Server port an integer (seconds)\nType '%s -h' for additional help\n",progname);
+                                       die(STATE_UNKNOWN,_("Server port an integer (seconds)\nType '%s -h' for additional help\n"),progname);
                                break;
                        case 'v':
                                if(strlen(optarg)<4)
@@ -475,8 +529,7 @@ int process_arguments(int argc, char **argv){
                                        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);
@@ -501,25 +554,70 @@ int process_arguments(int argc, char **argv){
        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;
+
+       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 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]=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  
+                       return FALSE;
+       }               
+       return TRUE;
+}
+
+void preparelist(char *string) {
+       /* Replace all , with & which is the delimiter for the request */
+       int i;
+
+       for (i = 0; (size_t)i < strlen(string); i++)
+               if (string[i] == ',') {
+                       string[i]='&';
+               }
+}
+
+
 
 void print_help(void)
 {
-       print_revision(progname,"$Revision$");
-       printf ("\
-Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n\n\
-This plugin collects data from the NSClient service running on a\n\
-Windows NT/2000/XP server.\n\n");
+       print_revision(progname,revision);
+       
+       printf (_("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n"));
+       printf (COPYRIGHT, copyright, email);
+       
+       printf (_("This plugin collects data from the NSClient service running on a\n\
+Windows NT/2000/XP/2003 server.\n\n"));
+
        print_usage();
-  printf ("\nOptions:\n\
+       
+  printf (_("\nOptions:\n\
 -H, --hostname=HOST\n\
   Name of the host to check\n\
 -p, --port=INTEGER\n\
@@ -535,40 +633,41 @@ Windows NT/2000/XP server.\n\n");
 -h, --help\n\
   Print this help screen\n\
 -V, --version\n\
-  Print version information\n",
-               PORT, DEFAULT_SOCKET_TIMEOUT);
-  printf ("\
+  Print version information\n"), PORT, DEFAULT_SOCKET_TIMEOUT);
+       
+  printf (_("\
 -v, --variable=STRING\n\
-  Variable to check.  Valid variables are:\n");
-  printf ("\
-   CLIENTVERSION = Get the NSClient version\n");
-  printf ("\
+  Variable to check.  Valid variables are:\n"));
+  printf (_("\
+   CLIENTVERSION = Get the NSClient version\n\
+     If -l <version> is specified, will return warning if versions differ.\n"));
+  printf (_("\
    CPULOAD = Average CPU load on last x minutes.\n\
      Request a -l parameter with the following syntax:\n\
      -l <minutes range>,<warning threshold>,<critical threshold>.\n\
      <minute range> should be less than 24*60.\n\
      Thresholds are percentage and up to 10 requests can be done in one shot.\n\
-     ie: -l 60,90,95,120,90,95\n");
-  printf ("\
+     ie: -l 60,90,95,120,90,95\n"));
+  printf (_("\
    UPTIME = Get the uptime of the machine.\n\
-     No specific parameters. No warning or critical threshold\n");
-  printf ("\
+     No specific parameters. No warning or critical threshold\n"));
+  printf (_("\
    USEDDISKSPACE = Size and percentage of disk use.\n\
      Request a -l parameter containing the drive letter only.\n\
-     Warning and critical thresholds can be specified with -w and -c.\n");
-  printf ("\
+     Warning and critical thresholds can be specified with -w and -c.\n"));
+  printf (_("\
    MEMUSE = Memory use.\n\
-     Warning and critical thresholds can be specified with -w and -c.\n");
-  printf ("\
+     Warning and critical thresholds can be specified with -w and -c.\n"));
+  printf (_("\
    SERVICESTATE = Check the state of one or several services.\n\
      Request a -l parameters with the following syntax:\n\
      -l <service1>,<service2>,<service3>,...\n\
      You can specify -d SHOWALL in case you want to see working services\n\
-                in the returned string.\n");
-  printf ("\
+                in the returned string.\n"));
+  printf (_("\
    PROCSTATE = Check if one or several process are running.\n\
-     Same syntax as SERVICESTATE.\n");
-  printf ("\
+     Same syntax as SERVICESTATE.\n"));
+  printf (_("\
    COUNTER = Check any performance counter of Windows NT/2000.\n\
      Request a -l parameters with the following syntax:\n\
                 -l \"\\\\<performance object>\\\\counter\",\"<description>\n\
@@ -576,39 +675,18 @@ Windows NT/2000/XP server.\n\n");
      is given to a printf output command which require a float parameters.\n\
      Some examples:\n\
        \"Paging file usage is %%.2f %%%%\"\n\
-       \"%%.f %%%% paging file used.\"\n");
-       printf ("Notes:\n\
+       \"%%.f %%%% paging file used.\"\n"));
+  printf (_("Notes:\n\
  - The NSClient service should be running on the server to get any information\n\
    (http://nsclient.ready2run.nl).\n\
- - Critical thresholds should be lower than warning thresholds\n");
+ - Critical thresholds should be lower than warning thresholds\n"));
 }
 
-int strtolarray(unsigned long *array, char *string, 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;
-       
-       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  
-                       return FALSE;
-       }               
-       return TRUE;
-}
 
-void preparelist(char *string) {
-       /* Replace all , with & which is the delimiter for the request */
-       int i;
 
-       for (i = 0; (size_t)i < strlen(string); i++)
-               if (string[i] == ',') {
-                       string[i]='&';
-               }
+void print_usage(void)
+{
+       printf("\
+Usage: %s -H host -v variable [-p port] [-w warning] [-c critical]\n\
+                  [-l params] [-d SHOWALL] [-t timeout]\n", progname);
 }
-