Merge pull request #2068 in SNORT/snort3 from ~CLJUDGE/snort3:ftpsdata_not_overwritte...

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 110b5e2acff333078fe5b051cabfd7a639be3b57..1d29b5e7e06b5a270a33d2c75e4dc9c1c8c2c9b7 100644 (file)
--- 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);
     }