X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fapcups.c;h=70e7fcea86f100d28639450bf62f483a5d9abace;hp=eb1f0622989b9793acc66cde043cb43e484808b3;hb=1326af38b3ef25c41c994cd76c043202636b3d70;hpb=68d6aff96c029c9a455b7a0146c788af08f9ff22 diff --git a/src/apcups.c b/src/apcups.c index eb1f0622..70e7fcea 100644 --- a/src/apcups.c +++ b/src/apcups.c @@ -1,6 +1,6 @@ /* * collectd - src/apcups.c - * Copyright (C) 2006-2012 Florian octo Forster + * Copyright (C) 2006-2015 Florian octo Forster * Copyright (C) 2006 Anthony Gialluca * Copyright (C) 2000-2004 Kern Sibbald * Copyright (C) 1996-1999 Andre M. Hedrick @@ -25,16 +25,13 @@ **/ #include "collectd.h" + #include "common.h" /* rrd_update_file */ #include "plugin.h" /* plugin_register, plugin_submit */ -#include "configfile.h" /* cf_register */ #if HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_SOCKET_H -# include -#endif #if HAVE_NETDB_H # include #endif @@ -43,11 +40,17 @@ # include #endif -#define NISPORT 3551 -#define MAXSTRING 256 -#define MODULE_NAME "apcups" +#ifndef APCUPS_SERVER_TIMEOUT +# define APCUPS_SERVER_TIMEOUT 15.0 +#endif -#define APCUPS_DEFAULT_HOST "localhost" +#ifndef APCUPS_DEFAULT_NODE +# define APCUPS_DEFAULT_NODE "localhost" +#endif + +#ifndef APCUPS_DEFAULT_SERVICE +# define APCUPS_DEFAULT_SERVICE "3551" +#endif /* * Private data types @@ -68,24 +71,16 @@ typedef struct * Private variables */ /* Default values for contacting daemon */ -static char *conf_host = NULL; -static int conf_port = NISPORT; +static char *conf_node = NULL; +static char *conf_service = NULL; /* Defaults to false for backwards compatibility. */ static _Bool conf_report_seconds = 0; +static _Bool conf_persistent_conn = 1; static int global_sockfd = -1; static int count_retries = 0; static int count_iterations = 0; -static _Bool close_socket = 0; - -static const char *config_keys[] = -{ - "Host", - "Port", - "ReportSeconds" -}; -static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); static int net_shutdown (int *fd) { @@ -94,7 +89,7 @@ static int net_shutdown (int *fd) if ((fd == NULL) || (*fd < 0)) return (EINVAL); - swrite (*fd, (void *) &packet_size, sizeof (packet_size)); + (void)swrite (*fd, (void *) &packet_size, sizeof (packet_size)); close (*fd); *fd = -1; @@ -116,26 +111,20 @@ static int apcups_shutdown (void) * Returns -1 on error * Returns socket file descriptor otherwise */ -static int net_open (char *host, int port) +static int net_open (char const *node, char const *service) { int sd; int status; - char port_str[8]; - struct addrinfo ai_hints; struct addrinfo *ai_return; struct addrinfo *ai_list; - assert ((port > 0x00000000) && (port <= 0x0000FFFF)); - - /* Convert the port to a string */ - ssnprintf (port_str, sizeof (port_str), "%i", port); - - /* Resolve name */ - memset ((void *) &ai_hints, '\0', sizeof (ai_hints)); - ai_hints.ai_family = AF_INET; /* XXX: Change this to `AF_UNSPEC' if apcupsd can handle IPv6 */ - ai_hints.ai_socktype = SOCK_STREAM; + /* TODO: Change this to `AF_UNSPEC' if apcupsd can handle IPv6 */ + struct addrinfo ai_hints = { + .ai_family = AF_INET, + .ai_socktype = SOCK_STREAM + }; - status = getaddrinfo (host, port_str, &ai_hints, &ai_return); + status = getaddrinfo (node, service, &ai_hints, &ai_return); if (status != 0) { char errbuf[1024]; @@ -179,7 +168,7 @@ static int net_open (char *host, int port) DEBUG ("apcups plugin: Done opening a socket %i", sd); return (sd); -} /* int net_open (char *host, char *service, int port) */ +} /* int net_open */ /* * Receive a message from the other end. Each message consists of @@ -234,7 +223,7 @@ static int net_recv (int *sockfd, char *buf, int buflen) * Returns zero on success * Returns non-zero on error */ -static int net_send (int *sockfd, char *buff, int len) +static int net_send (int *sockfd, const char *buff, int len) { uint16_t packet_size; @@ -263,7 +252,7 @@ static int net_send (int *sockfd, char *buff, int len) } /* Get and print status from apcupsd NIS server */ -static int apc_query_server (char *host, int port, +static int apc_query_server (char const *node, char const *service, apc_detail_t *apcups_detail) { int n; @@ -283,7 +272,7 @@ static int apc_query_server (char *host, int port, { if (global_sockfd < 0) { - global_sockfd = net_open (host, port); + global_sockfd = net_open (node, service); if (global_sockfd < 0) { ERROR ("apcups plugin: Connecting to the " @@ -323,13 +312,13 @@ static int apc_query_server (char *host, int port, "first %i iterations. Will close the socket " "in future iterations.", count_retries, count_iterations); - close_socket = 1; + conf_persistent_conn = 0; } while ((n = net_recv (&global_sockfd, recvline, sizeof (recvline) - 1)) > 0) { - assert ((unsigned int)n < sizeof (recvline)); - recvline[n] = '\0'; + assert ((size_t)n < sizeof (recvline)); + recvline[n] = 0; #if APCMAIN printf ("net_recv = `%s';\n", recvline); #endif /* if APCMAIN */ @@ -376,7 +365,7 @@ static int apc_query_server (char *host, int port, } status = errno; /* save errno, net_shutdown() may re-set it. */ - if (close_socket) + if (!conf_persistent_conn) net_shutdown (&global_sockfd); if (n < 0) @@ -390,43 +379,43 @@ static int apc_query_server (char *host, int port, return (0); } -static int apcups_config (const char *key, const char *value) +static int apcups_config (oconfig_item_t *ci) { - if (strcasecmp (key, "host") == 0) - { - if (conf_host != NULL) - { - free (conf_host); - conf_host = NULL; - } - if ((conf_host = strdup (value)) == NULL) - return (1); - } - else if (strcasecmp (key, "Port") == 0) + _Bool persistent_conn_set = 0; + + for (int i = 0; i < ci->children_num; i++) { - int port_tmp = atoi (value); - if (port_tmp < 1 || port_tmp > 65535) - { - WARNING ("apcups plugin: Invalid port: %i", port_tmp); - return (1); + oconfig_item_t *child = ci->children + i; + + if (strcasecmp (child->key, "Host") == 0) + cf_util_get_string (child, &conf_node); + else if (strcasecmp (child->key, "Port") == 0) + cf_util_get_service (child, &conf_service); + else if (strcasecmp (child->key, "ReportSeconds") == 0) + cf_util_get_boolean (child, &conf_report_seconds); + else if (strcasecmp (child->key, "PersistentConnection") == 0) { + cf_util_get_boolean (child, &conf_persistent_conn); + persistent_conn_set = 1; } - conf_port = port_tmp; - } - else if (strcasecmp (key, "ReportSeconds") == 0) - { - if (IS_TRUE (value)) - conf_report_seconds = 1; else - conf_report_seconds = 0; + ERROR ("apcups plugin: Unknown config option \"%s\".", child->key); } - else - { - return (-1); + + if (!persistent_conn_set) { + double interval = CDTIME_T_TO_DOUBLE(plugin_get_interval()); + if (interval > APCUPS_SERVER_TIMEOUT) { + NOTICE ("apcups plugin: Plugin poll interval set to %.3f seconds. " + "Apcupsd NIS socket timeout is %.3f seconds, " + "PersistentConnection disabled by default.", + interval, APCUPS_SERVER_TIMEOUT); + conf_persistent_conn = 0; + } } + return (0); -} +} /* int apcups_config */ -static void apc_submit_generic (char *type, char *type_inst, gauge_t value) +static void apc_submit_generic (const char *type, const char *type_inst, gauge_t value) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; @@ -472,15 +461,15 @@ static int apcups_read (void) .linefreq = NAN, }; - int status = apc_query_server (conf_host == NULL - ? APCUPS_DEFAULT_HOST - : conf_host, - conf_port, &apcups_detail); + int status = apc_query_server (conf_node == NULL + ? APCUPS_DEFAULT_NODE + : conf_node, + conf_service, &apcups_detail); if (status != 0) { - DEBUG ("apcups plugin: apc_query_server (%s, %i) = %i", - conf_host == NULL ? APCUPS_DEFAULT_HOST : conf_host, - conf_port, status); + DEBUG ("apcups plugin: apc_query_server (\"%s\", \"%s\") = %d", + conf_node == NULL ? APCUPS_DEFAULT_NODE : conf_node, + conf_service, status); return (status); } @@ -491,8 +480,7 @@ static int apcups_read (void) void module_register (void) { - plugin_register_config ("apcups", apcups_config, config_keys, - config_keys_num); + plugin_register_complex_config ("apcups", apcups_config); plugin_register_read ("apcups", apcups_read); plugin_register_shutdown ("apcups", apcups_shutdown); } /* void module_register */