X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftraffic.c;h=a7b70c5875a6d3946964b5896013437da3afa437;hb=062770152a71a4bb053edbc5d8983b650eb805e5;hp=59b59e8347f1dea5725ad538c79a20db586445da;hpb=020e7b31e4e22d27ce624dd94ea6a084a1e59bfc;p=collectd.git

diff --git a/src/traffic.c b/src/traffic.c
index 59b59e83..a7b70c58 100644
--- a/src/traffic.c
+++ b/src/traffic.c
@@ -4,8 +4,7 @@
  *
  * 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
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,8 +46,6 @@
 #  include <ifaddrs.h>
 #endif
 
-#define MODULE_NAME "traffic"
-
 /*
  * Various people have reported problems with `getifaddrs' and varying versions
  * of `glibc'. That's why it's disabled by default. Since more statistics are
@@ -67,8 +64,6 @@
 # define TRAFFIC_HAVE_READ 0
 #endif
 
-#define BUFSIZE 512
-
 /*
  * (Module-)Global variables
  */
@@ -237,14 +232,7 @@ static void if_submit (const char *dev, const char *type,
 	vl.values = values;
 	vl.values_len = 2;
 	vl.time = time (NULL);
-
-	/* FIXME: do this globally */
-	if (gethostname (vl.host, sizeof (vl.host)) != 0)
-	{
-		syslog (LOG_ERR, "load plugin: gethostname failed: %s",
-				strerror (errno));
-		return;
-	}
+	strcpy (vl.host, hostname);
 	strcpy (vl.plugin, "interface");
 	strcpy (vl.plugin_instance, "");
 	strncpy (vl.type_instance, dev, sizeof (vl.type_instance));
@@ -417,6 +405,3 @@ void module_register (void)
 	plugin_register_read ("interface", traffic_read);
 #endif
 }
-
-#undef BUFSIZE
-#undef MODULE_NAME