[Nagiosplug-checkins] CVS: nagiosplug/plugins check_real.c,1.8,1.9

Karl DeBisschop kdebisschop at users.sourceforge.net
Thu Aug 7 16:21:08 CEST 2003


Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv30182

Modified Files:
	check_real.c 
Log Message:
markup for translation

Index: check_real.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_real.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** check_real.c	7 Aug 2003 11:51:12 -0000	1.8
--- check_real.c	7 Aug 2003 23:17:53 -0000	1.9
***************
*** 1,55 ****
! /*****************************************************************************
! *
! * CHECK_REAL.C
! *
! * Program: RealMedia plugin for Nagios
! * License: GPL
! * Copyright (c) 1999 Pedro Leite (leite at cic.ua.pt)
! *
! * Based on CHECK_HTTP.C
! * Copyright (c) 1999 Ethan Galstad (nagios at nagios.org)
! *
! * Last Modified: $Date$
! *
! * Command line: CHECK_REAL <host_address> [-e expect] [-u url] [-p port]
! *                          [-hn host_name] [-wt warn_time] [-ct crit_time]
! *                          [-to to_sec]
! *
! * Description:
! *
! * This plugin will attempt to open an RTSP connection with the host.
! * Successul connects return STATE_OK, refusals and timeouts return
! * STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,
! * but incorrect reponse messages from the host result in STATE_WARNING return
! * values.  If you are checking a virtual server that uses "host headers"you
! * must supply the FQDN (fully qualified domain name) as the [host_name]
! * argument.
! *
! * 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 "config.h"
  #include "common.h"
  #include "netutils.h"
  #include "utils.h"
  
! const char *progname = "check_real";
  
- #define PORT	554
  #define EXPECT	"RTSP/1."
  #define URL	""
--- 1,33 ----
! /******************************************************************************
! 
!  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.
! 
! ******************************************************************************/
! 
! const char *progname = "check_real";
! const char *revision = "$Revision$";
! const char *copyright = "2000-2003";
! const char *email = "nagiosplug-devel at lists.sourceforge.net";
  
  #include "common.h"
  #include "netutils.h"
  #include "utils.h"
  
! enum {
! 	PORT	= 554
! };
  
  #define EXPECT	"RTSP/1."
  #define URL	""
***************
*** 57,61 ****
  int process_arguments (int, char **);
  int validate_arguments (void);
- int check_disk (int usp, int free_disk);
  void print_help (void);
  void print_usage (void);
--- 35,38 ----
***************
*** 72,75 ****
--- 49,57 ----
  int verbose = FALSE;
  
+ 
+ 
+ 
+ 
+ 
  int
  main (int argc, char **argv)
***************
*** 81,85 ****
  
  	if (process_arguments (argc, argv) != OK)
! 		usage ("Invalid command arguments supplied\n");
  
  	/* initialize alarm signal handling */
--- 63,67 ----
  
  	if (process_arguments (argc, argv) != OK)
! 		usage (_("Invalid command arguments supplied\n"));
  
  	/* initialize alarm signal handling */
***************
*** 92,96 ****
  	/* try to connect to the host at the given port number */
  	if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
! 		die (STATE_CRITICAL, "Unable to connect to %s on port %d\n",
  							 server_address, server_port);
  
--- 74,78 ----
  	/* try to connect to the host at the given port number */
  	if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
! 		die (STATE_CRITICAL, _("Unable to connect to %s on port %d\n"),
  							 server_address, server_port);
  
***************
*** 114,125 ****
  	/* return a CRITICAL status if we couldn't read any data */
  	if (result == -1)
! 		die (STATE_CRITICAL, "No data received from %s\n", host_name);
  
  	/* make sure we find the response we are looking for */
  	if (!strstr (buffer, server_expect)) {
  		if (server_port == PORT)
! 			printf ("Invalid REAL response received from host\n");
  		else
! 			printf ("Invalid REAL response received from host on port %d\n",
  							server_port);
  	}
