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

Implement "hide from top" preference

Browse source
This commit is contained in:
emanuele-f 2018-03-05 14:32:44 +01:00
parent 8b1dfdeac3
commit 4c84f1da2f
16 changed files with 355 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/NetworkInterface.cpp
View file

@ -243,6 +243,8 @@ NetworkInterface::NetworkInterface(const char *name,
}
}
#endif
reloadHideFromTop(false);
}
/* **************************************************** */
@ -280,6 +282,7 @@ void NetworkInterface::init() {
ip_addresses = "", networkStats = NULL,
pcap_datalink_type = 0, cpu_affinity = -1,
pkt_dumper = NULL;
hide_from_top = hide_from_top_shadow = NULL;
L_user_scripts_inline = L_user_scripts_periodic = NULL;
forceLuaInterpreterReload();
@ -667,6 +670,8 @@ NetworkInterface::~NetworkInterface() {
#endif
if(flow_interfaces_stats) delete flow_interfaces_stats;
#endif
if(hide_from_top) delete(hide_from_top);
if(hide_from_top_shadow) delete(hide_from_top_shadow);
termLuaInterpreter();
}
@ -5843,6 +5848,71 @@ void NetworkInterface::termLuaInterpreter() {
/* **************************************** */
static bool host_reload_hide_from_top(GenericHashEntry *host, void *user_data, bool *matched) {
Host *h = (Host*)host;
h->reloadHideFromTop();
return(false); /* false = keep on walking */
}
void NetworkInterface::reloadHideFromTop(bool refreshHosts) {
char kname[64];
char **networks = NULL;
VlanAddressTree *new_tree;
if ((new_tree = new VlanAddressTree) == NULL) {
ntop->getTrace()->traceEvent(TRACE_ERROR, "Not enough memory");
return;
}
snprintf(kname, sizeof(kname), CONST_IFACE_HIDE_FROM_TOP_PREFS, id);
int num_nets = ntop->getRedis()->smembers(kname, &networks);
char *at;
u_int16_t vlan_id;
for(int i=0; i<num_nets; i++) {
char *net = networks[i];
if(!net) continue;
if((at = strchr(net, '@'))) {
vlan_id = atoi(at + 1);
*at = '\0';
} else
vlan_id = 0;
new_tree->addAddress(vlan_id, net, 1);
free(net);
}
if(networks) free(networks);
if(hide_from_top_shadow) delete(hide_from_top_shadow);
hide_from_top_shadow = hide_from_top;
hide_from_top = new_tree;
if(refreshHosts) {
/* Reload existing hosts */
u_int32_t begin_slot = 0;
bool walk_all = true;
walker(&begin_slot, walk_all, walker_hosts, host_reload_hide_from_top, NULL);
}
}
/* **************************************** */
bool NetworkInterface::isHiddenFromTop(Host *host) {
VlanAddressTree *vlan_addrtree = hide_from_top;
if(!vlan_addrtree) return false;
AddressTree *tree = vlan_addrtree->getAddressTree(host->getVlanId());
return host->get_ip()->findAddress(tree);
}
/* **************************************** */
int NetworkInterface::luaEvalFlow(Flow *f, const LuaCallback cb) {
int rc;
lua_State *L = NULL;