X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fhddtemp.c;h=b994fab3774cd3f8f67c98af020967017b18ad64;hb=e4b274ed754af52196d3390b8ce101a7f94e318a;hp=3f37d507977e86f91ba1a7c5d6a835cfd941f303;hpb=17df6bc8b27b313168c8a38d71fa576a34a9083f;p=collectd.git

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 3f37d507..b994fab3 100644
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -30,19 +30,12 @@
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
-#include "utils_debug.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>
@@ -51,17 +44,6 @@
 #define HDDTEMP_DEF_HOST "127.0.0.1"
 #define HDDTEMP_DEF_PORT "7634"
 
-static data_source_t data_source_temperature[1] =
-{
-	{"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t temperature_ds =
-{
-	"temperature", 1, data_source_temperature
-};
-
-#if HDDTEMP_HAVE_READ
 static const char *config_keys[] =
 {
 	"Host",
@@ -80,7 +62,7 @@ typedef struct hddname
 
 static hddname_t *first_hddname = NULL;
 static char *hddtemp_host = NULL;
-static char *hddtemp_port = NULL;
+static char hddtemp_port[16];
 
 /*
  * NAME
@@ -129,14 +111,17 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 		host = HDDTEMP_DEF_HOST;
 
 	port = hddtemp_port;
-	if (port == NULL)
+	if (strlen (port) == 0)
 		port = HDDTEMP_DEF_PORT;
 
 	if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
 	{
-		syslog (LOG_ERR, "hddtemp: getaddrinfo (%s, %s): %s",
+		char errbuf[1024];
+		ERROR ("hddtemp: getaddrinfo (%s, %s): %s",
 				host, port,
-				ai_return == EAI_SYSTEM ? strerror (errno) : gai_strerror (ai_return));
+				(ai_return == EAI_SYSTEM)
+				? sstrerror (errno, errbuf, sizeof (errbuf))
+				: gai_strerror (ai_return));
 		return (-1);
 	}
 
@@ -146,16 +131,18 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 		/* create our socket descriptor */
 		if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0)
 		{
-			syslog (LOG_ERR, "hddtemp: socket: %s",
-					strerror (errno));
+			char errbuf[1024];
+			ERROR ("hddtemp: 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))
 		{
-			DBG ("hddtemp: connect (%s, %s): %s", host, port,
-					strerror (errno));
+			char errbuf[1024];
+			DEBUG ("hddtemp: connect (%s, %s): %s", host, port,
+					sstrerror (errno, errbuf, sizeof (errbuf)));
 			close (fd);
 			fd = -1;
 			continue;
@@ -170,7 +157,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 
 	if (fd < 0)
 	{
-		syslog (LOG_ERR, "hddtemp: Could not connect to daemon.");
+		ERROR ("hddtemp: Could not connect to daemon.");
 		return (-1);
 	}
 
@@ -182,11 +169,13 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 	{
 		if (status == -1)
 		{
+			char errbuf[1024];
+
 			if ((errno == EAGAIN) || (errno == EINTR))
 				continue;
 
-			syslog (LOG_ERR, "hddtemp: Error reading from socket: %s",
-						strerror (errno));
+			ERROR ("hddtemp: Error reading from socket: %s",
+					sstrerror (errno, errbuf, sizeof (errbuf)));
 			close (fd);
 			return (-1);
 		}
@@ -199,11 +188,11 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 	if (buffer_fill >= buffer_size)
 	{
 		buffer[buffer_size - 1] = '\0';
-		syslog (LOG_WARNING, "hddtemp: Message from hddtemp has been truncated.");
+		WARNING ("hddtemp: Message from hddtemp has been truncated.");
 	}
 	else if (buffer_fill == 0)
 	{
-		syslog (LOG_WARNING, "hddtemp: Peer has unexpectedly shut down the socket. "
+		WARNING ("hddtemp: Peer has unexpectedly shut down the socket. "
 				"Buffer: `%s'", buffer);
 		close (fd);
 		return (-1);
@@ -215,17 +204,21 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 
 static int hddtemp_config (const char *key, const char *value)
 {
-	if (strcasecmp (key, "host") == 0)
+	if (strcasecmp (key, "Host") == 0)
 	{
 		if (hddtemp_host != NULL)
 			free (hddtemp_host);
 		hddtemp_host = strdup (value);
 	}
-	else if (strcasecmp (key, "port") == 0)
+	else if (strcasecmp (key, "Port") == 0)
 	{
-		if (hddtemp_port != NULL)
-			free (hddtemp_port);
-		hddtemp_port = strdup (value);
+		int port = (int) (atof (value));
+		if ((port > 0) && (port <= 65535))
+			snprintf (hddtemp_port, sizeof (hddtemp_port),
+					"%i", port);
+		else
+			strncpy (hddtemp_port, value, sizeof (hddtemp_port));
+		hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
 	}
 	else
 	{
@@ -267,7 +260,7 @@ static int hddtemp_init (void)
 
 	if ((fh = fopen ("/proc/partitions", "r")) != NULL)
 	{
-		DBG ("Looking at /proc/partitions...");
+		DEBUG ("Looking at /proc/partitions...");
 
 		while (fgets (buf, sizeof (buf), fh) != NULL)
 		{
@@ -341,25 +334,25 @@ static int hddtemp_init (void)
 
 				/* Skip all other majors. */
 				default:
-					DBG ("Skipping unknown major %i", major);
+					DEBUG ("Skipping unknown major %i", major);
 					continue;
 			} /* switch (major) */
 
 			if ((name = strdup (fields[3])) == NULL)
 			{
-				syslog (LOG_ERR, "hddtemp: strdup(%s) == NULL", fields[3]);
+				ERROR ("hddtemp: strdup(%s) == NULL", fields[3]);
 				continue;
 			}
 
 			if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL)
 			{
-				syslog (LOG_ERR, "hddtemp: malloc (%u) == NULL",
+				ERROR ("hddtemp: malloc (%u) == NULL",
 						(unsigned int) sizeof (hddname_t));
 				free (name);
 				continue;
 			}
 
-			DBG ("Found disk: %s (%u:%u).", name, major, minor);
+			DEBUG ("Found disk: %s (%u:%u).", name, major, minor);
 
 			entry->major = major;
 			entry->minor = minor;
@@ -378,9 +371,14 @@ static int hddtemp_init (void)
 		}
 		fclose (fh);
 	}
+#if COLLECT_DEBUG
 	else
-		DBG ("Could not open /proc/partitions: %s",
-				strerror (errno));
+	{
+		char errbuf[1024];
+		DEBUG ("Could not open /proc/partitions: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+	}
+#endif /* COLLECT_DEBUG */
 #endif /* KERNEL_LINUX */
 
 	return (0);
@@ -405,7 +403,7 @@ static char *hddtemp_get_name (char *drive)
 
 	if (list == NULL)
 	{
-		DBG ("Don't know %s, keeping name as-is.", drive);
+		DEBUG ("Don't know %s, keeping name as-is.", drive);
 		return (strdup (drive));
 	}
 
@@ -431,7 +429,7 @@ static void hddtemp_submit (char *type_instance, double value)
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname);
+	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "hddtemp");
 	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
@@ -443,6 +441,7 @@ static int hddtemp_read (void)
 	char buf[1024];
 	char *fields[128];
 	char *ptr;
+	char *saveptr;
 	int num_fields;
 	int num_disks;
 	int i;
@@ -451,10 +450,11 @@ static int hddtemp_read (void)
 	if (hddtemp_query_daemon (buf, sizeof (buf)) < 0)
 		return (-1);
 
-	/* NB: strtok will eat up "||" and leading "|"'s */
+	/* NB: strtok_r will eat up "||" and leading "|"'s */
 	num_fields = 0;
 	ptr = buf;
-	while ((fields[num_fields] = strtok (ptr, "|")) != NULL)
+	saveptr = NULL;
+	while ((fields[num_fields] = strtok_r (ptr, "|", &saveptr)) != NULL)
 	{
 		ptr = NULL;
 		num_fields++;
@@ -497,18 +497,13 @@ static int hddtemp_read (void)
 	
 	return (0);
 } /* int hddtemp_read */
-#endif /* HDDTEMP_HAVE_READ */
 
 /* module_register
    Register collectd plugin. */
 void module_register (void)
 {
-	plugin_register_data_set (&temperature_ds);
-	
-#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 */
 }