vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-10 00:42:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Avoids setting an a priori bound on the sFlow devices

Browse source 
The maximum number of sFlow devices is now controlled by
the hash table which contains sFlow device interfaces
data.

Addresses #3938
This commit is contained in:
Simone Mainardi 2020-05-27 10:34:59 +02:00
parent 9ba746bd78
commit 8b0de7d648
2 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/InterfaceStatsHash.cpp
View file

@ -132,8 +132,8 @@ bool InterfaceStatsHash::set(const sFlowInterfaceStats * const stats) {
/* ************************************ */
void InterfaceStatsHash::luaDeviceList(lua_State *vm) {
u_int32_t flowDevices[MAX_NUM_FLOW_DEVICES] = { 0 };
u_int16_t numDevices = 0;
std::set<u_int32_t> flowDevices; /* Set size automatically limited by max_hash_size */
std::set<u_int32_t>::const_iterator it;
lua_newtable(vm);
@ -144,29 +144,18 @@ void InterfaceStatsHash::luaDeviceList(lua_State *vm) {
if(head) {
bool found = false;
for(int j=0; j<numDevices; j++) {
if(flowDevices[j] == head->deviceIP) {
found = true;
break;
}
}
if(flowDevices.find(head->deviceIP) != flowDevices.end())
found = true;
if(!found) {
char a[64];
flowDevices[numDevices++] = head->deviceIP;
if(numDevices == MAX_NUM_FLOW_DEVICES) {
ntop->getTrace()->traceEvent(TRACE_WARNING,
"Internal error: too many devices %u",
numDevices);
break;
}
flowDevices.insert(head->deviceIP);
lua_push_uint64_table_entry(vm,
Utils::intoaV4(head->deviceIP, a, sizeof(a)),
head->deviceIP);
Utils::intoaV4(head->deviceIP, a, sizeof(a)),
head->deviceIP);
}
}
}