X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Futils.c;h=bf36039e520d87a7d3730839b552dc25d9d5ecb8;hb=b785fae376955045c2667073071678be647f0e17;hp=474206b93638bded27106ec8efbdfb7e1d40c15b;hpb=0c3386274ef5002dffc20337ef02407f24d7400c;p=nagiosplug.git

diff --git a/plugins/utils.c b/plugins/utils.c
index 474206b..bf36039 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -13,23 +13,21 @@
 
 #include "config.h"
 #include "common.h"
-#include "version.h"
 #include <stdarg.h>
 #include <limits.h>
 
+#include <arpa/inet.h>
+
 extern int timeout_interval;
 extern const char *progname;
 
 void support (void);
 char *clean_revstring (const char *);
 void print_revision (const char *, const char *);
-void terminate (int, const char *fmt, ...);
+void die (int result, const char *fmt, ...);
+void terminate (int result, const char *fmt, ...);
 RETSIGTYPE timeout_alarm_handler (int);
 
-int is_host (char *);
-int is_dotted_quad (char *);
-int is_hostname (char *);
-
 int is_integer (char *);
 int is_intpos (char *);
 int is_intneg (char *);
@@ -53,18 +51,22 @@ char *strnl (char *str);
 char *strpcpy (char *dest, const char *src, const char *str);
 char *strpcat (char *dest, const char *src, const char *str);
 
+char *state_text (int result);
+
 #define LABELLEN 63
 #define STRLEN 64
 #define TXTBLK 128
 
 /* **************************************************************************
- * 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)
 {
@@ -141,6 +143,33 @@ print_revision (const char *command_name, const char *revision_string)
 
 }
 
+char *
+state_text (int result)
+{
+	switch (result) {
+	case STATE_OK:
+		return "OK";
+	case STATE_WARNING:
+		return "WARNING";
+	case STATE_CRITICAL:
+		return "CRITICAL";
+	case STATE_DEPENDENT:
+		return "DEPENDENT";
+	default:
+		return "UNKNOWN";
+	}
+}
+
+void
+die (int result, const char *fmt, ...)
+{
+	va_list ap;
+	printf ("%s %s: ", sizeof (char) + index(progname, '_'), state_text(result));
+	va_start (ap, fmt);
+	vprintf (fmt, ap);
+	va_end (ap);
+	exit (result);
+}
 
 void
 terminate (int result, const char *fmt, ...)
@@ -162,61 +191,6 @@ timeout_alarm_handler (int signo)
 	}
 }
 
-int
-is_host (char *address)
-{
-	if (is_dotted_quad (address) || is_hostname (address))
-		return (TRUE);
-	return (FALSE);
-}
-
-int
-is_dotted_quad (char *address)
-{
-	int o1, o2, o3, o4;
-	char c[1];
-
-	if (!address)
-		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)
-		return FALSE;
-	else
-		return TRUE;
-}
-
-/* from RFC-1035
- * 
- * The labels must follow the rules for ARPANET host names.  They must
- * start with a letter, end with a letter or digit, and have as interior
- * characters only letters, digits, and hyphen.  There are also some
- * restrictions on the length.  Labels must be 63 characters or less. */
-
-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;
-}
-
 int
 is_numeric (char *number)
 {