Fixed initialization

1 files changed, 20 insertions, 3 deletions

diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index 5acaa99a0..b2b6370dd 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -385,7 +385,6 @@ void ndpiCheckHostStringMatch(char *testChar) {
 
   ndpi_str = ndpi_init_detection_module(NULL);
   NDPI_BITMASK_SET_ALL(all);
-  ndpi_set_protocol_detection_bitmask2(ndpi_str, &all);
   ndpi_finalize_initialization(ndpi_str);
 
   testRes =  ndpi_match_string_subprotocol(ndpi_str,
@@ -691,6 +690,7 @@ static void help(u_int long_help) {
 
   NDPI_PROTOCOL_BITMASK all;
   struct ndpi_detection_module_struct *ndpi_str = ndpi_init_detection_module(NULL);
+
   NDPI_BITMASK_SET_ALL(all);
   ndpi_set_protocol_detection_bitmask2(ndpi_str, &all);
 
@@ -854,8 +854,8 @@ void extcap_config() {
   int i;
   ndpi_proto_defaults_t *proto_defaults;
   NDPI_PROTOCOL_BITMASK all;
-
   struct ndpi_detection_module_struct *ndpi_str = ndpi_init_detection_module(NULL);
+
   if(!ndpi_str) exit(0);
 
   NDPI_BITMASK_SET_ALL(all);
@@ -1367,8 +1367,15 @@ static void parseOptions(int argc, char **argv) {
     case '9':
     {
       struct ndpi_detection_module_struct *ndpi_str = ndpi_init_detection_module(NULL);
+      NDPI_PROTOCOL_BITMASK all;
+
+      NDPI_BITMASK_SET_ALL(all);
+      ndpi_set_protocol_detection_bitmask2(ndpi_str, &all);
+      ndpi_finalize_initialization(ndpi_str);
+
       extcap_packet_filter = ndpi_get_proto_by_name(ndpi_str, optarg);
       if(extcap_packet_filter == NDPI_PROTOCOL_UNKNOWN) extcap_packet_filter = atoi(optarg);
+
       ndpi_exit_detection_module(ndpi_str);
       break;
     }
@@ -6161,10 +6168,15 @@ void domainSearchUnitTest() {
   u_int16_t class_id;
   struct ndpi_detection_module_struct *ndpi_str = ndpi_init_detection_module(NULL);
   u_int8_t trace = 0;
+  NDPI_PROTOCOL_BITMASK all;
 
   assert(ndpi_str);
   assert(sc);
 
+  NDPI_BITMASK_SET_ALL(all);
+  ndpi_set_protocol_detection_bitmask2(ndpi_str, &all);
+  ndpi_finalize_initialization(ndpi_str);
+
   ndpi_domain_classify_add(ndpi_str, sc, NDPI_PROTOCOL_NTOP, ".ntop.org");
   ndpi_domain_classify_add(ndpi_str, sc, NDPI_PROTOCOL_NTOP, domain);
   assert(ndpi_domain_classify_hostname(ndpi_str, sc, &class_id, domain));
@@ -6180,7 +6192,7 @@ void domainSearchUnitTest() {
 
   u_int32_t s = ndpi_domain_classify_size(sc);
   if(trace) printf("ndpi_domain_classify size: %u \n",s);
-  
+
 
   ndpi_domain_classify_free(sc);
   ndpi_exit_detection_module(ndpi_str);
@@ -6192,10 +6204,15 @@ void domainSearchUnitTest2() {
   struct ndpi_detection_module_struct *ndpi_str = ndpi_init_detection_module(NULL);
   ndpi_domain_classify *c = ndpi_domain_classify_alloc();
   u_int16_t class_id = 9;
+  NDPI_PROTOCOL_BITMASK all;
 
   assert(ndpi_str);
   assert(c);
 
+  NDPI_BITMASK_SET_ALL(all);
+  ndpi_set_protocol_detection_bitmask2(ndpi_str, &all);
+  ndpi_finalize_initialization(ndpi_str);
+
   ndpi_domain_classify_add(ndpi_str, c, class_id, "ntop.org");
   ndpi_domain_classify_add(ndpi_str, c, class_id, "apple.com");