X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fntpd.c;h=90fdfd7c587628fd8f035dd43ae9d28b47f87094;hb=a2ef6243e563dae68c71d58c1d9af924a5817e5a;hp=e4a230b3cc7942ea39b4707f6656b59d365bd19f;hpb=2d897a731bd23f7a33b89e7b7e3004b6b26b5a94;p=collectd.git diff --git a/src/ntpd.c b/src/ntpd.c index e4a230b3..90fdfd7c 100644 --- a/src/ntpd.c +++ b/src/ntpd.c @@ -23,13 +23,6 @@ #include "common.h" #include "plugin.h" #include "configfile.h" -#include "utils_debug.h" - -#if HAVE_SYS_SOCKET_H -# define NTPD_HAVE_READ 1 -#else -# define NTPD_HAVE_READ 0 -#endif #if HAVE_STDINT_H # include @@ -53,50 +46,21 @@ # include #endif -static data_source_t seconds_dsrc[1] = -{ - {"seconds", DS_TYPE_GAUGE, -1000000.0, 1000000.0} -}; - -static data_set_t time_offset_ds = -{ - "time_offset", 1, seconds_dsrc -}; - -static data_set_t time_dispersion_ds = -{ - "time_dispersion", 1, seconds_dsrc -}; - -static data_set_t delay_ds = -{ - "delay", 1, seconds_dsrc -}; - -static data_source_t ppm_dsrc[1] = -{ - {"ppm", DS_TYPE_GAUGE, -1000000.0, 1000000.0} -}; - -static data_set_t frequency_offset_ds = -{ - "frequency_offset", 1, ppm_dsrc -}; - static const char *config_keys[] = { "Host", "Port", - NULL + "ReverseLookups" }; -static int config_keys_num = 2; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); + +static int do_reverse_lookups = 1; -#if NTPD_HAVE_READ # define NTPD_DEFAULT_HOST "localhost" # define NTPD_DEFAULT_PORT "123" static int sock_descr = -1; static char *ntpd_host = NULL; -static char *ntpd_port = NULL; +static char ntpd_port[16]; /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * The following definitions were copied from the NTPd distribution * @@ -285,28 +249,40 @@ static char *refclock_names[] = "CHRONOLOG", "DUMBCLOCK", "ULINK_M320", "PCF", /* 32-35 */ "WWV_AUDIO", "GPS_FG", "HOPF_S", "HOPF_P", /* 36-39 */ "JJY", "TT_IRIG", "GPS_ZYFER", "GPS_RIPENCC", /* 40-43 */ - "NEOCLK4X", NULL /* 44 */ + "NEOCLK4X" /* 44 */ }; -static int refclock_names_num = 45; +static int refclock_names_num = STATIC_ARRAY_SIZE (refclock_names); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * End of the copied stuff.. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ static int ntpd_config (const char *key, const char *value) { - if (strcasecmp (key, "host") == 0) + if (strcasecmp (key, "Host") == 0) { if (ntpd_host != NULL) free (ntpd_host); if ((ntpd_host = strdup (value)) == NULL) return (1); } - else if (strcasecmp (key, "port") == 0) + else if (strcasecmp (key, "Port") == 0) { - if (ntpd_port != NULL) - free (ntpd_port); - if ((ntpd_port = strdup (value)) == NULL) - return (1); + int port = (int) (atof (value)); + if ((port > 0) && (port <= 65535)) + snprintf (ntpd_port, sizeof (ntpd_port), + "%i", port); + else + strncpy (ntpd_port, value, sizeof (ntpd_port)); + ntpd_port[sizeof (ntpd_port) - 1] = '\0'; + } + else if (strcasecmp (key, "ReverseLookups") == 0) + { + if ((strcasecmp (value, "True") == 0) + || (strcasecmp (value, "Yes") == 0) + || (strcasecmp (value, "On") == 0)) + do_reverse_lookups = 1; + else + do_reverse_lookups = 0; } else { @@ -372,30 +348,33 @@ static int ntpd_connect (void) if (sock_descr >= 0) return (sock_descr); - DBG ("Opening a new socket"); + DEBUG ("Opening a new socket"); host = ntpd_host; if (host == NULL) host = NTPD_DEFAULT_HOST; port = ntpd_port; - if (port == NULL) + if (strlen (port) == 0) port = NTPD_DEFAULT_PORT; memset (&ai_hints, '\0', sizeof (ai_hints)); - ai_hints.ai_flags = AI_ADDRCONFIG; + 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; if ((status = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0) { - DBG ("getaddrinfo (%s, %s): %s", - host, port, - status == EAI_SYSTEM ? strerror (errno) : gai_strerror (status)); - syslog (LOG_ERR, "ntpd plugin: getaddrinfo (%s, %s): %s", + char errbuf[1024]; + ERROR ("ntpd plugin: getaddrinfo (%s, %s): %s", host, port, - status == EAI_SYSTEM ? strerror (errno) : gai_strerror (status)); + (status == EAI_SYSTEM) + ? sstrerror (errno, errbuf, sizeof (errbuf)) + : gai_strerror (status)); return (-1); } @@ -422,15 +401,14 @@ static int ntpd_connect (void) if (sock_descr < 0) { - DBG ("Unable to connect to server."); - syslog (LOG_ERR, "ntpd plugin: Unable to connect to server."); + ERROR ("ntpd plugin: Unable to connect to server."); } return (sock_descr); } /* For a description of the arguments see `ntpd_do_query' below. */ -static int ntpd_receive_response (int req_code, int *res_items, int *res_size, +static int ntpd_receive_response (int *res_items, int *res_size, char **res_data, int res_item_size) { int sd; @@ -471,8 +449,9 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, if (gettimeofday (&time_end, NULL) < 0) { - syslog (LOG_ERR, "ntpd plugin: gettimeofday failed: %s", - strerror (errno)); + char errbuf[1024]; + ERROR ("ntpd plugin: gettimeofday failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } time_end.tv_sec++; /* wait for a most one second */ @@ -482,8 +461,9 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, { if (gettimeofday (&time_now, NULL) < 0) { - syslog (LOG_ERR, "ntpd plugin: gettimeofday failed: %s", - strerror (errno)); + char errbuf[1024]; + ERROR ("ntpd plugin: gettimeofday failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } @@ -495,7 +475,7 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, poll_s.events = POLLIN | POLLPRI; poll_s.revents = 0; - DBG ("Polling for %ims", timeout); + DEBUG ("Polling for %ims", timeout); status = poll (&poll_s, 1, timeout); if ((status < 0) && ((errno == EAGAIN) || (errno == EINTR))) @@ -503,15 +483,15 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, if (status < 0) { - DBG ("poll failed: %s", strerror (errno)); - syslog (LOG_ERR, "ntpd plugin: poll failed: %s", - strerror (errno)); + char errbuf[1024]; + ERROR ("ntpd plugin: poll failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } if (status == 0) /* timeout */ { - DBG ("timeout reached."); + DEBUG ("timeout reached."); break; } @@ -523,50 +503,52 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, if (status < 0) { - DBG ("recv(2) failed: %s", strerror (errno)); - DBG ("Closing socket #%i", sd); + char errbuf[1024]; + INFO ("recv(2) failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + DEBUG ("Closing socket #%i", sd); close (sd); sock_descr = sd = -1; return (-1); } - DBG ("recv'd %i bytes", status); + DEBUG ("recv'd %i bytes", status); /* * Do some sanity checks first */ if (status < RESP_HEADER_SIZE) { - syslog (LOG_WARNING, "ntpd plugin: Short (%i bytes) packet received", + WARNING ("ntpd plugin: Short (%i bytes) packet received", (int) status); continue; } if (INFO_MODE (res.rm_vn_mode) != MODE_PRIVATE) { - syslog (LOG_NOTICE, "ntpd plugin: Packet received with mode %i", + NOTICE ("ntpd plugin: Packet received with mode %i", INFO_MODE (res.rm_vn_mode)); continue; } if (INFO_IS_AUTH (res.auth_seq)) { - syslog (LOG_NOTICE, "ntpd plugin: Encrypted packet received"); + NOTICE ("ntpd plugin: Encrypted packet received"); continue; } if (!ISRESPONSE (res.rm_vn_mode)) { - syslog (LOG_NOTICE, "ntpd plugin: Received request packet, " + NOTICE ("ntpd plugin: Received request packet, " "wanted response"); continue; } if (INFO_MBZ (res.mbz_itemsize)) { - syslog (LOG_WARNING, "ntpd plugin: Received packet with nonzero " + WARNING ("ntpd plugin: Received packet with nonzero " "MBZ field!"); continue; } if (res.implementation != IMPL_XNTPD) { - syslog (LOG_WARNING, "ntpd plugin: Asked for request of type %i, " + WARNING ("ntpd plugin: Asked for request of type %i, " "got %i", (int) IMPL_XNTPD, (int) res.implementation); continue; } @@ -574,7 +556,7 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, /* Check for error code */ if (INFO_ERR (res.err_nitems) != 0) { - syslog (LOG_ERR, "ntpd plugin: Received error code %i", + ERROR ("ntpd plugin: Received error code %i", (int) INFO_ERR(res.err_nitems)); return ((int) INFO_ERR (res.err_nitems)); } @@ -582,47 +564,62 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, /* extract number of items in this packet and the size of these items */ pkt_item_num = INFO_NITEMS (res.err_nitems); pkt_item_len = INFO_ITEMSIZE (res.mbz_itemsize); - DBG ("pkt_item_num = %i; pkt_item_len = %i;", + DEBUG ("pkt_item_num = %i; pkt_item_len = %i;", pkt_item_num, pkt_item_len); /* Check if the reported items fit in the packet */ if ((pkt_item_num * pkt_item_len) > (status - RESP_HEADER_SIZE)) { - syslog (LOG_ERR, "ntpd plugin: %i items * %i bytes > " + ERROR ("ntpd plugin: %i items * %i bytes > " "%i bytes - %i bytes header", (int) pkt_item_num, (int) pkt_item_len, (int) status, (int) RESP_HEADER_SIZE); continue; } + if (pkt_item_len > res_item_size) + { + ERROR ("ntpd plugin: (pkt_item_len = %i) " + ">= (res_item_size = %i)", + pkt_item_len, res_item_size); + continue; + } + /* If this is the first packet (time wise, not sequence wise), * set `res_size'. If it's not the first packet check if the * items have the same size. Discard invalid packets. */ if (items_num == 0) /* first packet */ { - DBG ("*res_size = %i", pkt_item_len); + DEBUG ("*res_size = %i", pkt_item_len); *res_size = pkt_item_len; } else if (*res_size != pkt_item_len) { - DBG ("Error: *res_size = %i; pkt_item_len = %i;", + DEBUG ("Error: *res_size = %i; pkt_item_len = %i;", *res_size, pkt_item_len); - syslog (LOG_ERR, "Item sizes differ."); + ERROR ("Item sizes differ."); continue; } + /* + * Because the items in the packet may be smaller than the + * items requested, the following holds true: + */ + assert ((*res_size == pkt_item_len) + && (pkt_item_len <= res_item_size)); + /* Calculate the padding. No idea why there might be any padding.. */ pkt_padding = 0; - if (res_item_size > pkt_item_len) + if (pkt_item_len < res_item_size) pkt_padding = res_item_size - pkt_item_len; - DBG ("res_item_size = %i; pkt_padding = %i;", + DEBUG ("res_item_size = %i; pkt_padding = %i;", res_item_size, pkt_padding); /* Extract the sequence number */ pkt_sequence = INFO_SEQ (res.auth_seq); if ((pkt_sequence < 0) || (pkt_sequence > MAXSEQ)) { - syslog (LOG_ERR, "ntpd plugin: Received packet with sequence %i", + ERROR ("ntpd plugin: Received packet with sequence %i", pkt_sequence); continue; } @@ -630,7 +627,7 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, /* Check if this sequence has been received before. If so, discard it. */ if (pkt_recvd[pkt_sequence] != '\0') { - syslog (LOG_NOTICE, "ntpd plugin: Sequence %i received twice", + NOTICE ("ntpd plugin: Sequence %i received twice", pkt_sequence); continue; } @@ -641,35 +638,43 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, { if (pkt_lastseq != -1) { - syslog (LOG_ERR, "ntpd plugin: Two packets which both " + ERROR ("ntpd plugin: Two packets which both " "claim to be the last one in the " "sequence have been received."); continue; } pkt_lastseq = pkt_sequence; - DBG ("Last sequence = %i;", pkt_lastseq); + DEBUG ("Last sequence = %i;", pkt_lastseq); } /* * Enough with the checks. Copy the data now. * We start by allocating some more memory. */ - DBG ("realloc (%p, %i)", (void *) *res_data, + DEBUG ("realloc (%p, %i)", (void *) *res_data, (items_num + pkt_item_num) * res_item_size); items = realloc ((void *) *res_data, (items_num + pkt_item_num) * res_item_size); - items_num += pkt_item_num; if (items == NULL) { items = *res_data; - syslog (LOG_ERR, "ntpd plugin: realloc failed."); + ERROR ("ntpd plugin: realloc failed."); continue; } + items_num += pkt_item_num; *res_data = items; for (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 + * dst to the first byte after that. */ void *dst = (void *) (*res_data + ((*res_items) * res_item_size)); + /* src: We use `pkt_item_len' to calculate the offset + * from the beginning of the packet, because the + * items in the packet may be smaller than the + * items that were requested. We skip `i' such + * items. */ void *src = (void *) (((char *) res.data) + (i * pkt_item_len)); /* Set the padding to zeros */ @@ -677,8 +682,10 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, memset (dst, '\0', res_item_size); memcpy (dst, src, (size_t) pkt_item_len); + /* Increment `*res_items' by one, so `dst' will end up + * one further in the next round. */ (*res_items)++; - } + } /* for (pkt_item_num) */ pkt_recvd[pkt_sequence] = (char) 1; pkt_recvd_num++; @@ -688,7 +695,7 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size, } /* while (done == 0) */ return (0); -} +} /* int ntpd_receive_response */ /* For a description of the arguments see `ntpd_do_query' below. */ static int ntpd_send_request (int req_code, int req_items, int req_size, char *req_data) @@ -721,13 +728,13 @@ static int ntpd_send_request (int req_code, int req_items, int req_size, char *r if (req_data != NULL) memcpy ((void *) req.data, (const void *) req_data, req_data_len); - DBG ("req_items = %i; req_size = %i; req_data = %p;", + DEBUG ("req_items = %i; req_size = %i; req_data = %p;", req_items, req_size, (void *) req_data); status = swrite (sd, (const char *) &req, REQ_LEN_NOMAC); if (status < 0) { - DBG ("`swrite' failed. Closing socket #%i", sd); + DEBUG ("`swrite' failed. Closing socket #%i", sd); close (sd); sock_descr = sd = -1; return (status); @@ -759,7 +766,7 @@ static int ntpd_do_query (int req_code, int req_items, int req_size, char *req_d if (status != 0) return (status); - status = ntpd_receive_response (req_code, res_items, res_size, res_data, + status = ntpd_receive_response (res_items, res_size, res_data, res_item_size); return (status); } @@ -798,19 +805,19 @@ static int ntpd_read (void) if (status != 0) { - DBG ("ntpd_do_query failed with status %i", status); + DEBUG ("ntpd_do_query failed with status %i", status); return (-1); } if ((ik == NULL) || (ik_num == 0) || (ik_size == 0)) { - DBG ("ntpd_do_query returned: ik = %p; ik_num = %i; ik_size = %i;", + DEBUG ("ntpd_do_query returned: ik = %p; ik_num = %i; ik_size = %i;", (void *) ik, ik_num, ik_size); return (-1); } /* kerninfo -> estimated error */ - DBG ("info_kernel:\n" + DEBUG ("info_kernel:\n" " pll offset = %.8f\n" " pll frequency = %.8f\n" /* drift compensation */ " est error = %.8f\n", @@ -831,12 +838,12 @@ static int ntpd_read (void) sizeof (struct info_peer_summary)); if (status != 0) { - DBG ("ntpd_do_query failed with status %i", status); + DEBUG ("ntpd_do_query failed with status %i", status); return (-1); } if ((ps == NULL) || (ps_num == 0) || (ps_size == 0)) { - DBG ("ntpd_do_query returned: ps = %p; ps_num = %i; ps_size = %i;", + DEBUG ("ntpd_do_query returned: ps = %p; ps_num = %i; ps_size = %i;", (void *) ps, ps_num, ps_size); return (-1); } @@ -852,37 +859,13 @@ static int ntpd_read (void) ptr = ps + i; refclock_id = 0; - /* - if (((ntohl (ptr->dstadr) & 0xFFFFFF00) == 0x7F000000) || (ptr->dstadr == 0)) - continue; - */ - /* Convert the `long floating point' offset value to double */ M_LFPTOD (ntohl (ptr->offset_int), ntohl (ptr->offset_frc), offset); - if (ptr->v6_flag) - { - struct sockaddr_in6 sa; - - memset (&sa, 0, sizeof (sa)); - sa.sin6_family = AF_INET6; - sa.sin6_port = htons (123); - memcpy (&sa.sin6_addr, &ptr->srcadr6, sizeof (struct in6_addr)); - - status = getnameinfo ((const struct sockaddr *) &sa, - sizeof (sa), - peername, sizeof (peername), - NULL, 0, 0 /* no flags */); - if (status != 0) - { - syslog (LOG_ERR, "ntpd plugin: getnameinfo failed: %s", - status == EAI_SYSTEM - ? strerror (errno) - : gai_strerror (status)); - continue; - } - } - else if ((ntohl (ptr->srcadr) & REFCLOCK_MASK) == REFCLOCK_ADDR) + /* Special IP addresses for hardware clocks and stuff.. */ + if (!ptr->v6_flag + && ((ntohl (ptr->srcadr) & REFCLOCK_MASK) + == REFCLOCK_ADDR)) { struct in_addr addr_obj; char *addr_str; @@ -903,29 +886,57 @@ static int ntpd_read (void) strncpy (peername, addr_str, sizeof (peername)); } } - else /* IPv4 */ + else /* Normal network host. */ { - struct in_addr addr_obj; - struct hostent *addr_he; - char *addr_str; + struct sockaddr_storage sa; + socklen_t sa_len; + int flags = 0; - memset ((void *) &addr_obj, '\0', sizeof (addr_obj)); - addr_obj.s_addr = ptr->srcadr; - addr_str = inet_ntoa (addr_obj); + memset (&sa, '\0', sizeof (sa)); - addr_he = gethostbyaddr ((const void *) &addr_obj, - sizeof (addr_obj), AF_INET); - if (addr_he != NULL) + if (ptr->v6_flag) { - strncpy (peername, addr_he->h_name, sizeof (peername)); + struct sockaddr_in6 *sa_ptr; + sa_ptr = (struct sockaddr_in6 *) &sa; + + sa_ptr->sin6_family = AF_INET6; + sa_ptr->sin6_port = htons (123); + memcpy (&sa_ptr->sin6_addr, &ptr->srcadr6, + sizeof (struct in6_addr)); + sa_len = sizeof (struct sockaddr_in6); } else { - strncpy (peername, addr_str, sizeof (peername)); + struct sockaddr_in *sa_ptr; + sa_ptr = (struct sockaddr_in *) &sa; + + sa_ptr->sin_family = AF_INET; + sa_ptr->sin_port = htons (123); + memcpy (&sa_ptr->sin_addr, &ptr->srcadr, + sizeof (struct in_addr)); + sa_len = sizeof (struct sockaddr_in); + } + + if (do_reverse_lookups == 0) + flags |= NI_NUMERICHOST; + + status = getnameinfo ((const struct sockaddr *) &sa, + sa_len, + peername, sizeof (peername), + NULL, 0, /* No port name */ + flags); + if (status != 0) + { + char errbuf[1024]; + ERROR ("ntpd plugin: getnameinfo failed: %s", + (status == EAI_SYSTEM) + ? sstrerror (errno, errbuf, sizeof (errbuf)) + : gai_strerror (status)); + continue; } } - DBG ("peer %i:\n" + DEBUG ("peer %i:\n" " peername = %s\n" " srcadr = 0x%08x\n" " delay = %f\n" @@ -954,17 +965,10 @@ static int ntpd_read (void) return (0); } /* int ntpd_read */ -#endif /* NTPD_HAVE_READ */ void module_register (void) { - plugin_register_data_set (&time_offset_ds); - plugin_register_data_set (&time_dispersion_ds); - plugin_register_data_set (&delay_ds); - plugin_register_data_set (&frequency_offset_ds); - -#if NTPD_HAVE_READ - plugin_register_config ("ntpd", ntpd_config, config_keys, config_keys_num); + plugin_register_config ("ntpd", ntpd_config, + config_keys, config_keys_num); plugin_register_read ("ntpd", ntpd_read); -#endif /* NTPD_HAVE_READ */ -} +} /* void module_register */