vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-23 03:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removes unused interface second traffic counters

Browse source
This commit is contained in:
Simone Mainardi 2017-09-06 16:00:22 +02:00
parent 4a5f83e1a4
commit ef70bcb2a5
3 changed files with 2 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/NetworkInterface.cpp
View file

@ -98,7 +98,7 @@ NetworkInterface::NetworkInterface(const char *name,
}
}
pkt_dumper_tap = NULL, lastSecUpdate = 0;
pkt_dumper_tap = NULL;
ifname = strdup(name);
ifDescription = strdup(Utils::getInterfaceDescription(ifname, buf, sizeof(buf)));
snmp = new SNMP();
@ -256,7 +256,7 @@ void NetworkInterface::init() {
next_idle_flow_purge = next_idle_host_purge = 0,
running = false, numSubInterfaces = 0,
numVirtualInterfaces = 0, flowHashing = NULL,
pcap_datalink_type = 0, mtuWarningShown = false, lastSecUpdate = 0,
pcap_datalink_type = 0, mtuWarningShown = false,
purge_idle_flows_hosts = true, id = (u_int8_t)-1,
last_remote_pps = 0, last_remote_bps = 0,
sprobe_interface = false, has_vlan_packets = false,
@ -278,9 +278,6 @@ void NetworkInterface::init() {
pcap_datalink_type = 0, cpu_affinity = -1,
pkt_dumper = NULL;
memset(lastMinuteTraffic, 0, sizeof(lastMinuteTraffic));
resetSecondTraffic();
L_user_scripts_inline = L_user_scripts_periodic = NULL;
forceLuaInterpreterReload();
@ -1836,7 +1833,6 @@ void NetworkInterface::purgeIdle(time_t when) {
}
if(pkt_dumper) pkt_dumper->idle(when);
updateSecondTraffic(when);
}
/* **************************************************** */
@ -5002,22 +4998,6 @@ NetworkStats* NetworkInterface::getNetworkStats(u_int8_t networkId) {
/* **************************************** */
void NetworkInterface::updateSecondTraffic(time_t when) {
u_int64_t bytes = ethStats.getNumBytes();
u_int16_t sec = when % 60;
if(sec == 0) {
/* Beginning of a new minute */
memcpy(lastMinuteTraffic, currentMinuteTraffic, sizeof(currentMinuteTraffic));
resetSecondTraffic();
}
currentMinuteTraffic[sec] = max_val(0, bytes-lastSecTraffic);
lastSecTraffic = bytes;
};
/* **************************************** */
void NetworkInterface::checkPointCounters(bool drops_only) {
if(!drops_only) {
checkpointPktCount = getNumPackets(),