vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-16 19:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Hide top hidden hosts

Browse source
This commit is contained in:
emanuele-f 2018-03-05 16:01:10 +01:00
parent 4c84f1da2f
commit 86ac46abd4
7 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/NetworkInterface.cpp
View file

@ -3199,6 +3199,7 @@ struct flowHostRetriever {
u_int8_t ipVersionFilter; /* Not used in flow_search_walker */
bool filteredHosts; /* Not used in flow_search_walker */
bool blacklistedHosts; /* Not used in flow_search_walker */
bool hideTopHidden; /* Not used in flow_search_walker */
u_int16_t vlan_id;
char *osFilter;
u_int32_t asnFilter;
@ -3439,6 +3440,7 @@ static bool host_search_walker(GenericHashEntry *he, void *user_data, bool *matc
(r->country && strlen(r->country) && strcmp(h->get_country(buf, sizeof(buf)), r->country)) ||
(r->osFilter && strlen(r->osFilter) && (!h->get_os() || strcmp(h->get_os(), r->osFilter))) ||
(r->blacklistedHosts && !h->isBlacklisted()) ||
(r->hideTopHidden && h->isHiddenFromTop()) ||
#ifdef NTOPNG_PRO
(r->filteredHosts && !h->hasBlockedTraffic()) ||
#endif
@ -4110,7 +4112,8 @@ int NetworkInterface::sortHosts(u_int32_t *begin_slot,
char *countryFilter, char *mac_filter,
u_int16_t vlan_id, char *osFilter,
u_int32_t asnFilter, int16_t networkFilter,
u_int16_t pool_filter, bool filtered_hosts, bool blacklisted_hosts,
u_int16_t pool_filter, bool filtered_hosts,
bool blacklisted_hosts, bool hide_top_hidden,
u_int8_t ipver_filter, int proto_filter,
bool hostMacsOnly, char *sortColumn) {
u_int32_t maxHits;
@ -4148,6 +4151,7 @@ int NetworkInterface::sortHosts(u_int32_t *begin_slot,
retriever->ipVersionFilter = ipver_filter;
retriever->filteredHosts = filtered_hosts;
retriever->blacklistedHosts = blacklisted_hosts;
retriever->hideTopHidden = hide_top_hidden;
retriever->ndpi_proto = proto_filter;
retriever->maxNumEntries = maxHits, retriever->hostMacsOnly = hostMacsOnly;
retriever->elems = (struct flowHostRetrieveList*)calloc(sizeof(struct flowHostRetrieveList), retriever->maxNumEntries);
@ -4341,7 +4345,8 @@ int NetworkInterface::getActiveHostsList(lua_State* vm,
char *countryFilter, char *mac_filter,
u_int16_t vlan_id, char *osFilter,
u_int32_t asnFilter, int16_t networkFilter,
u_int16_t pool_filter, bool filtered_hosts, bool blacklisted_hosts,
u_int16_t pool_filter, bool filtered_hosts,
bool blacklisted_hosts, bool hide_top_hidden,
u_int8_t ipver_filter, int proto_filter,
char *sortColumn, u_int32_t maxHits,
u_int32_t toSkip, bool a2zSortOrder) {
@ -4359,7 +4364,7 @@ int NetworkInterface::getActiveHostsList(lua_State* vm,
&retriever, bridge_iface_idx,
allowed_hosts, host_details, location,
countryFilter, mac_filter, vlan_id, osFilter,
asnFilter, networkFilter, pool_filter, filtered_hosts, blacklisted_hosts, ipver_filter, proto_filter,
asnFilter, networkFilter, pool_filter, filtered_hosts, blacklisted_hosts, hide_top_hidden, ipver_filter, proto_filter,
false /* All MACs */, sortColumn) < 0) {
enablePurge(false);
return -1;
@ -4499,7 +4504,7 @@ int NetworkInterface::getActiveHostsGroup(lua_State* vm,
allowed_hosts, host_details, location,
countryFilter, NULL /* Mac */, vlan_id,
osFilter, asnFilter, networkFilter, pool_filter,
filtered_hosts, false /* no blacklisted hosts filter */,
filtered_hosts, false /* no blacklisted hosts filter */, false,
ipver_filter, -1 /* no protocol filter */,
local_macs, groupColumn) < 0 ) {
enablePurge(false);