Add ndpi_hll_reset() API call

Fixes bug in ndpi_data_window_average() with zero points
This commit is contained in:
Luca Deri
2020-07-15 10:30:45 +02:00
parent 91d132ea3d
commit 9f3e3e8456
3 changed files with 13 additions and 1 deletions
+2 -1
View File
@@ -1059,7 +1059,8 @@ extern "C" {
/* Memory lifecycle */
int ndpi_hll_init(struct ndpi_hll *hll, u_int8_t bits);
void ndpi_hll_destroy(struct ndpi_hll *hll);
void ndpi_hll_reset(struct ndpi_hll *hll);
/* Add values */
void ndpi_hll_add(struct ndpi_hll *hll, const char *data, size_t data_len);
void ndpi_hll_add_number(struct ndpi_hll *hll, u_int32_t value) ;
+7
View File
@@ -144,6 +144,9 @@ float ndpi_data_window_average(struct ndpi_analyze_struct *s) {
float sum = 0.0;
u_int16_t i, n = ndpi_min(s->num_data_entries, s->num_values_array_len);
if(n == 0)
return(0);
for(i=0; i<n; i++)
sum += s->values[i];
@@ -228,6 +231,10 @@ void ndpi_hll_destroy(struct ndpi_hll *hll) {
hll_destroy(hll);
}
void ndpi_hll_reset(struct ndpi_hll *hll) {
hll_reset(hll);
}
void ndpi_hll_add(struct ndpi_hll *hll, const char *data, size_t data_len) {
hll_add(hll, (const void *)data, data_len);
}
+4
View File
@@ -67,6 +67,10 @@ void hll_destroy(struct ndpi_hll *hll) {
hll->registers = NULL;
}
void hll_reset(struct ndpi_hll *hll) {
memset(hll->registers, 0, hll->size);
}
static __inline void _hll_add_hash(struct ndpi_hll *hll, u_int32_t hash) {
u_int32_t index = hash >> (32 - hll->bits);
u_int8_t rank = _hll_rank(hash, hll->bits);