X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fhddtemp.c;h=4e083753202718c588f72b0b1a2c58dc3ef1f37c;hb=0d5c879672770e3b8a740727fb223a6febdeaa27;hp=c77746589858cef0941934727d336c9b12ce9514;hpb=bd66a09b35da21dcb405650ae4587bf2ca811438;p=collectd.git

diff --git a/src/hddtemp.c b/src/hddtemp.c
index c7774658..4e083753 100644
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -1,6 +1,8 @@
 /**
  * collectd - src/hddtemp.c
  * Copyright (C) 2005,2006  Vincent Stehlé
+ * Copyright (C) 2006,2007  Florian octo Forster
+ * Copyright (C) 2008       Sebastian Harl
  *
  * 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
@@ -19,6 +21,7 @@
  * Authors:
  *   Vincent Stehlé <vincent.stehle at free.fr>
  *   Florian octo Forster <octo at verplant.org>
+ *   Sebastian Harl <sh at tokkee.org>
  *
  * TODO:
  *   Do a pass, some day, and spare some memory. We consume too much for now
@@ -31,17 +34,11 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#if HAVE_NETDB_H && HAVE_SYS_SOCKET_H && HAVE_NETINET_IN_H \
-	&& HAVE_NETINET_TCP_H && HAVE_LIBGEN_H
 # include <netdb.h>
 # include <sys/socket.h>
 # include <netinet/in.h>
 # include <netinet/tcp.h>
 # include <libgen.h> /* for basename */
-# define HDDTEMP_HAVE_READ 1
-#else
-# define HDDTEMP_HAVE_READ 0
-#endif
 
 #if HAVE_LINUX_MAJOR_H
 # include <linux/major.h>
@@ -50,14 +47,13 @@
 #define HDDTEMP_DEF_HOST "127.0.0.1"
 #define HDDTEMP_DEF_PORT "7634"
 
-#if HDDTEMP_HAVE_READ
 static const char *config_keys[] =
 {
 	"Host",
 	"Port",
-	NULL
+	"TranslateDevicename"
 };
