]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8d9d8bf) | patch
Merge pull request #1284 in SNORT/snort3 from appid_setTPAppIdData to master
authorMike Stepanek (mstepane) <mstepane@cisco.com>
Tue, 26 Jun 2018 14:44:21 +0000 (10:44 -0400)
committerMike Stepanek (mstepane) <mstepane@cisco.com>
Tue, 26 Jun 2018 14:44:21 +0000 (10:44 -0400)
commit848a2b3b744ec535cb3782bfbc17ac45d35fa6a3
treeac75f6a278fa242542bf459d64b305f0b1c4f9betree
parent8d9d8bf23b31d685ccee3c9b061bf7f8d2bdf74fcommit | diff
Merge pull request #1284 in SNORT/snort3 from appid_setTPAppIdData to master

Squashed commit of the following:

commit 103a5b755efc0a480045422fdceb1dd5ddee5e1d
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Jun 22 14:30:46 2018 -0400

    appid: fix http tunnel handling in do_tp_discovery()

    appid: add else if clause to set tp_app_id to APP_ID_SSL in do_tp_discovery(), as per user comments. Move asd.get_http_session() inside the if(APPID_SESSION_HTTP_SESSION) block.
src/network_inspectors/appid/tp_appid_utils.cc diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git