Code cleanup

[nagiosplug.git] / plugins / utils.c

diff --git a/plugins/utils.c b/plugins/utils.c
index 22020d72eb16c5958908e9fc885cf68be05d0e1b..0d250677c218ced9d6936826d455220d890d1722 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -17,17 +17,22 @@
 #include <stdarg.h>
 #include <limits.h>
 
+#include <arpa/inet.h>
+
 extern int timeout_interval;
+extern const char *progname;
 
-char *my_basename (char *);
 void support (void);
 char *clean_revstring (const char *);
-void print_revision (char *, const char *);
+void print_revision (const char *, const char *);
 void terminate (int, const char *fmt, ...);
 RETSIGTYPE timeout_alarm_handler (int);
 
 int is_host (char *);
-int is_dotted_quad (char *);
+int is_addr (char *);
+int resolve_host_or_addr (char *, int);
+int is_inet_addr (char *);
+int is_inet6_addr (char *);
 int is_hostname (char *);
 
 int is_integer (char *);
@@ -57,18 +62,18 @@ char *strpcat (char *dest, const char *src, const char *str);
 #define STRLEN 64
 #define TXTBLK 128
 
-#define max(a,b) ((a)>(b))?(a):(b)
-
 /* **************************************************************************
- * max_state(STATE_x, STATE_y)
+ /* max_state(STATE_x, STATE_y)
  * compares STATE_x to  STATE_y and returns result based on the following
  * STATE_UNKNOWN < STATE_OK < STATE_WARNING < STATE_CRITICAL
  *
  * Note that numerically the above does not hold
  ****************************************************************************/
 
+#define max(a,b) (((a)>(b))?(a):(b))
+
 int
-max_state(int a, int b)
+max_state (int a, int b)
 {
        if (a == STATE_CRITICAL || b == STATE_CRITICAL)
                return STATE_CRITICAL;
@@ -84,13 +89,26 @@ max_state(int a, int b)
                return max (a, b);
 }
 
-char *
-my_basename (char *path)
+void usage (char *msg)
 {
-       if (!strstr (path, "/"))
-               return path;
-       else
-               return 1 + strrchr (path, '/');
+       printf (msg);
+       print_usage ();
+       exit (STATE_UNKNOWN);
+}
+
+void usage2(char *msg, char *arg)
+{
+       printf ("%s: %s - %s\n",progname,msg,arg);
+       print_usage ();
+       exit (STATE_UNKNOWN);
+}
+
+void
+usage3 (char *msg, char arg)
+{
+       printf ("%s: %s - %c\n", progname, msg, arg);
+       print_usage();
+       exit (STATE_UNKNOWN);
 }
 
 
@@ -115,14 +133,14 @@ clean_revstring (const char *revstring)
 }
 
 void
-print_revision (char *command_name, const char *revision_string)
+print_revision (const char *command_name, const char *revision_string)
 {
        char plugin_revision[STRLEN];
 
        if (sscanf (revision_string, "$Revision: %[0-9.]", plugin_revision) != 1)
                strncpy (plugin_revision, "N/A", STRLEN);
        printf ("%s (nagios-plugins %s) %s\n",
-                                       my_basename (command_name), VERSION, plugin_revision);
+                                       progname, VERSION, plugin_revision);
        printf
                ("The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
                 "copies of the plugins under the terms of the GNU General Public License.\n"
@@ -154,28 +172,50 @@ timeout_alarm_handler (int signo)
 int
 is_host (char *address)
 {
-       if (is_dotted_quad (address) || is_hostname (address))
+       if (is_addr (address) || is_hostname (address))
                return (TRUE);
+
        return (FALSE);
 }
 
 int
-is_dotted_quad (char *address)
+is_addr (char *address)
 {
-       int o1, o2, o3, o4;
-       char c[1];
+       if (is_inet_addr (address) || is_inet6_addr (address))
+               return (TRUE);
 
-       if (!address)
-               return FALSE;
+       return (FALSE);
+}
 
-       if (sscanf (address, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, c) != 4)
-               return FALSE;
-       else if (o1 > 255 || o2 > 255 || o3 > 255 || o4 > 255)
-               return FALSE;
-       else if (o1 < 0 || o2 < 0 || o3 < 0 || o4 < 0)
+int
+resolve_host_or_addr (char *address, int family)
+{
+       struct addrinfo hints;
+       struct addrinfo *res;
+       int retval;
+
+       memset (&hints, 0, sizeof (hints));
+       hints.ai_family = family;
+       retval = getaddrinfo (address, NULL, &hints, &res);
+
+       if (retval != 0)
                return FALSE;
-       else
+       else {
+               freeaddrinfo (res);
                return TRUE;
+       }
+}
+
+int
+is_inet_addr (char *address)
+{
+       return resolve_host_or_addr (address, AF_INET);
+}
+
+int
+is_inet6_addr (char *address)
+{
+       return resolve_host_or_addr (address, AF_INET6);
 }
 
 /* from RFC-1035
@@ -188,22 +228,7 @@ is_dotted_quad (char *address)
 int
 is_hostname (char *s1)
 {
-       if (!s1 || strlen (s1) > 63) {
-               return FALSE;
-       }
-       if (strcspn (s1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXYZ0123456789-.") != 0) {
-               return FALSE;
-       }
-       if (strspn (s1, "0123456789-.") == 1) {
-               return FALSE;
-       }
-       while ((s1 = index (s1, '.'))) {
-               s1++;
-               if (strspn (s1, "0123456789-.") == 1) {
-                       return FALSE;
-               }
-       }
-       return TRUE;
+       return resolve_host_or_addr (s1, AF_UNSPEC);
 }
 
 int