![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/hddtemp.c b/src/hddtemp.c
index 865ea8614afda35cee5993eeec8cf61e86c6f8b6..fbaff3ac0e2a5bd00ab14fabb2299441080b5e9b 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
#include "common.h"
#include "plugin.h"
-# include <netdb.h>
-# include <netinet/in.h>
-# include <netinet/tcp.h>
-# include <libgen.h> /* for basename */
+#include <libgen.h> /* for basename */
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
#if HAVE_LINUX_MAJOR_H
-# include <linux/major.h>
+#include <linux/major.h>
#endif
#define HDDTEMP_DEF_HOST "127.0.0.1"
#define HDDTEMP_DEF_PORT "7634"
-static const char *config_keys[] =
-{
- "Host",
- "Port"
-};
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+static const char *config_keys[] = {"Host", "Port"};
+static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
static char *hddtemp_host = NULL;
static char hddtemp_port[16];
* we need to create a new socket each time. Is there another way?
* Hm, maybe we can re-use the `sockaddr' structure? -octo
*/
-static int hddtemp_query_daemon (char *buffer, int buffer_size)
-{
- int fd;
- ssize_t status;
- int buffer_fill;
-
- const char *host;
- const char *port;
-
- struct addrinfo *ai_list;
- int ai_return;
-
- host = hddtemp_host;
- if (host == NULL)
- host = HDDTEMP_DEF_HOST;
-
- port = hddtemp_port;
- if (strlen (port) == 0)
- port = HDDTEMP_DEF_PORT;
-
- struct addrinfo ai_hints = {
- .ai_flags = AI_ADDRCONFIG,
- .ai_family = AF_UNSPEC,
- .ai_protocol = IPPROTO_TCP,
- .ai_socktype = SOCK_STREAM
- };
-
- if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
- {
- char errbuf[1024];
- ERROR ("hddtemp plugin: getaddrinfo (%s, %s): %s",
- host, port,
- (ai_return == EAI_SYSTEM)
- ? sstrerror (errno, errbuf, sizeof (errbuf))
- : gai_strerror (ai_return));
- return (-1);
- }
-
- fd = -1;
- for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
- {
- /* create our socket descriptor */
- fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
- ai_ptr->ai_protocol);
- if (fd < 0)
- {
- char errbuf[1024];
- ERROR ("hddtemp plugin: socket: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- continue;
- }
-
- /* connect to the hddtemp daemon */
- if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr,
- ai_ptr->ai_addrlen))
- {
- char errbuf[1024];
- INFO ("hddtemp plugin: connect (%s, %s) failed: %s",
- host, port,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- close (fd);
- fd = -1;
- continue;
- }
-
- /* A socket could be opened and connecting succeeded. We're
- * done. */
- break;
- }
-
- freeaddrinfo (ai_list);
-
- if (fd < 0)
- {
- ERROR ("hddtemp plugin: Could not connect to daemon.");
- return (-1);
- }
-
- /* receive data from the hddtemp daemon */
- memset (buffer, '\0', buffer_size);
-
- buffer_fill = 0;
- while ((status = read (fd, buffer + buffer_fill, buffer_size - buffer_fill)) != 0)
- {
- if (status == -1)
- {
- char errbuf[1024];
-
- if ((errno == EAGAIN) || (errno == EINTR))
- continue;
-
- ERROR ("hddtemp plugin: Error reading from socket: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- close (fd);
- return (-1);
- }
- buffer_fill += status;
-
- if (buffer_fill >= buffer_size)
- break;
- }
-
- if (buffer_fill >= buffer_size)
- {
- buffer[buffer_size - 1] = '\0';
- WARNING ("hddtemp plugin: Message from hddtemp has been "
- "truncated.");
- }
- else if (buffer_fill == 0)
- {
- WARNING ("hddtemp plugin: Peer has unexpectedly shut down "
- "the socket. Buffer: `%s'", buffer);
- close (fd);
- return (-1);
- }
-
- close (fd);
- return (0);
+static int hddtemp_query_daemon(char *buffer, int buffer_size) {
+ int fd;
+ ssize_t status;
+ int buffer_fill;
+
+ const char *host;
+ const char *port;
+
+ struct addrinfo *ai_list;
+ int ai_return;
+
+ host = hddtemp_host;
+ if (host == NULL)
+ host = HDDTEMP_DEF_HOST;
+
+ port = hddtemp_port;
+ if (strlen(port) == 0)
+ port = HDDTEMP_DEF_PORT;
+
+ struct addrinfo ai_hints = {.ai_flags = AI_ADDRCONFIG,
+ .ai_family = AF_UNSPEC,
+ .ai_protocol = IPPROTO_TCP,
+ .ai_socktype = SOCK_STREAM};
+
+ if ((ai_return = getaddrinfo(host, port, &ai_hints, &ai_list)) != 0) {
+ char errbuf[1024];
+ ERROR("hddtemp plugin: getaddrinfo (%s, %s): %s", host, port,
+ (ai_return == EAI_SYSTEM) ? sstrerror(errno, errbuf, sizeof(errbuf))
+ : gai_strerror(ai_return));
+ return (-1);
+ }
+
+ fd = -1;
+ for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL;
+ ai_ptr = ai_ptr->ai_next) {
+ /* create our socket descriptor */
+ fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
+ if (fd < 0) {
+ char errbuf[1024];
+ ERROR("hddtemp plugin: socket: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ continue;
+ }
+
+ /* connect to the hddtemp daemon */
+ if (connect(fd, (struct sockaddr *)ai_ptr->ai_addr, ai_ptr->ai_addrlen)) {
+ char errbuf[1024];
+ INFO("hddtemp plugin: connect (%s, %s) failed: %s", host, port,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ close(fd);
+ fd = -1;
+ continue;
+ }
+
+ /* A socket could be opened and connecting succeeded. We're
+ * done. */
+ break;
+ }
+
+ freeaddrinfo(ai_list);
+
+ if (fd < 0) {
+ ERROR("hddtemp plugin: Could not connect to daemon.");
+ return (-1);
+ }
+
+ /* receive data from the hddtemp daemon */
+ memset(buffer, '\0', buffer_size);
+
+ buffer_fill = 0;
+ while ((status = read(fd, buffer + buffer_fill, buffer_size - buffer_fill)) !=
+ 0) {
+ if (status == -1) {
+ char errbuf[1024];
+
+ if ((errno == EAGAIN) || (errno == EINTR))
+ continue;
+
+ ERROR("hddtemp plugin: Error reading from socket: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ close(fd);
+ return (-1);
+ }
+ buffer_fill += status;
+
+ if (buffer_fill >= buffer_size)
+ break;
+ }
+
+ if (buffer_fill >= buffer_size) {
+ buffer[buffer_size - 1] = '\0';
+ WARNING("hddtemp plugin: Message from hddtemp has been "
+ "truncated.");
+ } else if (buffer_fill == 0) {
+ WARNING("hddtemp plugin: Peer has unexpectedly shut down "
+ "the socket. Buffer: `%s'",
+ buffer);
+ close(fd);
+ return (-1);
+ }
+
+ close(fd);
+ return (0);
}
-static int hddtemp_config (const char *key, const char *value)
-{
- if (strcasecmp (key, "Host") == 0)
- {
- if (hddtemp_host != NULL)
- free (hddtemp_host);
- hddtemp_host = strdup (value);
- }
- else if (strcasecmp (key, "Port") == 0)
- {
- int port = (int) (atof (value));
- if ((port > 0) && (port <= 65535))
- ssnprintf (hddtemp_port, sizeof (hddtemp_port),
- "%i", port);
- else
- sstrncpy (hddtemp_port, value, sizeof (hddtemp_port));
- }
- else
- {
- return (-1);
- }
-
- return (0);
+static int hddtemp_config(const char *key, const char *value) {
+ if (strcasecmp(key, "Host") == 0) {
+ if (hddtemp_host != NULL)
+ free(hddtemp_host);
+ hddtemp_host = strdup(value);
+ } else if (strcasecmp(key, "Port") == 0) {
+ int port = (int)(atof(value));
+ if ((port > 0) && (port <= 65535))
+ ssnprintf(hddtemp_port, sizeof(hddtemp_port), "%i", port);
+ else
+ sstrncpy(hddtemp_port, value, sizeof(hddtemp_port));
+ } else {
+ return (-1);
+ }
+
+ return (0);
}
-static void hddtemp_submit (char *type_instance, double value)
-{
- value_t values[1];
- value_list_t vl = VALUE_LIST_INIT;
+static void hddtemp_submit(char *type_instance, double value) {
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = value;
+ values[0].gauge = value;
- vl.values = values;
- vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
- sstrncpy (vl.plugin, "hddtemp", sizeof (vl.plugin));
- sstrncpy (vl.type, "temperature", sizeof (vl.type));
- sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+ vl.values = values;
+ vl.values_len = 1;
+ sstrncpy(vl.host, hostname_g, sizeof(vl.host));
+ sstrncpy(vl.plugin, "hddtemp", sizeof(vl.plugin));
+ sstrncpy(vl.type, "temperature", sizeof(vl.type));
+ sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
- plugin_dispatch_values (&vl);
+ plugin_dispatch_values(&vl);
}
-static int hddtemp_read (void)
-{
- char buf[1024];
- char *fields[128];
- char *ptr;
- char *saveptr;
- int num_fields;
- int num_disks;
-
- /* get data from daemon */
- if (hddtemp_query_daemon (buf, sizeof (buf)) < 0)
- return (-1);
-
- /* NB: strtok_r will eat up "||" and leading "|"'s */
- num_fields = 0;
- ptr = buf;
- saveptr = NULL;
- while ((fields[num_fields] = strtok_r (ptr, "|", &saveptr)) != NULL)
- {
- ptr = NULL;
- num_fields++;
-
- if (num_fields >= 128)
- break;
- }
-
- num_disks = num_fields / 4;
-
- for (int i = 0; i < num_disks; i++)
- {
- char *name;
- double temperature;
- char *mode;
-
- mode = fields[4*i + 3];
- name = basename (fields[4*i + 0]);
-
- /* Skip non-temperature information */
- if (mode[0] != 'C' && mode[0] != 'F')
- continue;
-
- temperature = atof (fields[4*i + 2]);
-
- /* Convert farenheit to celsius */
- if (mode[0] == 'F')
- temperature = (temperature - 32.0) * 5.0 / 9.0;
-
- hddtemp_submit (name, temperature);
- }
-
- return (0);
+static int hddtemp_read(void) {
+ char buf[1024];
+ char *fields[128];
+ char *ptr;
+ char *saveptr;
+ int num_fields;
+ int num_disks;
+
+ /* get data from daemon */
+ if (hddtemp_query_daemon(buf, sizeof(buf)) < 0)
+ return (-1);
+
+ /* NB: strtok_r will eat up "||" and leading "|"'s */
+ num_fields = 0;
+ ptr = buf;
+ saveptr = NULL;
+ while ((fields[num_fields] = strtok_r(ptr, "|", &saveptr)) != NULL) {
+ ptr = NULL;
+ num_fields++;
+
+ if (num_fields >= 128)
+ break;
+ }
+
+ num_disks = num_fields / 4;
+
+ for (int i = 0; i < num_disks; i++) {
+ char *name;
+ double temperature;
+ char *mode;
+
+ mode = fields[4 * i + 3];
+ name = basename(fields[4 * i + 0]);
+
+ /* Skip non-temperature information */
+ if (mode[0] != 'C' && mode[0] != 'F')
+ continue;
+
+ temperature = atof(fields[4 * i + 2]);
+
+ /* Convert farenheit to celsius */
+ if (mode[0] == 'F')
+ temperature = (temperature - 32.0) * 5.0 / 9.0;
+
+ hddtemp_submit(name, temperature);
+ }
+
+ return (0);
} /* int hddtemp_read */
/* module_register
Register collectd plugin. */
-void module_register (void)
-{
- plugin_register_config ("hddtemp", hddtemp_config,
- config_keys, config_keys_num);
- plugin_register_read ("hddtemp", hddtemp_read);
+void module_register(void) {
+ plugin_register_config("hddtemp", hddtemp_config, config_keys,
+ config_keys_num);
+ plugin_register_read("hddtemp", hddtemp_read);
}