X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fhddtemp.c;h=4e083753202718c588f72b0b1a2c58dc3ef1f37c;hb=0d5c879672770e3b8a740727fb223a6febdeaa27;hp=651de298877a3c9848f05e17d79ea7a67e34ebaa;hpb=6e855e6ab3bc654a3d6238c75102c66785de8bda;p=collectd.git diff --git a/src/hddtemp.c b/src/hddtemp.c index 651de298..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é * Florian octo Forster + * Sebastian Harl * * TODO: * Do a pass, some day, and spare some memory. We consume too much for now @@ -121,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)) @@ -133,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]; - INFO ("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; @@ -161,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); } @@ -178,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); @@ -192,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); } @@ -218,17 +226,14 @@ 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 ((strcasecmp ("true", value) == 0) - || (strcasecmp ("yes", value) == 0) - || (strcasecmp ("on", value) == 0)) + if (IS_TRUE (value)) translate_devicename = 1; else translate_devicename = 0; @@ -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) { @@ -349,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; @@ -390,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 */ @@ -418,14 +423,14 @@ static char *hddtemp_get_major_minor (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); @@ -443,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)