Merge branch 'dev' of https://github.com/ntop/nDPI into dev

This commit is contained in:
Luca Deri
2019-01-17 00:41:05 +01:00
10 changed files with 22 additions and 22 deletions
+1 -2
View File
@@ -1018,7 +1018,6 @@ void freeIpTree(addr_node *root) {
freeIpTree(root->left);
freeIpTree(root->right);
free(root);
root = NULL;
}
/* *********************************************** */
@@ -2904,7 +2903,7 @@ float getAverage(struct json_object *jObj_stat, char *field){
float average;
float sum = 0;
int r;
int j;
int j = 0;
if((r = strcmp(field, "top.scanner.stats")) == 0) {
for(j=0; j<json_object_array_length(jObj_stat); j++) {