From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Tue, 24 Mar 2020 10:43:18 +0000 (+0000)
Subject: Merge pull request #2068 in SNORT/snort3 from ~CLJUDGE/snort3:ftpsdata_not_overwritte... 
X-Git-Tag: 3.0.0-270~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c9e3a98f83067e3ee15a310dc9babc7ff8f2489;p=thirdparty%2Fsnort3.git

Merge pull request #2068 in SNORT/snort3 from ~CLJUDGE/snort3:ftpsdata_not_overwritten_as_ssl to master

Squashed commit of the following:

commit 2999eb64b825646b5840ced516c8ec4894c05ba5
Author: cljudge <cljudge@cisco.com>
Date:   Fri Mar 6 03:36:54 2020 -0500

    appid: restart service detection on start of decryption
---

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index 110b5e2ac..1d29b5e7e 100644
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -239,6 +239,7 @@ void AppIdSession::reinit_session_data(AppidChangeBits& change_bits)
         service_port = 0;
         service_disco_state = APPID_DISCO_STATE_NONE;
         service_detector = nullptr;
+        service_search_state = SESSION_SERVICE_SEARCH_STATE::START;
         free_flow_data_by_mask(APPID_SESSION_DATA_SERVICE_MODSTATE_BIT);
     }