vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-22 19:21:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed invalid termination sequence that might have lead to crash during termination

Browse source
This commit is contained in:
Luca Deri 2017-11-12 12:40:03 +01:00
parent a18ac6309a
commit b5ad7ebfce
4 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/NetworkInterface.cpp
View file

@ -625,6 +625,7 @@ void NetworkInterface::deleteDataStructures() {
if(ases_hash) { delete(ases_hash); ases_hash = NULL; }
if(vlans_hash) { delete(vlans_hash); vlans_hash = NULL; }
if(macs_hash) { delete(macs_hash); macs_hash = NULL; }
#ifdef NTOPNG_PRO
if(aggregated_flows_hash) {
aggregated_flows_hash->cleanup();
@ -633,11 +634,6 @@ void NetworkInterface::deleteDataStructures() {
}
#endif
if(ndpi_struct) {
ndpi_exit_detection_module(ndpi_struct);
ndpi_struct = NULL;
}
if(ifname) {
//ntop->getTrace()->traceEvent(TRACE_NORMAL, "Interface %s shutdown", ifname);
free(ifname);
@ -655,9 +651,9 @@ NetworkInterface::~NetworkInterface() {
cleanup();
}
if(db) delete db;
if(host_pools) delete host_pools; /* note: this requires ndpi_struct */
deleteDataStructures();
if(host_pools) delete host_pools; /* note: this requires ndpi_struct */
if(ifDescription) free(ifDescription);
if(discovery) delete discovery;
if(mdns) delete mdns;
@ -681,10 +677,15 @@ NetworkInterface::~NetworkInterface() {
flowHashing = NULL;
}
ndpi_exit_detection_module(ndpi_struct);
if(ndpi_struct) {
ndpi_exit_detection_module(ndpi_struct);
ndpi_struct = NULL;
}
delete frequentProtocols;
delete frequentMacs;
if(db) delete db;
#ifdef NTOPNG_PRO
if(policer) delete(policer);
#ifndef HAVE_NEDGE
@ -773,8 +774,6 @@ int NetworkInterface::dumpDBFlow(time_t when, Flow *f) {
#ifdef NTOPNG_PRO
int NetworkInterface::dumpAggregatedFlow(AggregatedFlow *f) {
// ntop->getTrace()->traceEvent(TRACE_NORMAL, "*** DUMP ***");
if(db
&& f
&& (f->get_packets() > 0)
@ -786,8 +785,6 @@ int NetworkInterface::dumpAggregatedFlow(AggregatedFlow *f) {
"Going to dump AggregatedFlow to database [%s]",
f->print(buf, sizeof(buf)));
#endif
//return(dynamic_cast<BatchedMySQLDB*>(db)->dumpAggregatedFlow(f));
return(db->dumpAggregatedFlow(f));
}