From 29f34a17a93c05d4ce2bdfbed51cb612ce413d34 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Sun, 3 Jan 2021 13:54:47 +0100 Subject: Added a new API function `ndpi_free_flow_data' which free's all members of ndpi_flow_struct but not the struct itself. Signed-off-by: Toni Uhlig --- src/include/ndpi_api.h.in | 10 +++++++++- src/lib/ndpi_main.c | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/include/ndpi_api.h.in b/src/include/ndpi_api.h.in index d6145e99a..593cee4f3 100644 --- a/src/include/ndpi_api.h.in +++ b/src/include/ndpi_api.h.in @@ -203,7 +203,15 @@ extern "C" { /** * Frees the memory allocated in the specified flow * - * @par flow = the flow to deallocate + * @par flow = the flow struct which dynamic allocated members should be deallocated + * + */ + void ndpi_free_flow_data(struct ndpi_flow_struct *flow); + + /** + * Frees the memory allocated in the specified flow and the flow struct itself + * + * @par flow = the flow struct and its dynamic allocated members should be deallocated * */ void ndpi_free_flow(struct ndpi_flow_struct *flow); diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 3309e6105..06a14d4e5 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -6310,7 +6310,7 @@ int ndpi_match_bigram(struct ndpi_detection_module_struct *ndpi_str, /* ****************************************************** */ -void ndpi_free_flow(struct ndpi_flow_struct *flow) { +void ndpi_free_flow_data(struct ndpi_flow_struct *flow) { if(flow) { u_int is_quic = flow_is_proto(flow, NDPI_PROTOCOL_QUIC); @@ -6355,7 +6355,12 @@ void ndpi_free_flow(struct ndpi_flow_struct *flow) { if(flow->l4.tcp.tls.message.buffer) ndpi_free(flow->l4.tcp.tls.message.buffer); } + } +} +void ndpi_free_flow(struct ndpi_flow_struct *flow) { + if (flow) { + ndpi_free_flow_data(flow); ndpi_free(flow); } } -- cgit v1.2.3