Fixed HTTP lower/upper protocol mess for Aimini/IPP.fix/http-lower-upper-proto-weirdness

 * If HTTP was already detected, there is no need to overwrite the detection again

Signed-off-by: lns <matzeton@googlemail.com>

1 files changed, 0 insertions, 11 deletions

diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index 1b3ea7f66..6351e50aa 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -748,11 +748,6 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
     }
   }
 
-#if 0
-  if(flow->http_detected)
-    ndpi_http_parse_subprotocol(ndpi_struct, flow);
-#endif
-
   if(flow->guessed_protocol_id == NDPI_PROTOCOL_UNKNOWN)
     flow->guessed_protocol_id = NDPI_PROTOCOL_HTTP;
 
@@ -1297,12 +1292,6 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
       return;
     }
 
-    /* If we already detected the HTTP request, we can add the connection and then check for the sub-protocol */
-    if(flow->http_detected) {
-      NDPI_LOG_INFO(ndpi_struct, "found HTTP\n");
-      ndpi_int_http_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP, NDPI_PROTOCOL_CATEGORY_WEB);
-    }
-
     /* Parse packet line and we look for the subprotocols */
     ndpi_parse_packet_line_info(ndpi_struct, flow);
     check_content_type_and_change_protocol(ndpi_struct, flow);