Merge pull request #2859 in SNORT/snort3 from ~KAMURTHI/snort3:3rd_pty_unknown_payloa...

Squashed commit of the following:

commit 7de785661b313f522ae52bb35e7250ab817de19b
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Thu Apr 22 15:49:25 2021 -0400

    appid: mark payload detection as done after either http request or response is inspected

diff --git a/src/network_inspectors/appid/appid_http_session.cc b/src/network_inspectors/appid/appid_http_session.cc
index def12f2f9e967363b5ccf9df20d4dd1f702ed219..4855fe01124cdeddf0dfb0a41930e8ccb51421e0 100644 (file)
--- a/src/network_inspectors/appid/appid_http_session.cc
+++ b/src/network_inspectors/appid/appid_http_session.cc
@@ -512,7 +512,6 @@ int AppIdHttpSession::process_http_packet(AppidSessionDirection direction,
     const std::string* host = meta_data[REQ_HOST_FID];
     const std::string* referer = meta_data[REQ_REFERER_FID];
     const std::string* uri = meta_data[REQ_URI_FID];
-    bool is_payload_processed = false;
 
     // For fragmented HTTP headers, do not process if none of the fields are set.
     // These fields will get set when the HTTP header is reassembled.

diff --git a/src/network_inspectors/appid/appid_http_session.h b/src/network_inspectors/appid/appid_http_session.h
index f9abe6094e63b343115ed99a11d1863260b5edb0..78f9f261d4931a81650b3f54c45d456577c79894 100644 (file)
--- a/src/network_inspectors/appid/appid_http_session.h
+++ b/src/network_inspectors/appid/appid_http_session.h
@@ -198,6 +198,7 @@ protected:
     unsigned response_code_packets = 0;
 #endif
     uint32_t http2_stream_id = 0;
+    bool is_payload_processed = false;
 };
 
 #endif