check_snmp: Remove that is_numeric madness

[nagiosplug.git] / plugins / check_tcp.c

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index d74b5a8b342d01c2e854907698330a793cbdb66a..178bd5688dec52abeeb72667b595ba7c65709ab5 100644 (file)
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_tcp plugin
@@ -24,14 +22,13 @@
 * 
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*  
+*
 * $Id$
 * 
 *****************************************************************************/
 
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
-const char *revision = "$Revision$";
 const char *copyright = "1999-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -205,6 +202,9 @@ main (int argc, char **argv)
        server_quit = QUIT;
        status = NULL;
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -312,7 +312,7 @@ main (int argc, char **argv)
        }
 #ifdef HAVE_SSL
        np_net_ssl_cleanup();
-#endif 
+#endif
        if (sd) close (sd);
 
        microsec = deltime (tv);
@@ -392,10 +392,10 @@ process_arguments (int argc, char **argv)
                {"critical-codes", required_argument, 0, 'C'},
                {"warning-codes", required_argument, 0, 'W'},
                {"timeout", required_argument, 0, 't'},
-               {"protocol", required_argument, 0, 'P'},
+               {"protocol", required_argument, 0, 'P'}, /* FIXME: Unhandled */
                {"port", required_argument, 0, 'p'},
-               {"escape", required_argument, 0, 'E'},
-               {"all", required_argument, 0, 'A'},
+               {"escape", no_argument, 0, 'E'},
+               {"all", no_argument, 0, 'A'},
                {"send", required_argument, 0, 's'},
                {"expect", required_argument, 0, 'e'},
                {"maxbytes", required_argument, 0, 'm'},
@@ -409,10 +409,8 @@ process_arguments (int argc, char **argv)
                {"verbose", no_argument, 0, 'v'},
                {"version", no_argument, 0, 'V'},
                {"help", no_argument, 0, 'h'},
-#ifdef HAVE_SSL
                {"ssl", no_argument, 0, 'S'},
                {"certificate", required_argument, 0, 'D'},
-#endif
                {0, 0, 0, 0}
        };
 
@@ -450,7 +448,7 @@ process_arguments (int argc, char **argv)
                        print_help ();
                        exit (STATE_OK);
                case 'V':                 /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'v':                 /* verbose mode */
                        flags |= FLAG_VERBOSE;
@@ -591,7 +589,7 @@ process_arguments (int argc, char **argv)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
        printf (COPYRIGHT, copyright, email);
@@ -601,11 +599,12 @@ print_help (void)
 
        print_usage ();
 
-       printf (_(UT_HELP_VRSN));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
 
-       printf (_(UT_HOST_PORT), 'p', "none");
+       printf (UT_HOST_PORT, 'p', "none");
 
-       printf (_(UT_IPv46));
+       printf (UT_IPv46);
 
        printf (" %s\n", "-E, --escape");
   printf ("    %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option"));
@@ -619,7 +618,7 @@ print_help (void)
   printf (" %s\n", "-q, --quit=STRING");
   printf ("    %s\n", _("String to send server to initiate a clean close of the connection"));
   printf (" %s\n", "-r, --refuse=ok|warn|crit");
-  printf ("    %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)"));
+  printf ("    %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
   printf (" %s\n", "-M, --mismatch=ok|warn|crit");
   printf ("    %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
   printf (" %s\n", "-j, --jail");
@@ -636,20 +635,20 @@ print_help (void)
   printf ("    %s\n", _("Use SSL for the connection."));
 #endif
 
-       printf (_(UT_WARN_CRIT));
+       printf (UT_WARN_CRIT);
 
-       printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+       printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-       printf (_(UT_VERBOSE));
+       printf (UT_VERBOSE);
 
-       printf (_(UT_SUPPORT));
+       printf (UT_SUPPORT);
 }
 
 
 void
 print_usage (void)
 {
-       printf (_("Usage:"));
+       printf ("%s\n", _("Usage:"));
   printf ("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n",progname);
   printf ("[-e <expect string>] [-q <quit string>][-m <maximum bytes>] [-d <delay>]\n");
   printf ("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");