X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=9501161ce87b4e6cfaeb65cb4c190d238125ffea;hb=a24bf968e72f9a103a354dcc833619a40849cfcd;hp=c1e28e32c962aff7a3393ae321634affb6a44be1;hpb=0eff156c7816507fa1865b76e948574dd320fae0;p=collectd.git

diff --git a/src/interface.c b/src/interface.c
index c1e28e32..9501161c 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -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;
 	}
@@ -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))