summaryrefslogtreecommitdiffstats
path: root/plugins/check_ntp.c
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-11-30 22:39:59 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-11-30 22:39:59 (GMT)
commit5871123e0a5f520f810b2cfe03cef16c4c5a1aee (patch)
tree5d762cfbfbb097f85c71dc73da87b80c6e9c3d7e /plugins/check_ntp.c
parent30f0eeed578a1606eb53e135c1c5417d61d56295 (diff)
downloadmonitoring-plugins-5871123e0a5f520f810b2cfe03cef16c4c5a1aee.tar.gz
Revert "plugins/check_ntp.c - Verify struct from response"
This reverts commit a04df3e1b67dc5eab3adc202cc89901f801cdeaa. The "fix" was bogus in many ways and broke jitter checking. Conflicts: plugins/check_ntp.c
Diffstat (limited to 'plugins/check_ntp.c')
-rw-r--r--plugins/check_ntp.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 546802a..0a7640a 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -517,14 +517,13 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
517double jitter_request(const char *host, int *status){ 517double jitter_request(const char *host, int *status){
518 int conn=-1, i, npeers=0, num_candidates=0, syncsource_found=0; 518 int conn=-1, i, npeers=0, num_candidates=0, syncsource_found=0;
519 int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0; 519 int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0;
520 int peers_size=0, peer_offset=0, bytes_read=0; 520 int peers_size=0, peer_offset=0;
521 ntp_assoc_status_pair *peers=NULL; 521 ntp_assoc_status_pair *peers=NULL;
522 ntp_control_message req; 522 ntp_control_message req;
523 const char *getvar = "jitter"; 523 const char *getvar = "jitter";
524 double rval = 0.0, jitter = -1.0; 524 double rval = 0.0, jitter = -1.0;
525 char *startofvalue=NULL, *nptr=NULL; 525 char *startofvalue=NULL, *nptr=NULL;
526 void *tmp; 526 void *tmp;
527 int ntp_cm_ints = sizeof(uint16_t) * 5 + sizeof(uint8_t) * 2;
528 527
529 /* Long-winded explanation: 528 /* Long-winded explanation:
530 * Getting the jitter requires a number of steps: 529 * Getting the jitter requires a number of steps:
@@ -609,15 +608,7 @@ double jitter_request(const char *host, int *status){
609 608
610 req.count = htons(MAX_CM_SIZE); 609 req.count = htons(MAX_CM_SIZE);
611 DBG(printf("recieving READVAR response...\n")); 610 DBG(printf("recieving READVAR response...\n"));
612 611 read(conn, &req, SIZEOF_NTPCM(req));
613 /* cov-66524 - req.data not null terminated before usage. Also covers verifying struct was returned correctly*/
614 if ((bytes_read = read(conn, &req, SIZEOF_NTPCM(req))) == -1)
615 die(STATE_UNKNOWN, _("Cannot read from socket: %s"), strerror(errno));
616 if (bytes_read != ntp_cm_ints + req.count)
617 die(STATE_UNKNOWN, _("Invalid NTP response: %d bytes read does not equal %d plus %d data segment"), bytes_read, ntp_cm_ints, req.count);
618 /* else null terminate */
619 req.data[req.count] = '\0';
620
621 DBG(print_ntp_control_message(&req)); 612 DBG(print_ntp_control_message(&req));
622 613
623 if(req.op&REM_ERROR && strstr(getvar, "jitter")) { 614 if(req.op&REM_ERROR && strstr(getvar, "jitter")) {