X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmbmon.c;h=384ecb5e6a5cda48d376ebea8b5aad3882a1143b;hb=97807957721f191e3963b0af3423d85da9f9b832;hp=08c49fe3096bd0849f040cb2e82a8cb17303264e;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git

diff --git a/src/mbmon.c b/src/mbmon.c
index 08c49fe3..384ecb5e 100644
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -26,49 +26,14 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#if HAVE_NETDB_H && HAVE_SYS_SOCKET_H && HAVE_NETINET_IN_H && HAVE_NETINET_TCP_H
-# include <netdb.h>
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <netinet/tcp.h>
-# define MBMON_HAVE_READ 1
-#else
-# define MBMON_HAVE_READ 0
-#endif
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 
 #define MBMON_DEF_HOST "127.0.0.1"
 #define MBMON_DEF_PORT "411" /* the default for Debian */
 
-static data_source_t data_source_fanspeed[1] =
-{
-	{"value", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t fanspeed_ds =
-{
-	"fanspeed", 1, data_source_fanspeed
-};
-
-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
-};
-
-static data_source_t data_source_voltage[1] =
-{
-	{"voltage", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t voltage_ds =
-{
-	"voltage", 1, data_source_voltage
-};
-
 static const char *config_keys[] =
 {
 	"Host",
@@ -77,7 +42,6 @@ static const char *config_keys[] =
 };
 static int config_keys_num = 2;
 
-#if MBMON_HAVE_READ
 static char *mbmon_host = NULL;
 static char *mbmon_port = NULL;
 
@@ -124,7 +88,10 @@ static int mbmon_query_daemon (char *buffer, int buffer_size)
 	int              ai_return;
 
 	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_STREAM;
 	ai_hints.ai_protocol = IPPROTO_TCP;
@@ -335,24 +302,11 @@ static int mbmon_read (void)
 
 	return (0);
 } /* void mbmon_read */
-#endif /* MBMON_HAVE_READ */
 
 /* module_register
    Register collectd plugin. */
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-	{
-		plugin_register_data_set (&fanspeed_ds);
-		plugin_register_data_set (&temperature_ds);
-		plugin_register_data_set (&voltage_ds);
-	}
-
-#if MBMON_HAVE_READ
-	if (load & MR_READ)
-	{
-		plugin_register_config ("mbmon", mbmon_config, config_keys, config_keys_num);
-		plugin_register_read ("mbmon", mbmon_read);
-	}
-#endif /* MBMON_HAVE_READ */
+	plugin_register_config ("mbmon", mbmon_config, config_keys, config_keys_num);
+	plugin_register_read ("mbmon", mbmon_read);
 } /* void module_register */