]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #683 in SNORT/snort3 from appid_sip to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 3 Nov 2016 15:52:54 +0000 (11:52 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 3 Nov 2016 15:52:54 +0000 (11:52 -0400)
commitea1fd13f1295c5068ac31ef4660be776f03b3152
treeee705f7cd3c472f9caffbe663ffd14f4b3e96722
parent137054d5891bdde42f5ab8ef7af443f5e1cf2e5a
Merge pull request #683 in SNORT/snort3 from appid_sip to master

Squashed commit of the following:

commit e3763a9177b370e6de5e00a315b22a40321048ec
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Nov 2 11:05:16 2016 -0400

    Updated build dependency fix

commit f9a3162c78f4472b29928f981d1c1cfc0d3ea4c6
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Oct 28 17:56:08 2016 -0400

    fixed expect cache session data insertion

commit e3c70ad588df032b1d0dc89bdcfc6090e88ffe58
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Oct 21 11:06:48 2016 -0400

    Encapsulated dialog

commit cc96d7f938375a78519543f4fc68d735f7cac9eb
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Oct 19 12:03:03 2016 -0400

    Encapsulated sipMsg

commit c79a09e1f82b3698c1808ecb51f84e648687c5d5
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Oct 14 14:58:13 2016 -0400

    Implemented SipEventHandler
15 files changed:
src/flow/expect_cache.cc
src/network_inspectors/appid/appid_inspector.cc
src/network_inspectors/appid/appid_module.cc
src/network_inspectors/appid/appid_module.h
src/network_inspectors/appid/detector_plugins/detector_sip.cc
src/network_inspectors/appid/detector_plugins/detector_sip.h
src/pub_sub/CMakeLists.txt
src/pub_sub/Makefile.am
src/pub_sub/sip_events.cc [new file with mode: 0644]
src/pub_sub/sip_events.h [new file with mode: 0644]
src/service_inspectors/service_inspectors.cc
src/service_inspectors/sip/CMakeLists.txt
src/service_inspectors/sip/Makefile.am
src/service_inspectors/sip/sip_common.h
src/service_inspectors/sip/sip_dialog.cc