projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectd-snmp(5): Added a note about the interpreted environment variables.
[collectd.git]
/
src
/
hddtemp.c
diff --git
a/src/hddtemp.c
b/src/hddtemp.c
index
00814bd
..
0432de7
100644
(file)
--- a/
src/hddtemp.c
+++ b/
src/hddtemp.c
@@
-31,17
+31,11
@@
#include "plugin.h"
#include "configfile.h"
#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 */
# 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>
#if HAVE_LINUX_MAJOR_H
# include <linux/major.h>
@@
-50,7
+44,6
@@
#define HDDTEMP_DEF_HOST "127.0.0.1"
#define HDDTEMP_DEF_PORT "7634"
#define HDDTEMP_DEF_HOST "127.0.0.1"
#define HDDTEMP_DEF_PORT "7634"
-#if HDDTEMP_HAVE_READ
static const char *config_keys[] =
{
"Host",
static const char *config_keys[] =
{
"Host",
@@
-69,7
+62,7
@@
typedef struct hddname
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
-static char
*hddtemp_port = NULL
;
+static char
hddtemp_port[16]
;
/*
* NAME
/*
* NAME
@@
-108,7
+101,10
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
int ai_return;
memset (&ai_hints, '\0', sizeof (ai_hints));
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;
ai_hints.ai_family = PF_UNSPEC;
ai_hints.ai_socktype = SOCK_STREAM;
ai_hints.ai_protocol = IPPROTO_TCP;
@@
-118,7
+114,7
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
host = HDDTEMP_DEF_HOST;
port = hddtemp_port;
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)
port = HDDTEMP_DEF_PORT;
if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
@@
-211,17
+207,21
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
static int hddtemp_config (const char *key, const char *value)
{
static int hddtemp_config (const char *key, const char *value)
{
- if (strcasecmp (key, "
h
ost") == 0)
+ if (strcasecmp (key, "
H
ost") == 0)
{
if (hddtemp_host != NULL)
free (hddtemp_host);
hddtemp_host = strdup (value);
}
{
if (hddtemp_host != NULL)
free (hddtemp_host);
hddtemp_host = strdup (value);
}
- else if (strcasecmp (key, "
p
ort") == 0)
+ else if (strcasecmp (key, "
P
ort") == 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
{
}
else
{
@@
-500,16
+500,13
@@
static int hddtemp_read (void)
return (0);
} /* int hddtemp_read */
return (0);
} /* int hddtemp_read */
-#endif /* HDDTEMP_HAVE_READ */
/* module_register
Register collectd plugin. */
void module_register (void)
{
/* 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);
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 */
}
}