]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #726 in SNORT/snort3 from appid_ptypes_scan_patch to master
authorHui Cao (huica) <huica@cisco.com>
Tue, 29 Nov 2016 20:00:21 +0000 (15:00 -0500)
committerHui Cao (huica) <huica@cisco.com>
Tue, 29 Nov 2016 20:00:21 +0000 (15:00 -0500)
commit8ecf51f171ba02e1e09bf46faa7dd77bf20313e8
treef97ab2acd622e4dda9f4c29f3204de1f10de0725
parent486d00e9c9d7eee2188a1a95c57695425f74d877
Merge pull request #726 in SNORT/snort3 from appid_ptypes_scan_patch to master

Squashed commit of the following:

commit cfbad0aea0e04b034f7bcd70d07de6fcfc36dc73
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Mon Nov 28 10:50:23 2016 -0500

    delete auto ptr used to point to member variable of the AppIdSession class, just use the member variable directly.  Some coding style improvements

commit 616baeb1eae80e6d4954c0a1e85db4d34085a13e
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Mon Nov 28 15:06:26 2016 -0500

    make ptype_scan_counts a field of the httpSession struct

commit fef9bdf71276aa9b8966609c49743f6df3136bcd
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Mon Nov 28 14:41:55 2016 -0500

    Add mutex lock around calls into crypto lib for X509 cert processing, crypto lib not thread safe so calls into this lib from multiple packet threads appear to be causing random failures
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/appid_session.h
src/network_inspectors/appid/detector_plugins/detector_http.cc
src/network_inspectors/appid/service_plugins/service_ssl.cc