X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fhddtemp.c;h=36ada53c4b2b673375e9a7982f3b62dd7dff383b;hb=c84dfcbfe5971d55fbcbc88a88f2845fbeb8dfb3;hp=505d10f5bf9c389e024c1d3388ea815e1733c530;hpb=2f0dfdda8bc499fdb161c6a5850ec176e75bd4fa;p=collectd.git diff --git a/src/hddtemp.c b/src/hddtemp.c index 505d10f5..36ada53c 100644 --- a/src/hddtemp.c +++ b/src/hddtemp.c @@ -31,17 +31,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 # include # include # include # include /* for basename */ -# define HDDTEMP_HAVE_READ 1 -#else -# define HDDTEMP_HAVE_READ 0 -#endif #if HAVE_LINUX_MAJOR_H # include @@ -50,24 +44,13 @@ #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", "Port", - NULL + "TranslateDevicename" }; -static int config_keys_num = 2; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); typedef struct hddname { @@ -79,7 +62,8 @@ typedef struct hddname static hddname_t *first_hddname = NULL; static char *hddtemp_host = NULL; -static char *hddtemp_port = NULL; +static char hddtemp_port[16]; +static int translate_devicename = 1; /* * NAME @@ -118,7 +102,10 @@ static int hddtemp_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; @@ -128,13 +115,13 @@ 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) { 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)) @@ -146,19 +133,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; @@ -174,7 +165,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); } @@ -191,7 +182,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); @@ -205,12 +196,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); } @@ -221,17 +213,30 @@ 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 if (strcasecmp (key, "TranslateDevicename") == 0) + { + if ((strcasecmp ("true", value) == 0) + || (strcasecmp ("yes", value) == 0) + || (strcasecmp ("on", value) == 0)) + translate_devicename = 1; + else + translate_devicename = 0; } else { @@ -273,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) { @@ -314,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: @@ -322,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) @@ -347,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; @@ -388,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 */ @@ -398,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 - when possible. */ -static char *hddtemp_get_name (char *drive) +static char *hddtemp_get_major_minor (char *drive) { hddname_t *list; char *ret; @@ -416,7 +423,7 @@ 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)); } @@ -480,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; @@ -497,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 { @@ -510,22 +518,13 @@ static int hddtemp_read (void) return (0); } /* int hddtemp_read */ -#endif /* HDDTEMP_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 (&temperature_ds); - -#if HDDTEMP_HAVE_READ - if (load & MR_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 */ + plugin_register_config ("hddtemp", hddtemp_config, + config_keys, config_keys_num); + plugin_register_init ("hddtemp", hddtemp_init); + plugin_register_read ("hddtemp", hddtemp_read); }