From 122610e3730b8dd4afb41dfa48e65ba75f5586fe Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Mon, 1 Sep 2008 14:04:22 +0000 Subject: [PATCH] check_ntp_peer/check_ntp_time used to show port in --help but ignored the argument - now implemented. git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2051 f882894a-f735-0410-b71e-b25c423dba1c --- NEWS | 1 + plugins/check_ntp_peer.c | 9 +++++++-- plugins/check_ntp_time.c | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 96c4591..cb68df6 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ This file documents the major additions and syntax changes between releases. check_icmp now supports packet size modification check_http -e now accepts a comma-delimited list of expected status codes libtap now included with this distribution for easier testing. Run ./configure with --enable-libtap + check_ntp_peer/check_ntp_time used to show port in --help but ignored the argument - now implemented. 1.4.12 27th May 2008 Added ./check_nt -v INSTANCES to count number of instances (Alessandro Ren) diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 00c8e97..72cec63 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c @@ -48,6 +48,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "utils.h" static char *server_address=NULL; +static int port=123; static int verbose=0; static int quiet=0; static short do_offset=0; @@ -283,7 +284,7 @@ int ntp_request(const char *host, double *offset, int *offset_result, double *ji * 4) Extract the offset, jitter and stratum value from the data[] * (it's ASCII) */ - my_udp_connect(server_address, 123, &conn); + my_udp_connect(server_address, port, &conn); /* keep sending requests until the server stops setting the * REM_MORE bit, though usually this is only 1 packet. */ @@ -469,6 +470,7 @@ int process_arguments(int argc, char **argv){ {"jcrit", required_argument, 0, 'k'}, {"timeout", required_argument, 0, 't'}, {"hostname", required_argument, 0, 'H'}, + {"port", required_argument, 0, 'p'}, {0, 0, 0, 0} }; @@ -477,7 +479,7 @@ int process_arguments(int argc, char **argv){ usage ("\n"); while (1) { - c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:t:H:", longopts, &option); + c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:t:H:p:", longopts, &option); if (c == -1 || c == EOF || c == 1) break; @@ -525,6 +527,9 @@ int process_arguments(int argc, char **argv){ usage2(_("Invalid hostname/address"), optarg); server_address = strdup(optarg); break; + case 'p': + port=atoi(optarg); + break; case 't': socket_timeout=atoi(optarg); break; diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index ea24a0e..655541e 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c @@ -47,6 +47,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"; @@ -319,7 +320,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)); @@ -456,6 +457,7 @@ 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} }; @@ -464,7 +466,7 @@ int process_arguments(int argc, char **argv){ 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; @@ -494,6 +496,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; -- 2.30.2