1 files changed, 50 insertions, 8 deletions

diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index ac8543648..fcf86449a 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include "ahocorasick.h"
 #include "libcache.h"
-#include "lruc.h"
 
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_UNKNOWN
 
@@ -842,21 +841,21 @@ static int init_hyperscan(struct ndpi_detection_module_struct *ndpi_mod) {
   }
 
   need_to_be_free = (unsigned char*)calloc(sizeof(unsigned char), num_patterns + 1);
-  if (!need_to_be_free) {
+  if(!need_to_be_free) {
     free(expressions);
     free(ids);
     return(-1);
   }
 
-  for (i = 0, j = 0; host_match[i].string_to_match != NULL || host_match[i].pattern_to_match != NULL; i++) {
-    if (host_match[i].pattern_to_match) {
+  for(i = 0, j = 0; host_match[i].string_to_match != NULL || host_match[i].pattern_to_match != NULL; i++) {
+    if(host_match[i].pattern_to_match) {
       expressions[j] = host_match[i].pattern_to_match;
       ids[j] = host_match[i].protocol_id;
       need_to_be_free[j] = 0;
       ++j;
     } else {
       expressions[j] = string2hex(host_match[i].string_to_match);
-      if (expressions[j] != NULL) {
+      if(expressions[j] != NULL) {
         ids[j] = host_match[i].protocol_id;
         need_to_be_free[j] = 1;
         ++j;
@@ -871,11 +870,12 @@ static int init_hyperscan(struct ndpi_detection_module_struct *ndpi_mod) {
 
   rc = hyperscan_load_patterns(hs, j, (const char**)expressions, ids);
 
-  for (i = 0; i < j; ++i)
-    if (need_to_be_free[i])
+  for(i = 0; i < j; ++i)
+    if(need_to_be_free[i])
       free(expressions[i]);
   free(expressions), free(ids);
 
+  free(need_to_be_free);
   return(rc);
 }
 
@@ -2433,7 +2433,7 @@ void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_struct
       cache_free((cache_t)(ndpi_struct->tinc_cache));
 
     if(ndpi_struct->ookla_cache)
-      lruc_free((lruc*)ndpi_struct->ookla_cache);
+      ndpi_lru_free_cache(ndpi_struct->ookla_cache);
 
     if(ndpi_struct->protocols_ptree)
       ndpi_Destroy_Patricia((patricia_tree_t*)ndpi_struct->protocols_ptree, free_ptree_data);
@@ -6171,6 +6171,48 @@ void ndpi_set_log_level(struct ndpi_detection_module_struct *ndpi_mod, u_int l)
 
 /* ******************************************************************** */
 
+/* LRU cache */
+
+struct ndpi_lru_cache* ndpi_lru_cache_init(u_int32_t num_entries) {
+  struct ndpi_lru_cache *c = (struct ndpi_lru_cache*)malloc(sizeof(struct ndpi_lru_cache));
+
+  if(!c) return(NULL);
+
+  c->entries = (u_int32_t*)calloc(num_entries, sizeof(u_int32_t));
+
+  if(!c->entries) {
+    free(c);
+    return(NULL);
+  } else  
+    c->num_entries = num_entries;
+  
+  return(c);
+}
+
+void ndpi_lru_free_cache(struct ndpi_lru_cache *c) {
+  free(c->entries);
+  free(c);
+}
+
+
+u_int8_t ndpi_lru_find_cache(struct ndpi_lru_cache *c, u_int32_t key, u_int8_t clean_key_when_found) {
+  u_int32_t slot = key % c->num_entries;
+
+  if(c->entries[slot] == key) {
+    if(clean_key_when_found) c->entries[slot] = 0;
+    return(1);
+  } else
+    return(0);
+}
+
+void ndpi_lru_add_to_cache(struct ndpi_lru_cache *c, u_int32_t key) {
+  u_int32_t slot = key % c->num_entries;
+
+  c->entries[slot] = key;
+}
+
+/* ******************************************************************** */
+
 /*
   NOTE:
   - Leave fields empty/zero when information is missing (e.g. with ICMP ports are zero)