X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Finterface.c;h=548832258d329bc270118ef92e94a31b6acd403e;hb=71bbf854d3e6f8c6d6c3582527263bb01a3a7e04;hp=caaad47a4acc8e03902e93277b67dfe52c0f1df2;hpb=7531a36086295c02ccb2d78c41d355a424426607;p=collectd.git diff --git a/src/interface.c b/src/interface.c index caaad47a..54883225 100644 --- a/src/interface.c +++ b/src/interface.c @@ -84,12 +84,14 @@ static const char *config_keys[] = { "Interface", "IgnoreSelected", - NULL + "ReportInactive", }; -static int config_keys_num = 2; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); static ignorelist_t *ignorelist = NULL; +static _Bool report_inactive = 1; + #ifdef HAVE_LIBKSTAT #define MAX_NUMIF 256 extern kstat_ctl_t *kc; @@ -114,6 +116,8 @@ static int interface_config (const char *key, const char *value) invert = 0; ignorelist_set_invert (ignorelist, invert); } + else if (strcasecmp (key, "ReportInactive") == 0) + report_inactive = IS_TRUE (value); else if (strcasecmp (key, "UniqueName") == 0) { #ifdef HAVE_LIBKSTAT @@ -135,7 +139,6 @@ static int interface_config (const char *key, const char *value) static int interface_init (void) { kstat_t *ksp_chain; - derive_t val; numif = 0; @@ -152,7 +155,7 @@ static int interface_init (void) continue; if (kstat_read (kc, ksp_chain, NULL) == -1) continue; - if ((val = get_kstat_value (ksp_chain, "obytes")) == -1LL) + if (get_kstat_value (ksp_chain, "obytes") == -1LL) continue; ksp[numif++] = ksp_chain; } @@ -190,7 +193,7 @@ static int interface_read (void) struct ifaddrs *if_list; struct ifaddrs *if_ptr; -/* Darin/Mac OS X and possible other *BSDs */ +/* Darwin/Mac OS X and possible other *BSDs */ #if HAVE_STRUCT_IF_DATA # define IFA_DATA if_data # define IFA_RX_BYTES ifi_ibytes @@ -223,6 +226,9 @@ static int interface_read (void) if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) { if_data = (struct IFA_DATA *) if_ptr->ifa_data; + if (!report_inactive && if_data->IFA_RX_PACKT == 0 && if_data->IFA_TX_PACKT == 0) + continue; + if_submit (if_ptr->ifa_name, "if_octets", if_data->IFA_RX_BYTES, if_data->IFA_TX_BYTES); @@ -275,14 +281,17 @@ static int interface_read (void) if (numfields < 11) continue; - incoming = atoll (fields[0]); - outgoing = atoll (fields[8]); - if_submit (device, "if_octets", incoming, outgoing); - incoming = atoll (fields[1]); outgoing = atoll (fields[9]); + if (!report_inactive && incoming == 0 && outgoing == 0) + continue; + if_submit (device, "if_packets", incoming, outgoing); + incoming = atoll (fields[0]); + outgoing = atoll (fields[8]); + if_submit (device, "if_octets", incoming, outgoing); + incoming = atoll (fields[2]); outgoing = atoll (fields[10]); if_submit (device, "if_errors", incoming, outgoing); @@ -315,26 +324,28 @@ static int interface_read (void) sstrncpy(iname, ksp[i]->ks_name, sizeof(iname)); /* try to get 64bit counters */ - rx = get_kstat_value (ksp[i], "rbytes64"); - tx = get_kstat_value (ksp[i], "obytes64"); + 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], "rbytes"); + rx = get_kstat_value (ksp[i], "ipackets"); if (tx == -1LL) - tx = get_kstat_value (ksp[i], "obytes"); + tx = get_kstat_value (ksp[i], "opackets"); + if (!report_inactive && rx == 0 && tx == 0) + continue; if ((rx != -1LL) || (tx != -1LL)) - if_submit (iname, "if_octets", rx, tx); + if_submit (iname, "if_packets", rx, tx); /* try to get 64bit counters */ - rx = get_kstat_value (ksp[i], "ipackets64"); - tx = get_kstat_value (ksp[i], "opackets64"); + 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], "ipackets"); + rx = get_kstat_value (ksp[i], "rbytes"); if (tx == -1LL) - tx = get_kstat_value (ksp[i], "opackets"); + tx = get_kstat_value (ksp[i], "obytes"); if ((rx != -1LL) || (tx != -1LL)) - if_submit (iname, "if_packets", rx, tx); + if_submit (iname, "if_octets", rx, tx); /* no 64bit error counters yet */ rx = get_kstat_value (ksp[i], "ierrors"); @@ -350,8 +361,11 @@ static int interface_read (void) ios = sg_get_network_io_stats (&num); - for (i = 0; i < num; i++) + for (i = 0; i < num; i++) { + if (!report_inactive && ios[i].rx == 0 && ios[i].tx == 0) + continue; if_submit (ios[i].interface_name, "if_octets", ios[i].rx, ios[i].tx); + } /* #endif HAVE_LIBSTATGRAB */ #elif defined(HAVE_PERFSTAT) @@ -368,9 +382,8 @@ static int interface_read (void) if (pnif != nif || ifstat == NULL) { - if (ifstat != NULL) - free(ifstat); - ifstat = malloc(nif * sizeof(perfstat_netinterface_t)); + free(ifstat); + ifstat = malloc(nif * sizeof (*ifstat)); } pnif = nif; @@ -385,6 +398,9 @@ static int interface_read (void) for (i = 0; i < ifs; i++) { + if (!report_inactive && ifstat[i].ipackets == 0 && ifstat[i].opackets == 0) + continue; + if_submit (ifstat[i].name, "if_octets", ifstat[i].ibytes, ifstat[i].obytes); if_submit (ifstat[i].name, "if_packets", ifstat[i].ipackets ,ifstat[i].opackets); if_submit (ifstat[i].name, "if_errors", ifstat[i].ierrors, ifstat[i].oerrors ); @@ -403,3 +419,4 @@ void module_register (void) #endif plugin_register_read ("interface", interface_read); } /* void module_register */ +