X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Finterface.c;h=df8ffb46c34522ee5696b22a3409a687c37161e4;hp=c1e28e32c962aff7a3393ae321634affb6a44be1;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hpb=50c6b81549e3239034f71f00ff7dde4c6a8767e5

diff --git a/src/interface.c b/src/interface.c
index c1e28e32..df8ffb46 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -17,7 +17,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  *   Sune Marcher <sm at flork.dk>
  *   Manuel Sanmartin
  **/
@@ -213,18 +213,19 @@ static int interface_read (void)
 
 	for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
 	{
-		if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL)
-			continue;
+		if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
+			if_data = (struct IFA_DATA *) if_ptr->ifa_data;
 
-		if_submit (if_ptr->ifa_name, "if_octets",
+			if_submit (if_ptr->ifa_name, "if_octets",
 				if_data->IFA_RX_BYTES,
 				if_data->IFA_TX_BYTES);
-		if_submit (if_ptr->ifa_name, "if_packets",
+			if_submit (if_ptr->ifa_name, "if_packets",
 				if_data->IFA_RX_PACKT,
 				if_data->IFA_TX_PACKT);
-		if_submit (if_ptr->ifa_name, "if_errors",
+			if_submit (if_ptr->ifa_name, "if_errors",
 				if_data->IFA_RX_ERROR,
 				if_data->IFA_TX_ERROR);
+		}
 	}
 
 	freeifaddrs (if_list);
@@ -296,16 +297,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))