X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fntpd.c;h=a0093655e4066493cae5f0c3f5533b5ececb705f;hb=b55658bb615f6d33e70791d2a7d2a0f2114598cc;hp=ee2c048ee6ec2eea1d2325daed3dca0bd9445aef;hpb=6164fe4456716e6dc36aaa2ab617b104a7ac5ff3;p=collectd.git diff --git a/src/ntpd.c b/src/ntpd.c index ee2c048e..a0093655 100644 --- a/src/ntpd.c +++ b/src/ntpd.c @@ -28,6 +28,7 @@ #define _BSD_SOURCE /* For NI_MAXHOST */ #include "collectd.h" + #include "common.h" #include "plugin.h" #include "configfile.h" @@ -51,6 +52,10 @@ # include #endif +#ifndef STA_NANO +# define STA_NANO 0x2000 +#endif + static const char *config_keys[] = { "Host", @@ -163,16 +168,16 @@ struct resp_pkt /* l_fp to double */ #define M_LFPTOD(r_i, r_uf, d) \ do { \ - register int32_t i; \ - register uint32_t f; \ + register int32_t ri; \ + register uint32_t rf; \ \ - i = (r_i); \ - f = (r_uf); \ - if (i < 0) { \ - M_NEG(i, f); \ - (d) = -((double) i + ((double) f) / 4294967296.0); \ + ri = (r_i); \ + rf = (r_uf); \ + if (ri < 0) { \ + M_NEG(ri, rf); \ + (d) = -((double) ri + ((double) rf) / 4294967296.0); \ } else { \ - (d) = (double) i + ((double) f) / 4294967296.0; \ + (d) = (double) ri + ((double) rf) / 4294967296.0; \ } \ } while (0) @@ -247,7 +252,7 @@ struct info_kernel }; /* List of reference clock names */ -static char *refclock_names[] = +static const char *refclock_names[] = { "UNKNOWN", "LOCAL", "GPS_TRAK", "WWV_PST", /* 0- 3 */ "SPECTRACOM", "TRUETIME", "IRIG_AUDIO", "CHU_AUDIO", /* 4- 7 */ @@ -307,7 +312,7 @@ static int ntpd_config (const char *key, const char *value) return (0); } -static void ntpd_submit (char *type, char *type_inst, gauge_t value) +static void ntpd_submit (const char *type, const char *type_inst, gauge_t value) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; @@ -328,8 +333,8 @@ static void ntpd_submit (char *type, char *type_inst, gauge_t value) /* Each time a peer is polled, ntpd shifts the reach register to the left and * sets the LSB based on whether the peer was reachable. If the LSB is zero, * the values are out of date. */ -static void ntpd_submit_reach (char *type, char *type_inst, uint8_t reach, - gauge_t value) +static void ntpd_submit_reach (const char *type, const char *type_inst, + uint8_t reach, gauge_t value) { if (!(reach & 1)) value = NAN; @@ -339,12 +344,10 @@ static void ntpd_submit_reach (char *type, char *type_inst, uint8_t reach, static int ntpd_connect (void) { - char *host; - char *port; + const char *host; + const char *port; - struct addrinfo ai_hints; struct addrinfo *ai_list; - struct addrinfo *ai_ptr; int status; if (sock_descr >= 0) @@ -360,14 +363,12 @@ static int ntpd_connect (void) if (strlen (port) == 0) port = NTPD_DEFAULT_PORT; - memset (&ai_hints, '\0', sizeof (ai_hints)); - ai_hints.ai_flags = 0; -#ifdef AI_ADDRCONFIG - ai_hints.ai_flags |= AI_ADDRCONFIG; -#endif - ai_hints.ai_family = PF_UNSPEC; - ai_hints.ai_socktype = SOCK_DGRAM; - ai_hints.ai_protocol = IPPROTO_UDP; + struct addrinfo ai_hints = { + .ai_family = AF_UNSPEC, + .ai_flags = AI_ADDRCONFIG, + .ai_protocol = IPPROTO_UDP, + .ai_socktype = SOCK_DGRAM + }; if ((status = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0) { @@ -380,7 +381,7 @@ static int ntpd_connect (void) return (-1); } - for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) + for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) { /* create our socket descriptor */ if ((sock_descr = socket (ai_ptr->ai_family, @@ -418,7 +419,6 @@ static int ntpd_receive_response (int *res_items, int *res_size, struct resp_pkt res; int status; int done; - int i; char *items; size_t items_num; @@ -427,13 +427,13 @@ static int ntpd_receive_response (int *res_items, int *res_size, struct timeval time_now; int timeout; - int pkt_item_num; /* items in this packet */ - int pkt_item_len; /* size of the items in this packet */ + int pkt_item_num; /* items in this packet */ + int pkt_item_len; /* size of the items in this packet */ int pkt_sequence; - char pkt_recvd[MAXSEQ+1]; /* sequence numbers that have been received */ - int pkt_recvd_num; /* number of packets that have been received */ - int pkt_lastseq; /* the last sequence number */ - ssize_t pkt_padding; /* Padding in this packet */ + char pkt_recvd[MAXSEQ+1] = { 0 }; /* sequence numbers that have been received */ + int pkt_recvd_num; /* number of packets that have been received */ + int pkt_lastseq; /* the last sequence number */ + ssize_t pkt_padding; /* Padding in this packet */ if ((sd = ntpd_connect ()) < 0) return (-1); @@ -441,7 +441,6 @@ static int ntpd_receive_response (int *res_items, int *res_size, items = NULL; items_num = 0; - memset (pkt_recvd, '\0', sizeof (pkt_recvd)); pkt_recvd_num = 0; pkt_lastseq = -1; @@ -505,7 +504,7 @@ static int ntpd_receive_response (int *res_items, int *res_size, break; } - memset ((void *) &res, '\0', sizeof (res)); + memset (&res, '\0', sizeof (res)); status = recv (sd, (void *) &res, sizeof (res), 0 /* no flags */); if ((status < 0) && ((errno == EAGAIN) || (errno == EINTR))) @@ -663,7 +662,7 @@ static int ntpd_receive_response (int *res_items, int *res_size, */ DEBUG ("realloc (%p, %zu)", (void *) *res_data, (items_num + pkt_item_num) * res_item_size); - items = realloc ((void *) *res_data, + items = realloc (*res_data, (items_num + pkt_item_num) * res_item_size); if (items == NULL) { @@ -673,7 +672,7 @@ static int ntpd_receive_response (int *res_items, int *res_size, items_num += pkt_item_num; *res_data = items; - for (i = 0; i < pkt_item_num; i++) + for (int i = 0; i < pkt_item_num; i++) { /* dst: There are already `*res_items' items with * res_item_size bytes each in in `*res_data'. Set @@ -710,7 +709,7 @@ static int ntpd_receive_response (int *res_items, int *res_size, static int ntpd_send_request (int req_code, int req_items, int req_size, char *req_data) { int sd; - struct req_pkt req; + struct req_pkt req = { 0 }; size_t req_data_len; int status; @@ -720,7 +719,6 @@ static int ntpd_send_request (int req_code, int req_items, int req_size, char *r if ((sd = ntpd_connect ()) < 0) return (-1); - memset ((void *) &req, '\0', sizeof (req)); req.rm_vn_mode = RM_VN_MODE(0, 0, 0); req.auth_seq = AUTH_SEQ (0, 0); req.implementation = IMPL_XNTPD; @@ -801,20 +799,17 @@ static uint32_t ntpd_get_refclock_id (struct info_peer_summary const *peer_info) static int ntpd_get_name_from_address (char *buffer, size_t buffer_size, struct info_peer_summary const *peer_info, _Bool do_reverse_lookup) { - struct sockaddr_storage sa; + struct sockaddr_storage sa = { 0 }; socklen_t sa_len; int flags = 0; int status; - memset (&sa, 0, sizeof (sa)); - if (peer_info->v6_flag) { - struct sockaddr_in6 sa6; + struct sockaddr_in6 sa6 = { 0 }; assert (sizeof (sa) >= sizeof (sa6)); - memset (&sa6, 0, sizeof (sa6)); sa6.sin6_family = AF_INET6; sa6.sin6_port = htons (123); memcpy (&sa6.sin6_addr, &peer_info->srcadr6, @@ -825,11 +820,10 @@ static int ntpd_get_name_from_address (char *buffer, size_t buffer_size, } else { - struct sockaddr_in sa4; + struct sockaddr_in sa4 = { 0 }; assert (sizeof (sa) >= sizeof (sa4)); - memset (&sa4, 0, sizeof (sa4)); sa4.sin_family = AF_INET; sa4.sin_port = htons (123); memcpy (&sa4.sin_addr, &peer_info->srcadr, @@ -907,11 +901,9 @@ static int ntpd_read (void) gauge_t offset_error; int status; - int i; /* On Linux, if the STA_NANO bit is set in ik->status, then ik->offset - * is is nanoseconds, otherwise it's microseconds. - * TODO(octo): STA_NANO is defined in the Linux specific header. */ + * is is nanoseconds, otherwise it's microseconds. */ double scale_loop = 1e-6; double scale_error = 1e-6; @@ -936,6 +928,11 @@ static int ntpd_read (void) return (-1); } + if (ntohs(ik->status) & STA_NANO) { + scale_loop = 1e-9; + scale_error = 1e-9; + } + /* kerninfo -> estimated error */ offset_loop = scale_loop * ((gauge_t) ntohl (ik->offset)); freq_loop = ntpd_read_fp (ik->freq); @@ -971,7 +968,7 @@ static int ntpd_read (void) return (-1); } - for (i = 0; i < ps_num; i++) + for (int i = 0; i < ps_num; i++) { struct info_peer_summary *ptr; double offset;