X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmbmon.c;h=43590a8bee041579524ceeffc1439f4cfb971fae;hb=2b65cef7870c385b9b56b34701ced62528f3f7c0;hp=c3909d5791d257480f47cf12284e3f6390ec5783;hpb=6d3dc246eb6ce32214825f909541cf7cbd441948;p=collectd.git

diff --git a/src/mbmon.c b/src/mbmon.c
index c3909d57..43590a8b 100644
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/mbmon.c
- * Copyright (C) 2006 Flavio Stanchina
+ * Copyright (C) 2006       Flavio Stanchina
+ * Copyright (C) 2006-2007  Florian octo Forster
  * Based on the hddtemp plugin.
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -19,6 +20,7 @@
  *
  * Authors:
  *   Flavio Stanchina <flavio at stanchina.net>
+ *   Florian Forster <octo at verplant.org>
  **/
 
 #include "collectd.h"
@@ -88,7 +90,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;
@@ -129,7 +134,7 @@ static int mbmon_query_daemon (char *buffer, int buffer_size)
 		if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen))
 		{
 			char errbuf[1024];
-			DEBUG ("mbmon: connect (%s, %s): %s", host, port,
+			INFO ("mbmon: connect (%s, %s): %s", host, port,
 					sstrerror (errno, errbuf,
 						sizeof (errbuf)));
 			close (fd);
@@ -225,11 +230,12 @@ static void mbmon_submit (const char *type, const char *type_instance,
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "mbmon");
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	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));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void mbmon_submit */
 
 /* Trim trailing whitespace from a string. */
@@ -237,7 +243,7 @@ static void trim_spaces (char *s)
 {
 	size_t l;
 
-	for (l = strlen (s) - 1; (l > 0) && isspace (s[l]); l--)
+	for (l = strlen (s) - 1; (l > 0) && isspace ((int) s[l]); l--)
 		s[l] = '\0';
 }