1 files changed, 51 insertions, 38 deletions

diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 79ca7b064..48404fcfd 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -4050,8 +4050,14 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
 
   if(flow == NULL)
     return(ret);
-  else
-    ret.category = flow->category;
+
+  /* Init defaults */
+  ret.master_protocol = flow->detected_protocol_stack[1], ret.app_protocol = flow->detected_protocol_stack[0];
+  ret.category = flow->category;
+
+  /* Ensure that we don't change our mind if detection is already complete */
+  if((ret.master_protocol != NDPI_PROTOCOL_UNKNOWN) && (ret.app_protocol != NDPI_PROTOCOL_UNKNOWN))
+    return(ret);
 
   /* TODO: add the remaining stage_XXXX protocols */
   if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
@@ -4466,6 +4472,44 @@ void ndpi_fill_protocol_category(struct ndpi_detection_module_struct *ndpi_struc
 
 /* ********************************************************************************* */
 
+static void ndpi_reset_packet_line_info(struct ndpi_packet_struct *packet) {
+  packet->parsed_lines = 0,
+  packet->empty_line_position_set = 0,
+  packet->host_line.ptr = NULL,
+  packet->host_line.len = 0,
+  packet->referer_line.ptr = NULL,
+  packet->referer_line.len = 0,
+  packet->content_line.ptr = NULL,
+  packet->content_line.len = 0,
+  packet->accept_line.ptr = NULL,
+  packet->accept_line.len = 0,
+  packet->user_agent_line.ptr = NULL,
+  packet->user_agent_line.len = 0,
+  packet->http_url_name.ptr = NULL,
+  packet->http_url_name.len = 0,
+  packet->http_encoding.ptr = NULL,
+  packet->http_encoding.len = 0,
+  packet->http_transfer_encoding.ptr = NULL,
+  packet->http_transfer_encoding.len = 0,
+  packet->http_contentlen.ptr = NULL,
+  packet->http_contentlen.len = 0,
+  packet->http_cookie.ptr = NULL,
+  packet->http_cookie.len = 0,
+  packet->http_origin.len = 0,
+  packet->http_origin.ptr = NULL,
+  packet->http_x_session_type.ptr = NULL,
+  packet->http_x_session_type.len = 0,
+  packet->server_line.ptr = NULL,
+  packet->server_line.len = 0,
+  packet->http_method.ptr = NULL,
+  packet->http_method.len = 0,
+  packet->http_response.ptr = NULL,
+  packet->http_response.len = 0,
+  packet->http_num_headers = 0;
+}
+
+/* ********************************************************************************* */
+
 ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct *ndpi_struct,
 					    struct ndpi_flow_struct *flow,
 					    const unsigned char *packet,
@@ -4707,8 +4751,9 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct
      Invalidate packet memory to avoid accessing the pointers below
      when the packet is no longer accessible
   */
-  flow->packet.iph = NULL, flow->packet.tcp = NULL, flow->packet.udp = NULL;
-
+  flow->packet.iph = NULL, flow->packet.tcp = NULL, flow->packet.udp = NULL, flow->packet.payload = NULL;
+  ndpi_reset_packet_line_info(&flow->packet);
+  
   return(ret);
 }
 
@@ -4870,40 +4915,8 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_struc
     return;
 
   packet->packet_lines_parsed_complete = 1;
-  packet->parsed_lines = 0;
-  packet->empty_line_position_set = 0;
-  packet->host_line.ptr = NULL;
-  packet->host_line.len = 0;
-  packet->referer_line.ptr = NULL;
-  packet->referer_line.len = 0;
-  packet->content_line.ptr = NULL;
-  packet->content_line.len = 0;
-  packet->accept_line.ptr = NULL;
-  packet->accept_line.len = 0;
-  packet->user_agent_line.ptr = NULL;
-  packet->user_agent_line.len = 0;
-  packet->http_url_name.ptr = NULL;
-  packet->http_url_name.len = 0;
-  packet->http_encoding.ptr = NULL;
-  packet->http_encoding.len = 0;
-  packet->http_transfer_encoding.ptr = NULL;
-  packet->http_transfer_encoding.len = 0;
-  packet->http_contentlen.ptr = NULL;
-  packet->http_contentlen.len = 0;
-  packet->http_cookie.ptr = NULL;
-  packet->http_cookie.len = 0;
-  packet->http_origin.len = 0;
-  packet->http_origin.ptr = NULL;
-  packet->http_x_session_type.ptr = NULL;
-  packet->http_x_session_type.len = 0;
-  packet->server_line.ptr = NULL;
-  packet->server_line.len = 0;
-  packet->http_method.ptr = NULL;
-  packet->http_method.len = 0;
-  packet->http_response.ptr = NULL;
-  packet->http_response.len = 0;
-  packet->http_num_headers=0;
-
+  ndpi_reset_packet_line_info(packet);
+  
   if((packet->payload_packet_len < 3)
      || (packet->payload == NULL))
     return;