Date: Sun, 5 Jan 2014 08:14:26 +0000 (UTC) From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338750 - in head/net-mgmt/collectd5: . files Message-ID: <201401050814.s058EQQP063063@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: demon Date: Sun Jan 5 08:14:25 2014 New Revision: 338750 URL: http://svnweb.freebsd.org/changeset/ports/338750 Log: Fix network interface statistics reports broken on FreeBSD-10. Approved by: maintainer Added: head/net-mgmt/collectd5/files/patch-src-interface.c (contents, props changed) Modified: head/net-mgmt/collectd5/Makefile Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Sun Jan 5 07:36:37 2014 (r338749) +++ head/net-mgmt/collectd5/Makefile Sun Jan 5 08:14:25 2014 (r338750) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.4.0 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 5 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ Added: head/net-mgmt/collectd5/files/patch-src-interface.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/collectd5/files/patch-src-interface.c Sun Jan 5 08:14:25 2014 (r338750) @@ -0,0 +1,36 @@ +--- src/interface.c.orig 2014-01-05 00:36:58.000000000 +0400 ++++ src/interface.c 2014-01-05 00:45:10.000000000 +0400 +@@ -212,20 +212,19 @@ static int interface_read (void) + return (-1); + + 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_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_data->IFA_RX_PACKT, +- if_data->IFA_TX_PACKT); +- if_submit (if_ptr->ifa_name, "if_errors", +- if_data->IFA_RX_ERROR, +- if_data->IFA_TX_ERROR); +- } ++ 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_data->IFA_RX_BYTES, ++ if_data->IFA_TX_BYTES); ++ 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_data->IFA_RX_ERROR, ++ if_data->IFA_TX_ERROR); ++ } + + freeifaddrs (if_list); + /* #endif HAVE_GETIFADDRS */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401050814.s058EQQP063063>