--- 96,107 ----
  	/* return a CRITICAL status if we couldn't read any data */
  	if (result == -1)
! 		die (STATE_CRITICAL, _("No data received from %s\n"), host_name);
  
  	/* make sure we find the response we are looking for */
  	if (!strstr (buffer, server_expect)) {
  		if (server_port == PORT)
! 			printf (_("Invalid REAL response received from host\n"));
  		else
! 			printf (_("Invalid REAL response received from host on port %d\n"),
  							server_port);
  	}
***************
*** 185,189 ****
  		/* return a CRITICAL status if we couldn't read any data */
  		if (result == -1) {
! 			printf ("No data received from host\n");
  			result = STATE_CRITICAL;
  		}
--- 167,171 ----
  		/* return a CRITICAL status if we couldn't read any data */
  		if (result == -1) {
! 			printf (_("No data received from host\n"));
  			result = STATE_CRITICAL;
  		}
***************
*** 192,198 ****
  			if (!strstr (buffer, server_expect)) {
  				if (server_port == PORT)
! 					printf ("Invalid REAL response received from host\n");
  				else
! 					printf ("Invalid REAL response received from host on port %d\n",
  									server_port);
  			}
--- 174,180 ----
  			if (!strstr (buffer, server_expect)) {
  				if (server_port == PORT)
! 					printf (_("Invalid REAL response received from host\n"));
  				else
! 					printf (_("Invalid REAL response received from host on port %d\n"),
  									server_port);
  			}
***************
*** 248,253 ****
  
  		/* Put some HTML in here to create a dynamic link */
! 		printf ("REAL %s - %d second response time\n",
! 						(result == STATE_OK) ? "ok" : "problem",
  						(int) (end_time - start_time));
  	}
--- 230,235 ----
  
  		/* Put some HTML in here to create a dynamic link */
! 		printf (_("REAL %s - %d second response time\n"),
! 						state_text (result),
  						(int) (end_time - start_time));
  	}
***************
*** 268,272 ****
  
  
! 
  /* process command-line arguments */
  int
--- 250,254 ----
  
  
! 
  /* process command-line arguments */
  int
***************
*** 317,321 ****
  			}
  			else {
! 				usage ("Invalid host name\n");
  			}
  			break;
--- 299,303 ----
  			}
  			else {
! 				usage (_("Invalid host name\n"));
  			}
  			break;
***************
*** 331,335 ****
  			}
  			else {
! 				usage ("Server port must be a positive integer\n");
  			}
  			break;
--- 313,317 ----
  			}
  			else {
! 				usage (_("Server port must be a positive integer\n"));
  			}
  			break;
***************
*** 340,344 ****
  			}
  			else {
! 				usage ("Warning time must be a nonnegative integer\n");
  			}
  			break;
--- 322,326 ----
  			}
  			else {
! 				usage (_("Warning time must be a nonnegative integer\n"));
  			}
  			break;
***************
*** 349,353 ****
  			}
  			else {
! 				usage ("Critical time must be a nonnegative integer\n");
  			}
  			break;
--- 331,335 ----
  			}
  			else {
! 				usage (_("Critical time must be a nonnegative integer\n"));
  			}
  			break;
***************
*** 360,364 ****
  			}
  			else {
! 				usage ("Time interval must be a nonnegative integer\n");
  			}
  			break;
--- 342,346 ----
  			}
  			else {
! 				usage (_("Time interval must be a nonnegative integer\n"));
  			}
  			break;
***************
*** 369,374 ****
  			print_help ();
  			exit (STATE_OK);
! 		case '?':									/* help */
! 			usage ("Invalid argument\n");
  		}
  	}
--- 351,356 ----
  			print_help ();
  			exit (STATE_OK);
! 		case '?':									/* usage */
! 			usage (_("Invalid argument\n"));
  		}
  	}
***************
*** 380,389 ****
  		}
  		else {
! 			usage ("Invalid host name");
  		}
  	}
  
  	if (strlen(server_address) == 0)
