Added ndpi_alloc_data_analysis APi call
This commit is contained in:
@@ -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++) {
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
+12
-7
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user