]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2235 in SNORT/snort3 from ~SATHIRKA/snort3:snort_protocol_id...
authorShravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Tue, 2 Jun 2020 00:27:44 +0000 (00:27 +0000)
committerShravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Tue, 2 Jun 2020 00:27:44 +0000 (00:27 +0000)
commit9b19200c19f5d84d1a4d34aac31c75f472a37222
tree6df997ee941c5e60205bef68ddf573ac7172c25f
parentae4624439f67e00cfea5d0033f18b80f8aed673b
Merge pull request #2235 in SNORT/snort3 from ~SATHIRKA/snort3:snort_protocol_id to master

Squashed commit of the following:

commit 1ca8cfa087c34307a1fb84a8a1e16000026a0fab
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Thu May 28 17:52:58 2020 -0400

    appid: Set snort protocol id on the flow and remove ssl squelch code
src/network_inspectors/appid/app_info_table.cc
src/network_inspectors/appid/app_info_table.h
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/service_plugins/service_ssl.cc
src/network_inspectors/appid/service_plugins/service_ssl.h
src/network_inspectors/appid/tp_appid_utils.cc