Removed this party LRU and replaced with home grown

3 files changed, 17 insertions, 23 deletions

diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index 661e55732..16b122d06 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -26,7 +26,6 @@
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HTTP
 
 #include "ndpi_api.h"
-#include "lruc.h"
 
 static void ndpi_int_http_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
 					 struct ndpi_flow_struct *flow,
@@ -642,19 +641,15 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
         ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_UNKNOWN);
 
 	if(ndpi_struct->ookla_cache == NULL)
-	  ndpi_struct->ookla_cache = lruc_new(4*1024, 1024);
-
+	  ndpi_struct->ookla_cache = ndpi_lru_cache_init(1024);
+	
 	if(packet->iph != NULL && ndpi_struct->ookla_cache != NULL) {
-	  u_int8_t *dummy = (u_int8_t*)ndpi_malloc(sizeof(u_int8_t));
-
-	  if(dummy) {
-	    if(packet->tcp->source == htons(8080))
-	      lruc_set((lruc*)ndpi_struct->ookla_cache, (void*)&packet->iph->saddr, 4, dummy, 1);
-	    else
-	      lruc_set((lruc*)ndpi_struct->ookla_cache, (void*)&packet->iph->daddr, 4, dummy, 1);
-	  }
+	  if(packet->tcp->source == htons(8080))
+	    ndpi_lru_add_to_cache(ndpi_struct->ookla_cache, packet->iph->saddr);
+	  else
+	    ndpi_lru_add_to_cache(ndpi_struct->ookla_cache, packet->iph->daddr);	  
 	}
-
+	
         return;
       }
 
diff --git a/src/lib/protocols/ookla.c b/src/lib/protocols/ookla.c
index 4d46dbf58..06d97e216 100644
--- a/src/lib/protocols/ookla.c
+++ b/src/lib/protocols/ookla.c
@@ -22,36 +22,32 @@
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_OOKLA
 
 #include "ndpi_api.h"
-#include "lruc.h"
 
 
 void ndpi_search_ookla(struct ndpi_detection_module_struct* ndpi_struct, struct ndpi_flow_struct* flow) {
-#if 0
   struct ndpi_packet_struct* packet = &flow->packet;
   u_int32_t addr = 0;
   void *value;
-  
+
   NDPI_LOG_DBG(ndpi_struct, "Ookla detection\n");
-  
+
   if(packet->tcp->source == htons(8080))
     addr = packet->iph->saddr;
   else if(packet->tcp->dest == htons(8080))
     addr = packet->iph->daddr;
   else
     goto ookla_exclude;
-  
+
   if(ndpi_struct->ookla_cache != NULL) {
-    if(lruc_get(ndpi_struct->ookla_cache, &addr, sizeof(addr), &value) == LRUC_NO_ERROR) {
-      /* Don't remove it as it can be used for other connections */
+    if(ndpi_lru_find_cache(ndpi_struct->ookla_cache, addr, 0 /* Don't remove it as it can be used for other connections */)) {
       NDPI_LOG_INFO(ndpi_struct, "found ookla tcp connection\n");
       ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OOKLA, NDPI_PROTOCOL_UNKNOWN);
       return;
-    }	
+    }
   }
 
  ookla_exclude:
-#endif
-  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);  
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }
 
 void init_ookla_dissector(struct ndpi_detection_module_struct *ndpi_struct,
@@ -65,4 +61,3 @@ void init_ookla_dissector(struct ndpi_detection_module_struct *ndpi_struct,
 
   *id += 1;
 }
-
diff --git a/src/lib/protocols/ssl.c b/src/lib/protocols/ssl.c
index 25d535a57..785ffa70d 100644
--- a/src/lib/protocols/ssl.c
+++ b/src/lib/protocols/ssl.c
@@ -626,6 +626,10 @@ void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
   struct ndpi_packet_struct *packet = &flow->packet;
   u_int8_t ret;
 
+  if(flow->packet.tcp && (5222 == ntohs(flow->packet.tcp->dest)))
+    printf("%u - %u\n", ntohs(flow->packet.tcp->source), ntohs(flow->packet.tcp->dest));
+  
+
   if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL) {
     if(flow->l4.tcp.ssl_stage == 3 && packet->payload_packet_len > 20 && flow->packet_counter < 5) {
       /* this should only happen, when we detected SSL with a packet that had parts of the certificate in subsequent packets