! 		usage ("You must provide a server to check\n");
  
  	if (strlen(host_name) == 0)
--- 362,371 ----
  		}
  		else {
! 			usage (_("Invalid host name"));
  		}
  	}
  
  	if (strlen(server_address) == 0)
! 		usage (_("You must provide a server to check\n"));
  
  	if (strlen(host_name) == 0)
***************
*** 406,444 ****
  
  
! 
  void
  print_help (void)
  {
  	print_revision (progname, "$Revision$");
! 	printf
! 		("Copyright (c) 2000 Pedro Leite (leite at cic.ua.pt)/Karl DeBisschop\n\n"
! 		 "This plugin tests the REAL service on the specified host.\n\n");
  	print_usage ();
! 	printf
! 		("\nOptions:\n"
! 		 " -H, --hostname=STRING or IPADDRESS\n"
! 		 "   Check this server on the indicated host\n"
! 		 " -I, --IPaddress=STRING or IPADDRESS\n"
! 		 "   Check server at this host address\n"
! 		 " -p, --port=INTEGER\n"
! 		 "   Make connection on the indicated port (default: %d)\n"
! 		 " -u, --url=STRING\n"
! 		 "   Connect to this url\n"
! 		 " -e, --expect=STRING\n"
! 		 "   String to expect in first line of server response (default: %s)\n"
! 		 " -w, --warning=INTEGER\n"
! 		 "   Seconds necessary to result in a warning status\n"
! 		 " -c, --critical=INTEGER\n"
! 		 "   Seconds necessary to result in a critical status\n"
! 		 " -t, --timeout=INTEGER\n"
! 		 "   Seconds before connection attempt times out (default: %d)\n"
! 		 " -v, --verbose\n"
! 		 "   Print extra information (command-line use only)\n"
! 		 " -h, --help\n"
! 		 "   Print detailed help screen\n"
! 		 " -V, --version\n"
! 		 "   Print version information\n\n",
! 		 PORT, EXPECT, DEFAULT_SOCKET_TIMEOUT);
! 	support ();
  }
  
--- 388,432 ----
  
  
! 
  void
  print_help (void)
  {
+ 	char *myport;
+ 	asprintf (&myport, "%d", PORT);
+ 
  	print_revision (progname, "$Revision$");
! 
! 	printf (_("Copyright (c) 1999 Pedro Leite <leite at cic.ua.pt>\n"));
! 	printf (_(COPYRIGHT), copyright, email);
! 
! 	printf (_("This plugin tests the REAL service on the specified host.\n\n"));
! 
  	print_usage ();
! 
! 	printf (_(UT_HELP_VRSN));
! 
! 	printf (_(UT_HOST_PORT), 'p', myport);
! 
! 	printf (_("\
!  -u, --url=STRING\n\
!    Connect to this url\n\
!  -e, --expect=STRING\n\
!    String to expect in first line of server response (default: %s)\n"),
! 	       EXPECT);
! 
! 	printf (_(UT_WARN_CRIT));
! 
! 	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
! 
! 	printf (_(UT_VERBOSE));
! 
! 	printf(_("\
! This plugin will attempt to open an RTSP connection with the host.\n\
! Successul connects return STATE_OK, refusals and timeouts return\n\
! STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,\n\
! but incorrect reponse messages from the host result in STATE_WARNING return\n\
! values."));
! 
! 	printf (_(UT_SUPPORT));
  }
  
***************
*** 450,457 ****
  print_usage (void)
  {
! 	printf
! 		("Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n"
! 		 "            [-t timeout] [-v]\n"
! 		 "       %s --help\n"
! 		 "       %s --version\n", progname, progname, progname);
  }
--- 438,444 ----
  print_usage (void)
  {
! 	printf ("\
! Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n\
!   [-t timeout] [-v]\n", progname);
! 	printf (_(UT_HLP_VRS), progname, progname);
  }





More information about the Commits mailing list