X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_ntp_time.c;h=f0f74b4e99298a5fb4dd3fadc983e4eafb09111b;hb=refs%2Fheads%2Fsh%2Fcheck_pgsql;hp=ad7f6c4ba52af52e4fff6726cb1824c2d01fb870;hpb=ee748cd343bdb74a2073e512189942d71ba4200d;p=nagiosplug.git diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index ad7f6c4..f0f74b4 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c @@ -1,48 +1,41 @@ -/****************************************************************************** -* +/***************************************************************************** +* * Nagios check_ntp_time plugin -* +* * License: GPL -* Copyright (c) 2006 sean finney -* Copyright (c) 2007 nagios-plugins team -* -* Last Modified: $Date$ -* +* Copyright (c) 2006 Sean Finney +* Copyright (c) 2006-2008 Nagios Plugins Development Team +* * Description: -* +* * This file contains the check_ntp_time plugin -* -* This plugin checks the clock offset between the local host and a -* remote NTP server. It is independent of any commandline programs or -* external libraries. -* -* If you'd rather want to monitor an NTP server, please use -* check_ntp_peer. -* -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* This plugin checks the clock offset between the local host and a +* remote NTP server. It is independent of any commandline programs or +* external libraries. +* +* If you'd rather want to monitor an NTP server, please use +* check_ntp_peer. +* +* +* 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 +* the Free Software Foundation, either version 3 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. - - $Id$ - +* along with this program. If not, see . +* +* *****************************************************************************/ const char *progname = "check_ntp_time"; -const char *revision = "$Revision$"; -const char *copyright = "2007"; +const char *copyright = "2006-2008"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "common.h" @@ -50,6 +43,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "utils.h" static char *server_address=NULL; +static char *port="123"; static int verbose=0; static int quiet=0; static char *owarn="60"; @@ -83,7 +77,7 @@ typedef struct { /* this structure holds data about results from querying offset from a peer */ typedef struct { - time_t waiting; /* ts set when we started waiting for a response */ + time_t waiting; /* ts set when we started waiting for a response */ int num_responses; /* number of successfully recieved responses */ uint8_t stratum; /* copied verbatim from the ntp_message */ double rtdelay; /* converted from the ntp_message */ @@ -134,7 +128,7 @@ typedef struct { they are divided into halves, each being a 16-bit int in network byte order: - the first 16 bits are an int on the left side of a decimal point. - the second 16 bits represent a fraction n/(2^16) - likewise for the 64-bit "fixed point" numbers with everything doubled :) + likewise for the 64-bit "fixed point" numbers with everything doubled :) **/ /* macros to access the left/right 16 bits of a 32-bit ntp "fixed point" @@ -247,50 +241,52 @@ void setup_request(ntp_message *p){ * this is done by filtering servers based on stratum, dispersion, and * finally round-trip delay. */ int best_offset_server(const ntp_server_results *slist, int nservers){ - int i=0, j=0, cserver=0, candidates[5], csize=0; + int i=0, cserver=0, best_server=-1; /* for each server */ for(cserver=0; cserveri; j--){ - candidates[j]=candidates[j-1]; + /* compare the server to the best one we've seen so far */ + /* does it have an equal or better stratum? */ + DBG(printf("comparing peer %d with peer %d\n", cserver, best_server)); + if(slist[cserver].stratum <= slist[best_server].stratum){ + DBG(printf("stratum for peer %d <= peer %d\n", cserver, best_server)); + /* does it have an equal or better dispersion? */ + if(slist[cserver].rtdisp <= slist[best_server].rtdisp){ + DBG(printf("dispersion for peer %d <= peer %d\n", cserver, best_server)); + /* does it have a better rtdelay? */ + if(slist[cserver].rtdelay < slist[best_server].rtdelay){ + DBG(printf("rtdelay for peer %d < peer %d\n", cserver, best_server)); + best_server = cserver; + DBG(printf("peer %d is now our best candidate\n", best_server)); + } } } - /* regardless, if they should be on the list... */ - if(i<5) { - candidates[i]=cserver; - if(csize<5) csize++; - /* otherwise discard the server */ - } else { - DBG(printf("discarding peer id %d\n", cserver)); - } } - if(csize>0) { - DBG(printf("best server selected: peer %d\n", candidates[0])); - return candidates[0]; + if(best_server >= 0) { + DBG(printf("best server selected: peer %d\n", best_server)); + return best_server; } else { DBG(printf("no peers meeting synchronization criteria :(\n")); return -1; @@ -299,7 +295,7 @@ int best_offset_server(const ntp_server_results *slist, int nservers){ /* do everything we need to get the total average offset * - we use a certain amount of parallelization with poll() to ensure - * we don't waste time sitting around waiting for single packets. + * we don't waste time sitting around waiting for single packets. * - we also "manually" handle resolving host names and connecting, because * we have to do it in a way that our lazy macros don't handle currently :( */ double offset_request(const char *host, int *status){ @@ -320,7 +316,7 @@ double offset_request(const char *host, int *status){ hints.ai_socktype = SOCK_DGRAM; /* fill in ai with the list of hosts resolved by the host name */ - ga_result = getaddrinfo(host, "123", &hints, &ai); + ga_result = getaddrinfo(host, port, &hints, &ai); if(ga_result!=0){ die(STATE_UNKNOWN, "error getting address for %s: %s\n", host, gai_strerror(ga_result)); @@ -337,6 +333,7 @@ double offset_request(const char *host, int *status){ servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts); if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array"); memset(servers, 0, sizeof(ntp_server_results)*num_hosts); + DBG(printf("Found %d peers to check\n", num_hosts)); /* setup each socket for writing, and the corresponding struct pollfd */ ai_tmp=ai; @@ -456,15 +453,16 @@ int process_arguments(int argc, char **argv){ {"critical", required_argument, 0, 'c'}, {"timeout", required_argument, 0, 't'}, {"hostname", required_argument, 0, 'H'}, + {"port", required_argument, 0, 'p'}, {0, 0, 0, 0} }; - + if (argc < 2) usage ("\n"); while (1) { - c = getopt_long (argc, argv, "Vhv46qw:c:t:H:", longopts, &option); + c = getopt_long (argc, argv, "Vhv46qw:c:t:H:p:", longopts, &option); if (c == -1 || c == EOF || c == 1) break; @@ -474,7 +472,7 @@ int process_arguments(int argc, char **argv){ exit(STATE_OK); break; case 'V': - print_revision(progname, revision); + print_revision(progname, NP_VERSION); exit(STATE_OK); break; case 'v': @@ -494,6 +492,9 @@ int process_arguments(int argc, char **argv){ usage2(_("Invalid hostname/address"), optarg); server_address = strdup(optarg); break; + case 'p': + port = strdup(optarg); + break; case 't': socket_timeout=atoi(optarg); break; @@ -534,8 +535,15 @@ int main(int argc, char *argv[]){ double offset=0; char *result_line, *perfdata_line; + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + result = offset_result = STATE_OK; + /* Parse extra opts if any */ + argv=np_extra_opts (&argc, argv, progname); + if (process_arguments (argc, argv) == ERROR) usage4 (_("Could not parse arguments")); @@ -556,23 +564,23 @@ int main(int argc, char *argv[]){ switch (result) { case STATE_CRITICAL : - asprintf(&result_line, "NTP CRITICAL:"); + asprintf(&result_line, _("NTP CRITICAL:")); break; case STATE_WARNING : - asprintf(&result_line, "NTP WARNING:"); + asprintf(&result_line, _("NTP WARNING:")); break; case STATE_OK : - asprintf(&result_line, "NTP OK:"); + asprintf(&result_line, _("NTP OK:")); break; default : - asprintf(&result_line, "NTP UNKNOWN:"); + asprintf(&result_line, _("NTP UNKNOWN:")); break; } if(offset_result == STATE_UNKNOWN){ asprintf(&result_line, "%s %s", result_line, _("Offset unknown")); asprintf(&perfdata_line, ""); } else { - asprintf(&result_line, "%s Offset %.10g secs", result_line, offset); + asprintf(&result_line, "%s %s %.10g secs", result_line, _("Offset"), offset); asprintf(&perfdata_line, "%s", perfd_offset(offset)); } printf("%s|%s\n", result_line, perfdata_line); @@ -582,7 +590,7 @@ int main(int argc, char *argv[]){ } void print_help(void){ - print_revision(progname, revision); + print_revision(progname, NP_VERSION); printf ("Copyright (c) 2006 Sean Finney\n"); printf (COPYRIGHT, copyright, email); @@ -592,41 +600,41 @@ void print_help(void){ printf ("\n\n"); print_usage(); - printf (_(UT_HELP_VRSN)); - printf (_(UT_HOST_PORT), 'p', "123"); + printf (UT_HELP_VRSN); + printf (UT_EXTRA_OPTS); + printf (UT_HOST_PORT, 'p', "123"); printf (" %s\n", "-q, --quiet"); printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found")); printf (" %s\n", "-w, --warning=THRESHOLD"); printf (" %s\n", _("Offset to result in warning status (seconds)")); printf (" %s\n", "-c, --critical=THRESHOLD"); printf (" %s\n", _("Offset to result in critical status (seconds)")); - printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); - printf (_(UT_VERBOSE)); + printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_VERBOSE); + + printf("\n"); + printf("%s\n", _("This plugin checks the clock offset between the local host and a")); + printf("%s\n", _("remote NTP server. It is independent of any commandline programs or")); + printf("%s\n", _("external libraries.")); printf("\n"); printf("%s\n", _("Notes:")); - printf(" %s\n", _("This plugin checks the clock offset between the local host and a")); - printf(" %s\n", _("remote NTP server. It is independent of any commandline programs or")); - printf(" %s\n\n", _("external libraries.")); printf(" %s\n", _("If you'd rather want to monitor an NTP server, please use")); - printf(" %s\n\n", _("check_ntp_peer.")); - - printf(" %s\n", _("See:")); - printf(" %s\n", ("http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT")); - printf(" %s\n", _("for THRESHOLD format and examples.")); + printf(" %s\n", _("check_ntp_peer.")); + printf("\n"); + printf(UT_THRESHOLDS_NOTES); printf("\n"); printf("%s\n", _("Examples:")); printf(" %s\n", ("./check_ntp_time -H ntpserv -w 0.5 -c 1")); - printf (_(UT_SUPPORT)); + printf (UT_SUPPORT); } void print_usage(void) { - printf (_("Usage:")); - printf(" %s -H [-w ] [-c ] [-W ] [-C ]\n", progname); - printf(" [-j ] [-k ] [-v verbose]\n"); + printf ("%s\n", _("Usage:")); + printf(" %s -H [-w ] [-c ] [-v verbose]\n", progname); }