X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fcheck_dig.c;h=4394490e8723ea0fe31c2a0a5d71ca1b0eb022b4;hb=f573447d1f6dbf25b58bbfea81226a2ae3736555;hp=197d5205a21aa72c1610d77aa02fe4b0bfa3e089;hpb=066b63b86197985a50ca10291ea350f5f4d59017;p=nagiosplug.git diff --git a/plugins/check_dig.c b/plugins/check_dig.c index 197d520..4394490 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c @@ -14,8 +14,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + $Id$ + *****************************************************************************/ +const char *progname = "check_dig"; +const char *revision = "$Revision$"; +const char *copyright = "2002-2004"; +const char *email = "nagiosplug-devel@lists.sourceforge.net"; + #include "common.h" #include "netutils.h" #include "utils.h" @@ -26,21 +33,19 @@ int validate_arguments (void); void print_help (void); void print_usage (void); -const char *progname = "check_dig"; -const char *revision = "$Revision$"; -const char *copyright = "2002-2003"; -const char *email = "nagiosplug-devel@lists.sourceforge.net"; - enum { + UNDEFINED = 0, DEFAULT_PORT = 53 }; char *query_address = NULL; +char *record_type = "A"; +char *expected_address = NULL; char *dns_server = NULL; int verbose = FALSE; int server_port = DEFAULT_PORT; -int warning_interval = -1; -int critical_interval = -1; +double warning_interval = UNDEFINED; +double critical_interval = UNDEFINED; struct timeval tv; int @@ -49,6 +54,7 @@ main (int argc, char **argv) char input_buffer[MAX_INPUT_BUFFER]; char *command_line; char *output; + char *t; long microsec; double elapsed_time; int result = STATE_UNKNOWN; @@ -61,20 +67,26 @@ main (int argc, char **argv) /* Set signal handling and alarm */ if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) - usage (_("Cannot catch SIGALRM\n")); + usage4 (_("Cannot catch SIGALRM")); - if (process_arguments (argc, argv) != OK) - usage (_("Could not parse arguments\n")); + if (process_arguments (argc, argv) == ERROR) + usage4 (_("Could not parse arguments")); /* get the command to run */ - asprintf (&command_line, "%s @%s -p %d %s", - PATH_TO_DIG, dns_server, server_port, query_address); + asprintf (&command_line, "%s @%s -p %d %s -t %s", + PATH_TO_DIG, dns_server, server_port, query_address, record_type); alarm (timeout_interval); gettimeofday (&tv, NULL); - if (verbose) + if (verbose) { printf ("%s\n", command_line); + if(expected_address != NULL) { + printf (_("Looking for: '%s'\n"), expected_address); + } else { + printf (_("Looking for: '%s'\n"), query_address); + } + } /* run the command */ child_process = spopen (command_line); @@ -92,28 +104,43 @@ main (int argc, char **argv) /* the server is responding, we just got the host name... */ if (strstr (input_buffer, ";; ANSWER SECTION:")) { - /* get the host address */ - if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) - break; - - if (strpbrk (input_buffer, "\r\n")) - input_buffer[strcspn (input_buffer, "\r\n")] = '\0'; - - if (strstr (input_buffer, query_address) == input_buffer) { - output = strdup(input_buffer); - result = STATE_OK; - } - else { - asprintf (&output, _("Server not found in ANSWER SECTION")); - result = STATE_WARNING; - } - - continue; + /* loop through the whole 'ANSWER SECTION' */ + do { + /* get the host address */ + if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) + break; + + if (strpbrk (input_buffer, "\r\n")) + input_buffer[strcspn (input_buffer, "\r\n")] = '\0'; + + if (verbose && !strstr (input_buffer, ";; ")) + printf ("%s\n", input_buffer); + + if (expected_address==NULL && strstr (input_buffer, query_address) != NULL) { + output = strdup(input_buffer); + result = STATE_OK; + } + else if (expected_address != NULL && strstr (input_buffer, expected_address) != NULL) { + output = strdup(input_buffer); + result = STATE_OK; + } + + /* Translate output TAB -> SPACE */ + t = output; + while ((t = index(t, '\t')) != NULL) + *t = ' '; + + } while (!strstr (input_buffer, ";; ")); + + if (result == STATE_UNKNOWN) { + asprintf (&output, _("Server not found in ANSWER SECTION")); + result = STATE_WARNING; + } } } - if (result != STATE_OK) { + if (result == STATE_UNKNOWN) { asprintf (&output, _("No ANSWER SECTION found")); } @@ -131,7 +158,7 @@ main (int argc, char **argv) if (spclose (child_process)) { result = max_state (result, STATE_WARNING); if (strlen (output) == 0) - asprintf (&output, _("dig returned error status")); + asprintf (&output, _("dig returned an error status")); } microsec = deltime (tv); @@ -140,37 +167,27 @@ main (int argc, char **argv) if (output == NULL || strlen (output) == 0) asprintf (&output, _(" Probably a non-existent host/domain")); - if (elapsed_time > critical_interval) - die (STATE_CRITICAL, - _("DNS OK - %d seconds response time (%s)|time=%ldus\n"), - elapsed_time, output, microsec); - - else if (result == STATE_CRITICAL) - printf (_("DNS CRITICAL - %s|time=%ldus\n"), output); + if (critical_interval > UNDEFINED && elapsed_time > critical_interval) + result = STATE_CRITICAL; - else if (elapsed_time > warning_interval) - die (STATE_WARNING, - _("DNS OK - %d seconds response time (%s)|time=%ldus\n"), - elapsed_time, output, microsec); + else if (warning_interval > UNDEFINED && elapsed_time > warning_interval) + result = STATE_WARNING; - else if (result == STATE_WARNING) - printf (_("DNS WARNING - %s|time=%ldus\n"), output); - - else if (result == STATE_OK) - printf (_("DNS OK - %d seconds response time (%s)|time=%ldus\n"), - elapsed_time, output, microsec); - - else - printf (_("DNS problem - %s|time=%ldus\n"), output); + asprintf (&output, _("%.3f seconds response time (%s)"), elapsed_time, output); + printf ("DNS %s - %s|%s\n", + state_text (result), output, + fperfdata("time", elapsed_time, "s", + (warning_interval>UNDEFINED?TRUE:FALSE), + warning_interval, + (critical_interval>UNDEFINED?TRUE:FALSE), + critical_interval, + TRUE, 0, FALSE, 0)); return result; } - - - /* process command-line arguments */ int process_arguments (int argc, char **argv) @@ -180,10 +197,15 @@ process_arguments (int argc, char **argv) int option = 0; static struct option longopts[] = { {"hostname", required_argument, 0, 'H'}, - {"query_address", required_argument, 0, 'e'}, + {"query_address", required_argument, 0, 'l'}, + {"warning", required_argument, 0, 'w'}, + {"critical", required_argument, 0, 'c'}, + {"timeout", required_argument, 0, 't'}, {"verbose", no_argument, 0, 'v'}, {"version", no_argument, 0, 'V'}, {"help", no_argument, 0, 'h'}, + {"record_type", required_argument, 0, 'T'}, + {"expected_address", required_argument, 0, 'a'}, {0, 0, 0, 0} }; @@ -191,53 +213,53 @@ process_arguments (int argc, char **argv) return ERROR; while (1) { - c = getopt_long (argc, argv, "hVvt:l:H:", longopts, &option); + c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:a:", longopts, &option); if (c == -1 || c == EOF) break; switch (c) { case '?': /* help */ - usage3 (_("Unknown argument"), optopt); + usage2 (_("Unknown argument"), optarg); case 'h': /* help */ print_help (); exit (STATE_OK); case 'V': /* version */ - print_revision (progname, "$Revision$"); + print_revision (progname, revision); exit (STATE_OK); case 'H': /* hostname */ if (is_host (optarg)) { dns_server = optarg; } else { - usage2 (_("Invalid host name"), optarg); + usage2 (_("Invalid hostname/address"), optarg); } break; - case 'p': + case 'p': /* server port */ if (is_intpos (optarg)) { server_port = atoi (optarg); } else { - usage2 (_("Server port must be a nonnegative integer\n"), optarg); + usage2 (_("Port must be a positive integer"), optarg); } break; - case 'l': /* username */ + case 'l': /* address to lookup */ query_address = optarg; break; - case 'w': /* timeout */ - if (is_intnonneg (optarg)) { - warning_interval = atoi (optarg); + case 'w': /* warning */ + if (is_nonnegative (optarg)) { + warning_interval = strtod (optarg, NULL); } else { - usage2 (_("Warning interval must be a nonnegative integer\n"), optarg); + usage2 (_("Warning interval must be a positive integer"), optarg); } break; - case 'c': /* timeout */ - if (is_intnonneg (optarg)) { - critical_interval = atoi (optarg); + case 'c': /* critical */ + if (is_nonnegative (optarg)) { + critical_interval = strtod (optarg, NULL); } else { - usage2 (_("Critical interval must be a nonnegative integer\n"), optarg); + usage2 (_("Critical interval must be a positive integer"), optarg); } break; case 't': /* timeout */ @@ -245,12 +267,18 @@ process_arguments (int argc, char **argv) timeout_interval = atoi (optarg); } else { - usage2 (_("Time interval must be a nonnegative integer\n"), optarg); + usage2 (_("Timeout interval must be a positive integer"), optarg); } break; case 'v': /* verbose */ verbose = TRUE; break; + case 'T': + record_type = optarg; + break; + case 'a': + expected_address = optarg; + break; } } @@ -261,7 +289,7 @@ process_arguments (int argc, char **argv) dns_server = argv[c]; } else { - usage2 (_("Invalid host name"), argv[c]); + usage2 (_("Invalid hostname/address"), argv[c]); } } else { @@ -274,8 +302,6 @@ process_arguments (int argc, char **argv) - - int validate_arguments (void) { @@ -284,10 +310,6 @@ validate_arguments (void) - - - - void print_help (void) { @@ -297,8 +319,8 @@ print_help (void) print_revision (progname, revision); - printf (_("Copyright (c) 2000 Karl DeBisschop \n")); - printf (_(COPYRIGHT), copyright, email); + printf ("Copyright (c) 2000 Karl DeBisschop \n"); + printf (COPYRIGHT, copyright, email); printf (_("Test the DNS service on the specified host using dig\n\n")); @@ -312,6 +334,15 @@ print_help (void) -l, --lookup=STRING\n\ machine name to lookup\n")); + printf (_("\ + -T, --record_type=STRING\n\ + record type to lookup (default: A)\n")); + + printf (_("\ + -a, --expected_address=STRING\n\ + an address expected to be in the answer section.\n\ + if not set, uses whatever was in -l\n")); + printf (_(UT_WARN_CRIT)); printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); @@ -323,14 +354,11 @@ print_help (void) - void print_usage (void) { - printf (_("\ -Usage: %s -H host -l lookup [-p ] [-w ]\n\ - [-c ] [-t ] [-v]\n"), - progname); - printf (" %s (-h|--help)\n", progname); - printf (" %s (-V|--version)\n", progname); + printf ("\ +Usage: %s -H host -l lookup [-p ] [-T ]\n\ + [-w ] [-c ] [-t ]\n\ + [-a ] [-v]\n", progname); }