Make ndpi_finalize_initialization() returns an error code
We should check if the initialization was fine or not
This commit is contained in:
@@ -2831,7 +2831,7 @@ static void on_protocol_discovered(struct ndpi_workflow * workflow,
|
||||
static void setupDetection(u_int16_t thread_id, pcap_t * pcap_handle) {
|
||||
NDPI_PROTOCOL_BITMASK enabled_bitmask;
|
||||
struct ndpi_workflow_prefs prefs;
|
||||
int i;
|
||||
int i, ret;
|
||||
ndpi_cfg_error rc;
|
||||
|
||||
memset(&prefs, 0, sizeof(prefs));
|
||||
@@ -2931,8 +2931,11 @@ static void setupDetection(u_int16_t thread_id, pcap_t * pcap_handle) {
|
||||
cfgs[i].proto, cfgs[i].param, cfgs[i].value, rc);
|
||||
}
|
||||
|
||||
|
||||
ndpi_finalize_initialization(ndpi_thread_info[thread_id].workflow->ndpi_struct);
|
||||
ret = ndpi_finalize_initialization(ndpi_thread_info[thread_id].workflow->ndpi_struct);
|
||||
if(ret != 0) {
|
||||
fprintf(stderr, "Error ndpi_finalize_initialization: %d\n", ret);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if(enable_doh_dot_detection)
|
||||
ndpi_set_detection_preferences(ndpi_thread_info[thread_id].workflow->ndpi_struct, ndpi_pref_enable_tls_block_dissection, 1);
|
||||
|
||||
@@ -222,8 +222,10 @@ extern "C" {
|
||||
*
|
||||
* @par ndpi_str = the struct created for the protocol detection
|
||||
*
|
||||
* @return 0 on success
|
||||
*
|
||||
*/
|
||||
void ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str);
|
||||
int ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str);
|
||||
|
||||
/**
|
||||
* Frees the dynamic memory allocated members in the specified flow
|
||||
|
||||
+5
-5
@@ -3514,13 +3514,13 @@ static void ndpi_add_domain_risk_exceptions(struct ndpi_detection_module_struct
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
void ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str) {
|
||||
int ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str) {
|
||||
u_int i;
|
||||
|
||||
if(!ndpi_str)
|
||||
return;
|
||||
return -1;
|
||||
if(ndpi_str->finalized) /* Already finalized */
|
||||
return;
|
||||
return 0;
|
||||
|
||||
ndpi_add_domain_risk_exceptions(ndpi_str);
|
||||
|
||||
@@ -3589,7 +3589,7 @@ void ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str)
|
||||
}
|
||||
}
|
||||
|
||||
if(ndpi_str->ac_automa_finalized) return;
|
||||
if(ndpi_str->ac_automa_finalized) return -1;
|
||||
|
||||
ndpi_automa * const automa[] = { &ndpi_str->host_automa,
|
||||
&ndpi_str->tls_cert_subject_automa,
|
||||
@@ -3607,7 +3607,7 @@ void ndpi_finalize_initialization(struct ndpi_detection_module_struct *ndpi_str)
|
||||
|
||||
ndpi_str->finalized = 1;
|
||||
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
Reference in New Issue
Block a user