diff --git a/include/NetworkInterface.h b/include/NetworkInterface.h index 0be49d8220..90de56e94d 100644 --- a/include/NetworkInterface.h +++ b/include/NetworkInterface.h @@ -270,13 +270,13 @@ class NetworkInterface : public AlertableEntity { virtual ~NetworkInterface(); bool initFlowDump(u_int8_t num_dump_interfaces); - virtual u_int32_t getASesHashSize(); - virtual u_int32_t getCountriesHashSize(); - virtual u_int32_t getVLANsHashSize(); - virtual u_int32_t getMacsHashSize(); - virtual u_int32_t getHostsHashSize(); + u_int32_t getASesHashSize(); + u_int32_t getCountriesHashSize(); + u_int32_t getVLANsHashSize(); + u_int32_t getMacsHashSize(); + u_int32_t getHostsHashSize(); + u_int32_t getArpHashMatrixSize(); virtual u_int32_t getFlowsHashSize(); - virtual u_int32_t getArpHashMatrixSize(); virtual bool walker(u_int32_t *begin_slot, bool walk_all, diff --git a/include/ViewInterface.h b/include/ViewInterface.h index 173eb78249..0ac3f66b7f 100644 --- a/include/ViewInterface.h +++ b/include/ViewInterface.h @@ -54,11 +54,6 @@ class ViewInterface : public NetworkInterface { virtual u_int64_t getCheckPointNumBytes(); virtual u_int32_t getCheckPointNumPacketDrops(); - virtual u_int32_t getASesHashSize(); - virtual u_int32_t getCountriesHashSize(); - virtual u_int32_t getVLANsHashSize(); - virtual u_int32_t getMacsHashSize(); - virtual u_int32_t getHostsHashSize(); virtual u_int32_t getFlowsHashSize(); virtual Flow* findFlowByKey(u_int32_t key, AddressTree *allowed_hosts); virtual Flow* findFlowByTuple(u_int16_t vlan_id, diff --git a/src/ViewInterface.cpp b/src/ViewInterface.cpp index 926961ddd2..cb72def96e 100644 --- a/src/ViewInterface.cpp +++ b/src/ViewInterface.cpp @@ -188,62 +188,6 @@ u_int32_t ViewInterface::getFlowsHashSize() { /* **************************************************** */ -u_int32_t ViewInterface::getMacsHashSize() { - u_int32_t tot = 0; - - for(u_int8_t s = 0; s < num_viewed_interfaces; s++) - tot += viewed_interfaces[s]->getMacsHashSize(); - - return(tot); -} - -/* **************************************************** */ - -u_int32_t ViewInterface::getHostsHashSize() { - u_int32_t tot = 0; - - for(u_int8_t s = 0; s < num_viewed_interfaces; s++) { - tot += viewed_interfaces[s]->getHostsHashSize(); - } - - return(tot); -} - -/* **************************************************** */ - -u_int32_t ViewInterface::getASesHashSize() { - u_int32_t tot = 0; - - for(u_int8_t s = 0; s < num_viewed_interfaces; s++) - tot += viewed_interfaces[s]->getASesHashSize(); - - return(tot); -} - -/* **************************************************** */ - -u_int32_t ViewInterface::getCountriesHashSize() { - u_int32_t tot = 0; - - for(u_int8_t s = 0; s < num_viewed_interfaces; s++) - tot += viewed_interfaces[s]->getCountriesHashSize(); - - return(tot); -} - -/* **************************************************** */ - -u_int32_t ViewInterface::getVLANsHashSize() { - u_int32_t tot = 0; - - for(u_int8_t s = 0; s < num_viewed_interfaces; s++) - tot += viewed_interfaces[s]->getVLANsHashSize(); - - return(tot); -} - -/* **************************************************** */ - Flow* ViewInterface::findFlowByKey(u_int32_t key, AddressTree *allowed_hosts) { Flow *f = NULL; @@ -354,8 +298,6 @@ void ViewInterface::flowPollLoop() { static void* flowPollLoop(void* ptr) { ViewInterface *iface = (ViewInterface*)ptr; - ntop->getTrace()->traceEvent(TRACE_NORMAL, "Starting flows polling for %s", iface->get_name()); - /* Wait until the initialization completes */ while(!iface->isRunning()) sleep(1);