#define MBMON_DEF_HOST "127.0.0.1"
#define MBMON_DEF_PORT "411" /* the default for Debian */
-static const char *config_keys[] =
-{
- "Host",
- "Port",
- NULL
-};
+static const char *config_keys[] = {"Host", "Port", NULL};
static int config_keys_num = 2;
static char *mbmon_host = NULL;
* we need to create a new socket each time. Is there another way?
* Hm, maybe we can re-use the `sockaddr' structure? -octo
*/
-static int mbmon_query_daemon (char *buffer, int buffer_size)
-{
- int fd;
- ssize_t status;
- int buffer_fill;
-
- const char *host;
- const char *port;
-
- struct addrinfo *ai_list;
- int ai_return;
-
- host = mbmon_host;
- if (host == NULL)
- host = MBMON_DEF_HOST;
-
- port = mbmon_port;
- if (port == NULL)
- port = MBMON_DEF_PORT;
-
- struct addrinfo ai_hints = {
- .ai_family = AF_UNSPEC,
- .ai_flags = AI_ADDRCONFIG,
- .ai_protocol = IPPROTO_TCP,
- .ai_socktype = SOCK_STREAM
- };
-
- if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
- {
- char errbuf[1024];
- ERROR ("mbmon: getaddrinfo (%s, %s): %s",
- host, port,
- (ai_return == EAI_SYSTEM)
- ? sstrerror (errno, errbuf, sizeof (errbuf))
- : gai_strerror (ai_return));
- return (-1);
- }
-
- fd = -1;
- for (struct addrinfo *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)
- {
- char errbuf[1024];
- ERROR ("mbmon: socket: %s",
- sstrerror (errno, errbuf,
- sizeof (errbuf)));
- continue;
- }
-
- /* connect to the mbmon daemon */
- if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen))
- {
- char errbuf[1024];
- INFO ("mbmon: connect (%s, %s): %s", host, port,
- sstrerror (errno, errbuf,
- sizeof (errbuf)));
- close (fd);
- fd = -1;
- continue;
- }
-
- /* A socket could be opened and connecting succeeded. We're
- * done. */
- break;
- }
-
- freeaddrinfo (ai_list);
-
- if (fd < 0)
- {
- ERROR ("mbmon: Could not connect to daemon.");
- return (-1);
- }
-
- /* receive data from the mbmon daemon */
- memset (buffer, '\0', buffer_size);
-
- buffer_fill = 0;
- while ((status = read (fd, buffer + buffer_fill, buffer_size - buffer_fill)) != 0)
- {
- if (status == -1)
- {
- char errbuf[1024];
-
- if ((errno == EAGAIN) || (errno == EINTR))
- continue;
-
- ERROR ("mbmon: Error reading from socket: %s",
- sstrerror (errno, errbuf,
- sizeof (errbuf)));
- close (fd);
- return (-1);
- }
- buffer_fill += status;
-
- if (buffer_fill >= buffer_size)
- break;
- }
-
- if (buffer_fill >= buffer_size)
- {
- buffer[buffer_size - 1] = '\0';
- WARNING ("mbmon: Message from mbmon has been truncated.");
- }
- else if (buffer_fill == 0)
- {
- WARNING ("mbmon: Peer has unexpectedly shut down the socket. "
- "Buffer: `%s'", buffer);
- close (fd);
- return (-1);
- }
-
- close (fd);
- return (0);
+static int mbmon_query_daemon(char *buffer, int buffer_size) {
+ int fd;
+ ssize_t status;
+ int buffer_fill;
+
+ const char *host;
+ const char *port;
+
+ struct addrinfo *ai_list;
+ int ai_return;
+
+ host = mbmon_host;
+ if (host == NULL)
+ host = MBMON_DEF_HOST;
+
+ port = mbmon_port;
+ if (port == NULL)
+ port = MBMON_DEF_PORT;
+
+ struct addrinfo ai_hints = {.ai_family = AF_UNSPEC,
+ .ai_flags = AI_ADDRCONFIG,
+ .ai_protocol = IPPROTO_TCP,
+ .ai_socktype = SOCK_STREAM};
+
+ if ((ai_return = getaddrinfo(host, port, &ai_hints, &ai_list)) != 0) {
+ char errbuf[1024];
+ ERROR("mbmon: getaddrinfo (%s, %s): %s", host, port,
+ (ai_return == EAI_SYSTEM) ? sstrerror(errno, errbuf, sizeof(errbuf))
+ : gai_strerror(ai_return));
+ return -1;
+ }
+
+ fd = -1;
+ for (struct addrinfo *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) {
+ char errbuf[1024];
+ ERROR("mbmon: socket: %s", sstrerror(errno, errbuf, sizeof(errbuf)));
+ continue;
+ }
+
+ /* connect to the mbmon daemon */
+ if (connect(fd, (struct sockaddr *)ai_ptr->ai_addr, ai_ptr->ai_addrlen)) {
+ char errbuf[1024];
+ INFO("mbmon: connect (%s, %s): %s", host, port,
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ close(fd);
+ fd = -1;
+ continue;
+ }
+
+ /* A socket could be opened and connecting succeeded. We're
+ * done. */
+ break;
+ }
+
+ freeaddrinfo(ai_list);
+
+ if (fd < 0) {
+ ERROR("mbmon: Could not connect to daemon.");
+ return -1;
+ }
+
+ /* receive data from the mbmon daemon */
+ memset(buffer, '\0', buffer_size);
+
+ buffer_fill = 0;
+ while ((status = read(fd, buffer + buffer_fill, buffer_size - buffer_fill)) !=
+ 0) {
+ if (status == -1) {
+ char errbuf[1024];
+
+ if ((errno == EAGAIN) || (errno == EINTR))
+ continue;
+
+ ERROR("mbmon: Error reading from socket: %s",
+ sstrerror(errno, errbuf, sizeof(errbuf)));
+ close(fd);
+ return -1;
+ }
+ buffer_fill += status;
+
+ if (buffer_fill >= buffer_size)
+ break;
+ }
+
+ if (buffer_fill >= buffer_size) {
+ buffer[buffer_size - 1] = '\0';
+ WARNING("mbmon: Message from mbmon has been truncated.");
+ } else if (buffer_fill == 0) {
+ WARNING("mbmon: Peer has unexpectedly shut down the socket. "
+ "Buffer: `%s'",
+ buffer);
+ close(fd);
+ return -1;
+ }
+
+ close(fd);
+ return 0;
}
-static int mbmon_config (const char *key, const char *value)
-{
- if (strcasecmp (key, "host") == 0)
- {
- if (mbmon_host != NULL)
- free (mbmon_host);
- mbmon_host = strdup (value);
- }
- else if (strcasecmp (key, "port") == 0)
- {
- if (mbmon_port != NULL)
- free (mbmon_port);
- mbmon_port = strdup (value);
- }
- else
- {
- return (-1);
- }
-
- return (0);
+static int mbmon_config(const char *key, const char *value) {
+ if (strcasecmp(key, "host") == 0) {
+ if (mbmon_host != NULL)
+ free(mbmon_host);
+ mbmon_host = strdup(value);
+ } else if (strcasecmp(key, "port") == 0) {
+ if (mbmon_port != NULL)
+ free(mbmon_port);
+ mbmon_port = strdup(value);
+ } else {
+ return -1;
+ }
+
+ return 0;
}
-static void mbmon_submit (const char *type, const char *type_instance,
- double value)
-{
- value_list_t vl = VALUE_LIST_INIT;
+static void mbmon_submit(const char *type, const char *type_instance,
+ double value) {
+ value_list_t vl = VALUE_LIST_INIT;
- vl.values = &(value_t) { .gauge = value };
- vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
- sstrncpy (vl.plugin, "mbmon", sizeof (vl.plugin));
- sstrncpy (vl.type, type, sizeof (vl.type));
- sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+ vl.values = &(value_t){.gauge = value};
+ vl.values_len = 1;
+ sstrncpy(vl.plugin, "mbmon", sizeof(vl.plugin));
+ sstrncpy(vl.type, type, sizeof(vl.type));
+ sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
- plugin_dispatch_values (&vl);
+ plugin_dispatch_values(&vl);
} /* void mbmon_submit */
/* Trim trailing whitespace from a string. */
-static void trim_spaces (char *s)
-{
- for (size_t l = strlen (s) - 1; (l > 0) && isspace ((int) s[l]); l--)
- s[l] = '\0';
+static void trim_spaces(char *s) {
+ for (size_t l = strlen(s) - 1; (l > 0) && isspace((int)s[l]); l--)
+ s[l] = '\0';
}
-static int mbmon_read (void)
-{
- char buf[1024];
- char *s, *t;
-
- /* get data from daemon */
- if (mbmon_query_daemon (buf, sizeof (buf)) < 0)
- return (-1);
-
- s = buf;
- while ((t = strchr (s, ':')) != NULL)
- {
- double value;
- char *nextc;
-
- const char *type;
- const char *inst;
-
- *t++ = '\0';
- trim_spaces (s);
-
- value = strtod (t, &nextc);
- if ((*nextc != '\n') && (*nextc != '\0'))
- {
- ERROR ("mbmon: value for `%s' contains invalid characters: `%s'", s, t);
- break;
- }
-
- if (strncmp (s, "TEMP", 4) == 0)
- {
- inst = s + 4;
- type = "temperature";
- }
- else if (strncmp (s, "FAN", 3) == 0)
- {
- inst = s + 3;
- type = "fanspeed";
- }
- else if (strncmp (s, "V", 1) == 0)
- {
- inst = s + 1;
- type = "voltage";
- }
- else
- {
- continue;
- }
-
- mbmon_submit (type, inst, value);
-
- if (*nextc == '\0')
- break;
-
- s = nextc + 1;
- }
-
- return (0);
+static int mbmon_read(void) {
+ char buf[1024];
+ char *s, *t;
+
+ /* get data from daemon */
+ if (mbmon_query_daemon(buf, sizeof(buf)) < 0)
+ return -1;
+
+ s = buf;
+ while ((t = strchr(s, ':')) != NULL) {
+ double value;
+ char *nextc;
+
+ const char *type;
+ const char *inst;
+
+ *t++ = '\0';
+ trim_spaces(s);
+
+ value = strtod(t, &nextc);
+ if ((*nextc != '\n') && (*nextc != '\0')) {
+ ERROR("mbmon: value for `%s' contains invalid characters: `%s'", s, t);
+ break;
+ }
+
+ if (strncmp(s, "TEMP", 4) == 0) {
+ inst = s + 4;
+ type = "temperature";
+ } else if (strncmp(s, "FAN", 3) == 0) {
+ inst = s + 3;
+ type = "fanspeed";
+ } else if (strncmp(s, "V", 1) == 0) {
+ inst = s + 1;
+ type = "voltage";
+ } else {
+ continue;
+ }
+
+ mbmon_submit(type, inst, value);
+
+ if (*nextc == '\0')
+ break;
+
+ s = nextc + 1;
+ }
+
+ return 0;
} /* void mbmon_read */
/* module_register
Register collectd plugin. */
-void module_register (void)
-{
- plugin_register_config ("mbmon", mbmon_config, config_keys, config_keys_num);
- plugin_register_read ("mbmon", mbmon_read);
+void module_register(void) {
+ plugin_register_config("mbmon", mbmon_config, config_keys, config_keys_num);
+ plugin_register_read("mbmon", mbmon_read);
} /* void module_register */
projects / collectd.git / blobdiff