-static int config_keys_num = 2;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 typedef struct hddname
 {
@@ -70,6 +66,7 @@ typedef struct hddname
 static hddname_t *first_hddname = NULL;
 static char *hddtemp_host = NULL;
 static char hddtemp_port[16];
+static int translate_devicename = 1;
 
 /*
  * NAME
@@ -127,7 +124,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 	if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
 	{
 		char errbuf[1024];
-		ERROR ("hddtemp: getaddrinfo (%s, %s): %s",
+		ERROR ("hddtemp plugin: getaddrinfo (%s, %s): %s",
 				host, port,
 				(ai_return == EAI_SYSTEM)
 				? sstrerror (errno, errbuf, sizeof (errbuf))
@@ -139,19 +136,23 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 	for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
 	{
 		/* create our socket descriptor */
-		if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0)
+		fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
+				ai_ptr->ai_protocol);
+		if (fd < 0)
 		{
 			char errbuf[1024];
-			ERROR ("hddtemp: socket: %s",
+			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))
+		if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr,
+					ai_ptr->ai_addrlen))
 		{
 			char errbuf[1024];
-			DEBUG ("hddtemp: connect (%s, %s): %s", host, port,
+			INFO ("hddtemp plugin: connect (%s, %s) failed: %s",
+					host, port,
 					sstrerror (errno, errbuf, sizeof (errbuf)));
 			close (fd);
 			fd = -1;
@@ -167,7 +168,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 
 	if (fd < 0)
 	{
-		ERROR ("hddtemp: Could not connect to daemon.");
+		ERROR ("hddtemp plugin: Could not connect to daemon.");
 		return (-1);
 	}
 
@@ -184,7 +185,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 			if ((errno == EAGAIN) || (errno == EINTR))
 				continue;
 
-			ERROR ("hddtemp: Error reading from socket: %s",
+			ERROR ("hddtemp plugin: Error reading from socket: %s",
 					sstrerror (errno, errbuf, sizeof (errbuf)));
 			close (fd);
 			return (-1);
@@ -198,12 +199,13 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 	if (buffer_fill >= buffer_size)
 	{
 		buffer[buffer_size - 1] = '\0';
-		WARNING ("hddtemp: Message from hddtemp has been truncated.");
+		WARNING ("hddtemp plugin: Message from hddtemp has been "
+				"truncated.");
 	}
 	else if (buffer_fill == 0)
 	{
-		WARNING ("hddtemp: Peer has unexpectedly shut down the socket. "
-				"Buffer: `%s'", buffer);
+		WARNING ("hddtemp plugin: Peer has unexpectedly shut down "
+				"the socket. Buffer: `%s'", buffer);
 		close (fd);
 		return (-1);
 	}
@@ -224,11 +226,17 @@ static int hddtemp_config (const char *key, const char *value)
 	{
 		int port = (int) (atof (value));
 		if ((port > 0) && (port <= 65535))
-			snprintf (hddtemp_port, sizeof (hddtemp_port),
+			ssnprintf (hddtemp_port, sizeof (hddtemp_port),
 					"%i", port);
 		else
-			strncpy (hddtemp_port, value, sizeof (hddtemp_port));
-		hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
+			sstrncpy (hddtemp_port, value, sizeof (hddtemp_port));
+	}
+	else if (strcasecmp (key, "TranslateDevicename") == 0)
+	{
+		if (IS_TRUE (value))
+			translate_devicename = 1;
+		else
+			translate_devicename = 0;
 	}
 	else
 	{
@@ -270,7 +278,7 @@ static int hddtemp_init (void)
 
 	if ((fh = fopen ("/proc/partitions", "r")) != NULL)
 	{
-		DEBUG ("Looking at /proc/partitions...");
+		DEBUG ("hddtemp plugin: Looking at /proc/partitions...");
 
 		while (fgets (buf, sizeof (buf), fh) != NULL)
 		{
@@ -311,6 +319,7 @@ static int hddtemp_init (void)
 				case SCSI_DISK5_MAJOR:
 				case SCSI_DISK6_MAJOR:
 				case SCSI_DISK7_MAJOR:
+#ifdef SCSI_DISK8_MAJOR
 				case SCSI_DISK8_MAJOR:
 				case SCSI_DISK9_MAJOR:
 				case SCSI_DISK10_MAJOR:
@@ -319,6 +328,7 @@ static int hddtemp_init (void)
 				case SCSI_DISK13_MAJOR:
 				case SCSI_DISK14_MAJOR:
 				case SCSI_DISK15_MAJOR:
+#endif /* SCSI_DISK8_MAJOR */
 					/* SCSI disks minors are multiples of 16.
 					 * Keep only those. */
 					if (minor % 16)
@@ -344,25 +354,25 @@ static int hddtemp_init (void)
 
 				/* Skip all other majors. */
 				default:
-					DEBUG ("Skipping unknown major %i", major);
+					DEBUG ("hddtemp plugin: Skipping unknown major %i", major);
 					continue;
 			} /* switch (major) */
 
 			if ((name = strdup (fields[3])) == NULL)
 			{
-				ERROR ("hddtemp: strdup(%s) == NULL", fields[3]);
+				ERROR ("hddtemp plugin: strdup(%s) == NULL", fields[3]);
 				continue;
 			}
 
 			if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL)
 			{
-				ERROR ("hddtemp: malloc (%u) == NULL",
+				ERROR ("hddtemp plugin: malloc (%u) == NULL",
 						(unsigned int) sizeof (hddname_t));
 				free (name);
 				continue;
 			}
 
-			DEBUG ("Found disk: %s (%u:%u).", name, major, minor);
+			DEBUG ("hddtemp plugin: Found disk: %s (%u:%u).", name, major, minor);
 
 			entry->major = major;
 			entry->minor = minor;
@@ -385,7 +395,7 @@ static int hddtemp_init (void)
 	else
 	{
 		char errbuf[1024];
-		DEBUG ("Could not open /proc/partitions: %s",
+		DEBUG ("hddtemp plugin: Could not open /proc/partitions: %s",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
 	}
 #endif /* COLLECT_DEBUG */
@@ -395,14 +405,14 @@ static int hddtemp_init (void)
 } /* int hddtemp_init */
 
 /*
- * hddtemp_get_name
+ * hddtemp_get_major_minor
  *
  * Description:
  *   Try to "cook" a bit the drive name as returned
  *   by the hddtemp daemon. The intend is to transform disk
  *   names into <major>-<minor> when possible.
  */
-static char *hddtemp_get_name (char *drive)
+static char *hddtemp_get_major_minor (char *drive)
 {
 	hddname_t *list;
 	char *ret;
@@ -413,14 +423,14 @@ static char *hddtemp_get_name (char *drive)
 
 	if (list == NULL)
 	{
-		DEBUG ("Don't know %s, keeping name as-is.", drive);
+		DEBUG ("hddtemp plugin: Don't know %s, keeping name as-is.", drive);
 		return (strdup (drive));
 	}
 
 	if ((ret = (char *) malloc (128 * sizeof (char))) == NULL)
 		return (NULL);
 
-	if (snprintf (ret, 128, "%i-%i", list->major, list->minor) >= 128)
+	if (ssnprintf (ret, 128, "%i-%i", list->major, list->minor) >= 128)
 	{
 		free (ret);
 		return (NULL);
@@ -438,12 +448,12 @@ static void hddtemp_submit (char *type_instance, double value)
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "hddtemp");
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	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 ("temperature", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int hddtemp_read (void)
@@ -477,7 +487,7 @@ static int hddtemp_read (void)
 
 	for (i = 0; i < num_disks; i++)
 	{
-		char *name, *submit_name;
+		char *name, *major_minor;
 		double temperature;
 		char *mode;
 
@@ -494,10 +504,11 @@ static int hddtemp_read (void)
 		if (mode[0] == 'F')
 			temperature = (temperature - 32.0) * 5.0 / 9.0;
 
-		if ((submit_name = hddtemp_get_name (name)) != NULL)
+		if (translate_devicename
+				&& (major_minor = hddtemp_get_major_minor (name)) != NULL)
 		{
-			hddtemp_submit (submit_name, temperature);
-			free (submit_name);
+			hddtemp_submit (major_minor, temperature);
+			free (major_minor);
 		}
 		else
 		{
@@ -507,16 +518,13 @@ static int hddtemp_read (void)
 	
 	return (0);
 } /* int hddtemp_read */
-#endif /* HDDTEMP_HAVE_READ */
 
 /* module_register
    Register collectd plugin. */
 void module_register (void)
 {
-#if HDDTEMP_HAVE_READ
 	plugin_register_config ("hddtemp", hddtemp_config,
 			config_keys, config_keys_num);
 	plugin_register_init ("hddtemp", hddtemp_init);
 	plugin_register_read ("hddtemp", hddtemp_read);
-#endif /* HDDTEMP_HAVE_READ */
 }