X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fntpd.c;h=90fdfd7c587628fd8f035dd43ae9d28b47f87094;hb=d35dd47646956b011a75084a979fd7850cea9a6b;hp=95af8ba573f967d982c41171fd4d7c213a9169bf;hpb=d5cbc9ae228caabbd57b3713a687548b6eb9c46b;p=collectd.git diff --git a/src/ntpd.c b/src/ntpd.c index 95af8ba5..90fdfd7c 100644 --- a/src/ntpd.c +++ b/src/ntpd.c @@ -1,6 +1,6 @@ /** * collectd - src/ntpd.c - * Copyright (C) 2006 Florian octo Forster + * Copyright (C) 2006-2007 Florian octo Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -23,15 +23,6 @@ #include "common.h" #include "plugin.h" #include "configfile.h" -#include "utils_debug.h" - -#define MODULE_NAME "ntpd" - -#if HAVE_SYS_SOCKET_H -# define NTPD_HAVE_READ 1 -#else -# define NTPD_HAVE_READ 0 -#endif #if HAVE_STDINT_H # include @@ -45,37 +36,31 @@ #if HAVE_NETINET_IN_H # include #endif +#if HAVE_ARPA_INET_H +# include /* inet_ntoa */ +#endif #if HAVE_NETINET_TCP_H # include #endif -#if HAVE_SYS_POLL_H -# include +#if HAVE_POLL_H +# include #endif -/* drift */ -static char *time_offset_file = "ntpd/time_offset-%s.rrd"; -static char *time_offset_ds_def[] = +static const char *config_keys[] = { - "DS:ms:GAUGE:"COLLECTD_HEARTBEAT":-1000000:1000000", - NULL + "Host", + "Port", + "ReverseLookups" }; -static int time_offset_ds_num = 1; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); -static char *frequency_offset_file = "ntpd/frequency_offset-%s.rrd"; -static char *frequency_offset_ds_def[] = -{ - "DS:ppm:GAUGE:"COLLECTD_HEARTBEAT":-1000000:1000000", - NULL -}; -static int frequency_offset_ds_num = 1; +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; -#endif +static char ntpd_port[16]; /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * The following definitions were copied from the NTPd distribution * @@ -87,6 +72,9 @@ static char *ntpd_port = NULL; #define IMPL_XNTPD 3 #define FP_FRAC 65536.0 +#define REFCLOCK_ADDR 0x7f7f0000 /* 127.127.0.0 */ +#define REFCLOCK_MASK 0xffff0000 /* 255.255.0.0 */ + /* This structure is missing the message authentication code, since collectd * doesn't use it. */ struct req_pkt @@ -246,53 +234,80 @@ struct info_kernel int32_t errcnt; int32_t stbcnt; }; + +/* List of reference clock names */ +static char *refclock_names[] = +{ + "UNKNOWN", "LOCAL", "GPS_TRAK", "WWV_PST", /* 0- 3 */ + "SPECTRACOM", "TRUETIME", "IRIG_AUDIO", "CHU_AUDIO", /* 4- 7 */ + "GENERIC", "GPS_MX4200", "GPS_AS2201", "GPS_ARBITER", /* 8-11 */ + "IRIG_TPRO", "ATOM_LEITCH", "MSF_EES", "GPSTM_TRUE", /* 12-15 */ + "GPS_BANC", "GPS_DATUM", "ACTS_NIST", "WWV_HEATH", /* 16-19 */ + "GPS_NMEA", "GPS_VME", "PPS", "ACTS_PTB", /* 20-23 */ + "ACTS_USNO", "TRUETIME", "GPS_HP", "MSF_ARCRON", /* 24-27 */ + "SHM", "GPS_PALISADE", "GPS_ONCORE", "GPS_JUPITER", /* 28-31 */ + "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" /* 44 */ +}; +static int refclock_names_num = STATIC_ARRAY_SIZE (refclock_names); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * End of the copied stuff.. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -static void ntpd_init (void) -{ - return; -} - -static void ntpd_write_time_offset (char *host, char *inst, char *val) -{ - char buf[256]; - int status; - - status = snprintf (buf, 256, time_offset_file, inst); - if ((status < 1) || (status >= 256)) - return; - - rrd_update_file (host, buf, val, - time_offset_ds_def, time_offset_ds_num); -} - -static void ntpd_write_frequency_offset (char *host, char *inst, char *val) +static int ntpd_config (const char *key, const char *value) { - char buf[256]; - int status; - - status = snprintf (buf, 256, frequency_offset_file, inst); - if ((status < 1) || (status >= 256)) - return; + 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) + { + 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 + { + return (-1); + } - rrd_update_file (host, buf, val, - frequency_offset_ds_def, frequency_offset_ds_num); + return (0); } -#if NTPD_HAVE_READ -static void ntpd_submit (char *type, char *inst, double value) +static void ntpd_submit (char *type, char *type_inst, double value) { - char buf[256]; + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - if (snprintf (buf, 256, "%u:%.8f", (unsigned int) curtime, value) >= 256) - return; + values[0].gauge = value; - DBG ("type = %s; inst = %s; value = %s;", - type, inst, buf); + vl.values = values; + vl.values_len = 1; + vl.time = time (NULL); + strcpy (vl.host, hostname_g); + strcpy (vl.plugin, "ntpd"); + strcpy (vl.plugin_instance, ""); + strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); - plugin_submit (type, inst, buf); + plugin_dispatch_values (type, &vl); } /* returns `tv0 - tv1' in milliseconds or 0 if `tv1 > tv0' */ @@ -333,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); } @@ -383,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; @@ -432,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 */ @@ -443,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); } @@ -456,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))) @@ -464,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; } @@ -484,47 +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)); + 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; } @@ -532,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)); } @@ -540,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; } @@ -588,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; } @@ -599,34 +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); 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 */ @@ -634,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++; @@ -645,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) @@ -678,12 +728,17 @@ 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) + { + DEBUG ("`swrite' failed. Closing socket #%i", sd); + close (sd); + sock_descr = sd = -1; return (status); + } return (0); } @@ -711,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); } @@ -726,7 +781,7 @@ static double ntpd_read_fp (int32_t val_int) return (val_double); } -static void ntpd_read (void) +static int ntpd_read (void) { struct info_kernel *ik; int ik_num; @@ -750,19 +805,19 @@ static void ntpd_read (void) if (status != 0) { - DBG ("ntpd_do_query failed with status %i", status); - return; + 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; + 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", @@ -770,9 +825,9 @@ static void ntpd_read (void) ntpd_read_fp (ik->freq), ntpd_read_fp (ik->esterror)); - ntpd_submit ("ntpd_frequency_offset", "loop", ntpd_read_fp (ik->freq)); - ntpd_submit ("ntpd_time_offset", "loop", ntpd_read_fp (ik->offset)); - ntpd_submit ("ntpd_time_offset", "error", ntpd_read_fp (ik->esterror)); + ntpd_submit ("frequency_offset", "loop", ntpd_read_fp (ik->freq)); + ntpd_submit ("time_offset", "loop", ntpd_read_fp (ik->offset)); + ntpd_submit ("time_offset", "error", ntpd_read_fp (ik->esterror)); free (ik); ik = NULL; @@ -783,29 +838,106 @@ static void ntpd_read (void) sizeof (struct info_peer_summary)); if (status != 0) { - DBG ("ntpd_do_query failed with status %i", status); - return; + 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; + return (-1); } for (i = 0; i < ps_num; i++) { struct info_peer_summary *ptr; double offset; - ptr = ps + i; - if (((ntohl (ptr->dstadr) & 0x7F000000) == 0x7F000000) || (ptr->dstadr == 0)) - continue; + char peername[NI_MAXHOST]; + int refclock_id; + + ptr = ps + i; + refclock_id = 0; /* Convert the `long floating point' offset value to double */ M_LFPTOD (ntohl (ptr->offset_int), ntohl (ptr->offset_frc), offset); - DBG ("peer %i:\n" + /* 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; + + refclock_id = (ntohl (ptr->srcadr) >> 8) & 0x000000FF; + + if (refclock_id < refclock_names_num) + { + strncpy (peername, refclock_names[refclock_id], + sizeof (peername)); + } + else + { + memset ((void *) &addr_obj, '\0', sizeof (addr_obj)); + addr_obj.s_addr = ptr->srcadr; + addr_str = inet_ntoa (addr_obj); + + strncpy (peername, addr_str, sizeof (peername)); + } + } + else /* Normal network host. */ + { + struct sockaddr_storage sa; + socklen_t sa_len; + int flags = 0; + + memset (&sa, '\0', sizeof (sa)); + + if (ptr->v6_flag) + { + 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 + { + 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; + } + } + + DEBUG ("peer %i:\n" + " peername = %s\n" " srcadr = 0x%08x\n" " delay = %f\n" " offset_int = %i\n" @@ -813,28 +945,30 @@ static void ntpd_read (void) " offset = %f\n" " dispersion = %f\n", i, + peername, ntohl (ptr->srcadr), ntpd_read_fp (ptr->delay), ntohl (ptr->offset_int), ntohl (ptr->offset_frc), offset, ntpd_read_fp (ptr->dispersion)); + + if (refclock_id != 1) /* not the system clock (offset will always be zero.. */ + ntpd_submit ("time_offset", peername, offset); + ntpd_submit ("time_dispersion", peername, ntpd_read_fp (ptr->dispersion)); + if (refclock_id == 0) /* not a reference clock */ + ntpd_submit ("delay", peername, ntpd_read_fp (ptr->delay)); } free (ps); ps = NULL; - return; -} -#else -# define ntpd_read NULL -#endif /* NTPD_HAVE_READ */ + return (0); +} /* int ntpd_read */ void module_register (void) { - plugin_register (MODULE_NAME, ntpd_init, ntpd_read, NULL); - plugin_register ("ntpd_time_offset", NULL, NULL, ntpd_write_time_offset); - plugin_register ("ntpd_frequency_offset", NULL, NULL, ntpd_write_frequency_offset); -} - -#undef MODULE_NAME + plugin_register_config ("ntpd", ntpd_config, + config_keys, config_keys_num); + plugin_register_read ("ntpd", ntpd_read); +} /* void module_register */