Removed VEOHTV protocol and replaced with HTTPDownload

Fixed bug that prevented content type to be properly detected

1 files changed, 5 insertions, 9 deletions

diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index b0fe04159..caac7390b 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -37,18 +37,14 @@ static void ndpi_int_http_add_connection(struct ndpi_detection_module_struct *nd
 
     /* If no custom protocol has been detected */
     if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
-      if(protocol != NDPI_PROTOCOL_HTTP) {
-	ndpi_search_tcp_or_udp(ndpi_struct, flow);
-	ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
-      } else {
+      if(protocol == NDPI_PROTOCOL_HTTP)
 	ndpi_int_reset_protocol(flow);
-	ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
-      }
+
+      ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
     }
 
     flow->http_detected = 1;
   }
-
 }
 
 #ifdef NDPI_CONTENT_FLASH
@@ -202,10 +198,10 @@ static void parseHttpSubprotocol(struct ndpi_detection_module_struct *ndpi_struc
 
     /*
       NOTE
-
+      
       If http_dont_dissect_response = 1 dissection of HTTP response
       mime types won't happen
-     */
+    */
     ndpi_match_host_subprotocol(ndpi_struct, flow, (char *)flow->host_server_name,
 				strlen((const char *)flow->host_server_name),
 				NDPI_PROTOCOL_HTTP);