Added ndpi_alloc_data_analysis APi call

4 files changed, 17 insertions, 11 deletions

diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index e77630f1e..912f2f99b 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -3403,7 +3403,7 @@ void serializerUnitTest() {
 // #define RUN_DATA_ANALYSIS_THEN_QUIT 1
 
 void analyzeUnitTest() {
-  struct ndpi_analyze_struct *s = ndpi_init_data_analysis(32);
+  struct ndpi_analyze_struct *s = ndpi_alloc_data_analysis(32);
   u_int32_t i;
 
   for(i=0; i<256; i++) {
diff --git a/example/reader_util.c b/example/reader_util.c
index aa0f5e73f..f2a466e8f 100644
--- a/example/reader_util.c
+++ b/example/reader_util.c
@@ -760,8 +760,8 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
       newflow->src_ip = iph->saddr, newflow->dst_ip = iph->daddr;
       newflow->src_port = htons(*sport), newflow->dst_port = htons(*dport);
       newflow->ip_version = version;
-      newflow->iat_c_to_s = ndpi_init_data_analysis(DATA_ANALUYSIS_SLIDING_WINDOW),
-	newflow->iat_s_to_c =  ndpi_init_data_analysis(DATA_ANALUYSIS_SLIDING_WINDOW);
+      newflow->iat_c_to_s = ndpi_alloc_data_analysis(DATA_ANALUYSIS_SLIDING_WINDOW),
+	newflow->iat_s_to_c =  ndpi_alloc_data_analysis(DATA_ANALUYSIS_SLIDING_WINDOW);
 
       if(version == IPVERSION) {
 	inet_ntop(AF_INET, &newflow->src_ip, newflow->src_name, sizeof(newflow->src_name));
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h
index 97ae56b86..03b26e808 100644
--- a/src/include/ndpi_api.h
+++ b/src/include/ndpi_api.h
@@ -896,7 +896,8 @@ extern "C" {
   int ndpi_deserialize_end_of_record(ndpi_deserializer *deserializer);
 
   /* Data analysis */
-  struct ndpi_analyze_struct* ndpi_init_data_analysis(u_int16_t _max_series_len);
+  struct ndpi_analyze_struct* ndpi_alloc_data_analysis(u_int16_t _max_series_len);
+  void ndpi_init_data_analysis(struct ndpi_analyze_struct *s, u_int16_t _max_series_len);
   void ndpi_free_data_analysis(struct ndpi_analyze_struct *d);
   void ndpi_data_add_value(struct ndpi_analyze_struct *s, const u_int32_t value);
 
diff --git a/src/lib/ndpi_analyze.c b/src/lib/ndpi_analyze.c
index 68f6a7aeb..88ed97cc3 100644
--- a/src/lib/ndpi_analyze.c
+++ b/src/lib/ndpi_analyze.c
@@ -36,14 +36,8 @@
 
 /* ********************************************************************************* */
 
-struct ndpi_analyze_struct* ndpi_init_data_analysis(u_int16_t _max_series_len) {
-  struct ndpi_analyze_struct *ret = ndpi_malloc(sizeof(struct ndpi_analyze_struct));
+void ndpi_init_data_analysis(struct ndpi_analyze_struct *ret, u_int16_t _max_series_len) {
   u_int32_t len;
-
-  if(ret == NULL)
-    return(ret);
-  else
-    memset(ret, 0, sizeof(struct ndpi_analyze_struct));
   
   if(_max_series_len > MAX_SERIES_LEN) _max_series_len = MAX_SERIES_LEN;
   ret->num_values_array_len = _max_series_len;
@@ -57,6 +51,17 @@ struct ndpi_analyze_struct* ndpi_init_data_analysis(u_int16_t _max_series_len) {
       memset(ret->values, 0, len);
   } else
     ret->values = NULL;
+}
+
+/* ********************************************************************************* */
+
+struct ndpi_analyze_struct* ndpi_alloc_data_analysis(u_int16_t _max_series_len) {
+  struct ndpi_analyze_struct *ret = ndpi_malloc(sizeof(struct ndpi_analyze_struct));
+
+  if(ret != NULL) {
+    memset(ret, 0, sizeof(struct ndpi_analyze_struct));
+    ndpi_init_data_analysis(ret, _max_series_len);
+  }
   
   return(ret);
 }