diff options
| author |  Holger Weiss <holger@zedat.fu-berlin.de>
| 2014-11-30 23:39:59 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de>
| 2014-11-30 23:39:59 +0100 |
| commit | 5871123e0a5f520f810b2cfe03cef16c4c5a1aee (patch) | |
| tree | 5d762cfbfbb097f85c71dc73da87b80c6e9c3d7e | |
| parent | 30f0eeed578a1606eb53e135c1c5417d61d56295 (diff) | |
| download | monitoring-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
| -rw-r--r-- | plugins/check_ntp.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 546802a3..0a7640a7 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){ double jitter_request(const char *host, int *status){ int conn=-1, i, npeers=0, num_candidates=0, syncsource_found=0; int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0; - int peers_size=0, peer_offset=0, bytes_read=0; + int peers_size=0, peer_offset=0; ntp_assoc_status_pair *peers=NULL; ntp_control_message req; const char *getvar = "jitter"; double rval = 0.0, jitter = -1.0; char *startofvalue=NULL, *nptr=NULL; void *tmp; - int ntp_cm_ints = sizeof(uint16_t) * 5 + sizeof(uint8_t) * 2; /* Long-winded explanation: * Getting the jitter requires a number of steps: @@ -609,15 +608,7 @@ double jitter_request(const char *host, int *status){ req.count = htons(MAX_CM_SIZE); DBG(printf("recieving READVAR response...\n")); - - /* cov-66524 - req.data not null terminated before usage. Also covers verifying struct was returned correctly*/ - if ((bytes_read = read(conn, &req, SIZEOF_NTPCM(req))) == -1) - die(STATE_UNKNOWN, _("Cannot read from socket: %s"), strerror(errno)); - if (bytes_read != ntp_cm_ints + req.count) - die(STATE_UNKNOWN, _("Invalid NTP response: %d bytes read does not equal %d plus %d data segment"), bytes_read, ntp_cm_ints, req.count); - /* else null terminate */ - req.data[req.count] = '\0'; - + read(conn, &req, SIZEOF_NTPCM(req)); DBG(print_ntp_control_message(&req)); if(req.op&REM_ERROR && strstr(getvar, "jitter")) { |