X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=9501161ce87b4e6cfaeb65cb4c190d238125ffea;hb=a49ed2ad7f046517f1e48b417a71ac2005362d2f;hp=177afbaa0847b8f1db0dac2dd89bf6d6bf8bb19e;hpb=a898c17330d9a2039bcdb8f7e6dbedba516a6cd8;p=collectd.git

diff --git a/src/interface.c b/src/interface.c
index 177afbaa..9501161c 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/interface.c
- * Copyright (C) 2005-2008  Florian octo Forster
+ * Copyright (C) 2005-2010  Florian octo Forster
  * Copyright (C) 2009       Manuel Sanmartin
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -128,7 +128,7 @@ static int interface_config (const char *key, const char *value)
 static int interface_init (void)
 {
 	kstat_t *ksp_chain;
-	unsigned long long val;
+	derive_t val;
 
 	numif = 0;
 
@@ -141,11 +141,17 @@ static int interface_init (void)
 	{
 		if (strncmp (ksp_chain->ks_class, "net", 3))
 			continue;
+		/* Ignore kstat entry if not the regular statistic set. This
+		 * avoids problems with "bogus" interfaces, such as
+		 * "wrsmd<num>" */
+		if (strncmp (ksp_chain->ks_name, ksp_chain->ks_module,
+					strlen (ksp_chain->ks_module)) != 0)
+			continue;
 		if (ksp_chain->ks_type != KSTAT_TYPE_NAMED)
 			continue;
 		if (kstat_read (kc, ksp_chain, NULL) == -1)
 			continue;
-		if ((val = get_kstat_value (ksp_chain, "obytes")) == -1LL)
+		if ((val = get_kstat_value (ksp_chain, "ifspeed")) == -1LL)
 			continue;
 		ksp[numif++] = ksp_chain;
 	}
@@ -155,8 +161,8 @@ static int interface_init (void)
 #endif /* HAVE_LIBKSTAT */
 
 static void if_submit (const char *dev, const char *type,
-		unsigned long long rx,
-		unsigned long long tx)
+		derive_t rx,
+		derive_t tx)
 {
 	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
@@ -164,8 +170,8 @@ static void if_submit (const char *dev, const char *type,
 	if (ignorelist_match (ignorelist, dev) != 0)
 		return;
 
-	values[0].counter = rx;
-	values[1].counter = tx;
+	values[0].derive = rx;
+	values[1].derive = tx;
 
 	vl.values = values;
 	vl.values_len = 2;
@@ -233,7 +239,7 @@ static int interface_read (void)
 #elif KERNEL_LINUX
 	FILE *fh;
 	char buffer[1024];
-	unsigned long long incoming, outgoing;
+	derive_t incoming, outgoing;
 	char *device;
 
 	char *dummy;
@@ -285,8 +291,8 @@ static int interface_read (void)
 
 #elif HAVE_LIBKSTAT
 	int i;
-	unsigned long long rx;
-	unsigned long long tx;
+	derive_t rx;
+	derive_t tx;
 
 	if (kc == NULL)
 		return (-1);
@@ -296,16 +302,29 @@ static int interface_read (void)
 		if (kstat_read (kc, ksp[i], NULL) == -1)
 			continue;
 
-		rx = get_kstat_value (ksp[i], "rbytes");
-		tx = get_kstat_value (ksp[i], "obytes");
+		/* try to get 64bit counters */
+		rx = get_kstat_value (ksp[i], "rbytes64");
+		tx = get_kstat_value (ksp[i], "obytes64");
+		/* or fallback to 32bit */
+		if (rx == -1LL)
+			rx = get_kstat_value (ksp[i], "rbytes");
+		if (tx == -1LL)
+			tx = get_kstat_value (ksp[i], "obytes");
 		if ((rx != -1LL) || (tx != -1LL))
 			if_submit (ksp[i]->ks_name, "if_octets", rx, tx);
 
-		rx = get_kstat_value (ksp[i], "ipackets");
-		tx = get_kstat_value (ksp[i], "opackets");
+		/* try to get 64bit counters */
+		rx = get_kstat_value (ksp[i], "ipackets64");
+		tx = get_kstat_value (ksp[i], "opackets64");
+		/* or fallback to 32bit */
+		if (rx == -1LL)
+			rx = get_kstat_value (ksp[i], "ipackets");
+		if (tx == -1LL)
+			tx = get_kstat_value (ksp[i], "opackets");
 		if ((rx != -1LL) || (tx != -1LL))
 			if_submit (ksp[i]->ks_name, "if_packets", rx, tx);
 
+		/* no 64bit error counters yet */
 		rx = get_kstat_value (ksp[i], "ierrors");
 		tx = get_kstat_value (ksp[i], "oerrors");
 		if ((rx != -1LL) || (tx != -1LL))