Merge pull request #2240 in SNORT/snort3 from ~SATHIRKA/snort3:snort_proto_id to...

Squashed commit of the following:

commit 1a435d674e1d7fe0ee48a6dc2c46cae287069eb2
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Thu Jun 4 16:22:55 2020 -0400

    appid: Revert snort protocol id changes and fixed warnings

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index afe857ca41914576a697fc9672351d68a0977b78..c0d844fac3811c2433f94c5d2ba3fe64c553c8be 100644 (file)
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -341,7 +341,7 @@ void AppIdSession::sync_with_snort_protocol_id(AppId newAppId, Packet* p)
     if (tmp_snort_protocol_id != snort_protocol_id)
     {
         snort_protocol_id = tmp_snort_protocol_id;
-        Stream::set_snort_protocol_id(p->flow, tmp_snort_protocol_id);
+        p->flow->ssn_state.snort_protocol_id = tmp_snort_protocol_id;
     }
 }
 
@@ -471,7 +471,7 @@ void AppIdSession::update_encrypted_app_id(AppId service_id)
     }
 }
 
-void AppIdSession::examine_ssl_metadata(Packet* p, AppidChangeBits& change_bits)
+void AppIdSession::examine_ssl_metadata(AppidChangeBits& change_bits)
 {
     AppId client_id = 0;
     AppId payload_id = 0;

diff --git a/src/network_inspectors/appid/appid_session.h b/src/network_inspectors/appid/appid_session.h
index de19faba5ed8ec42ef8a8a58f52570af9ae247a8..150eb052502711bbefc301b37aa21edf3622b6be 100644 (file)
--- a/src/network_inspectors/appid/appid_session.h
+++ b/src/network_inspectors/appid/appid_session.h
@@ -344,7 +344,7 @@ public:
     }
 
     bool is_ssl_session_decrypted();
-    void examine_ssl_metadata(snort::Packet*, AppidChangeBits& change_bits);
+    void examine_ssl_metadata(AppidChangeBits& change_bits);
     void set_client_appid_data(AppId, AppidChangeBits& change_bits, char* version = nullptr);
     void set_service_appid_data(AppId, AppidChangeBits& change_bits, char* version = nullptr);
     void set_payload_appid_data(AppId, AppidChangeBits& change_bits, char* version = nullptr);

diff --git a/src/network_inspectors/appid/service_plugins/service_discovery.cc b/src/network_inspectors/appid/service_plugins/service_discovery.cc
index 9b3fbd2fe7c65c1474688b26a0ea19cba1999e38..0d0b3425bead1c9b2aecd298626d12f5f32c11d2 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_discovery.cc
+++ b/src/network_inspectors/appid/service_plugins/service_discovery.cc
@@ -693,7 +693,7 @@ bool ServiceDiscovery::do_service_discovery(AppIdSession& asd, Packet* p,
         else if (asd.service.get_id() == APP_ID_RTMP)
             asd.examine_rtmp_metadata(change_bits);
         else if (asd.get_session_flags(APPID_SESSION_SSL_SESSION) && asd.tsession)
-            asd.examine_ssl_metadata(p, change_bits);
+            asd.examine_ssl_metadata(change_bits);
 
         if (tp_app_id <= APP_ID_NONE && asd.get_session_flags(
             APPID_SESSION_SERVICE_DETECTED | APPID_SESSION_NOT_A_SERVICE |

diff --git a/src/network_inspectors/appid/test/appid_discovery_test.cc b/src/network_inspectors/appid/test/appid_discovery_test.cc
index 3521a4cf9879368f0acd918152ad7d30ad08efb6..079c0a77e3319dc831105b56388ff1782487d68c 100644 (file)
--- a/src/network_inspectors/appid/test/appid_discovery_test.cc
+++ b/src/network_inspectors/appid/test/appid_discovery_test.cc
@@ -192,7 +192,7 @@ void AppIdSession::sync_with_snort_protocol_id(AppId, Packet*) {}
 void AppIdSession::check_app_detection_restart(AppidChangeBits&) {}
 void AppIdSession::set_client_appid_data(AppId, AppidChangeBits&, char*) {}
 void AppIdSession::examine_rtmp_metadata(AppidChangeBits&) {}
-void AppIdSession::examine_ssl_metadata(Packet*, AppidChangeBits&) {}
+void AppIdSession::examine_ssl_metadata(AppidChangeBits&) {}
 void AppIdSession::update_encrypted_app_id(AppId) {}
 bool AppIdSession::is_tp_processing_done() const {return 0;}
 AppIdSession* AppIdSession::allocate_session(const Packet*, IpProtocol,

diff --git a/src/network_inspectors/appid/tp_appid_utils.cc b/src/network_inspectors/appid/tp_appid_utils.cc
index 4c98f05ac854a4b8b6fdf887caf08e9f5152be99..d6be4c757b97b6a6c469240513cb963aef5c6836 100644 (file)
--- a/src/network_inspectors/appid/tp_appid_utils.cc
+++ b/src/network_inspectors/appid/tp_appid_utils.cc
@@ -761,7 +761,7 @@ bool do_tp_discovery(ThirdPartyAppIdContext& tp_appid_ctxt, AppIdSession& asd, I
         }
         else if (asd.get_session_flags(APPID_SESSION_SSL_SESSION) && asd.tsession)
         {
-            asd.examine_ssl_metadata(p, change_bits);
+            asd.examine_ssl_metadata(change_bits);
             uint16_t serverPort;
             AppId portAppId;
             serverPort = (direction == APP_ID_FROM_INITIATOR) ? p->ptrs.dp : p->ptrs.sp;