]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #694 in SNORT/snort3 from appid_no_so_wild to master
authorHui Cao (huica) <huica@cisco.com>
Tue, 8 Nov 2016 17:31:04 +0000 (12:31 -0500)
committerHui Cao (huica) <huica@cisco.com>
Tue, 8 Nov 2016 17:31:04 +0000 (12:31 -0500)
commita88746d948cc8a61046527efba747b479eecc281
treed0b2afdd3cb9a0fe4cc0193b5e1d45ca2fbedf20
parenta70374db56f2a592402d1dfd46a6771ddc0ae47a
Merge pull request #694 in SNORT/snort3 from appid_no_so_wild to master

Squashed commit of the following:

commit e5ae9e59f829351580d1b880a0077090c7b6cb5f
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Fri Nov 4 11:34:51 2016 -0400

    updates from code review comments and a few generall coding style fixups

commit 1c6e1c075a61c8237090c42b18da97f8bb0dec62
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Nov 2 15:28:32 2016 -0400

    fix memory leak in service_rpc, list of rpc program nodes were dynamically allocated but never freed

    enable appid in default snort.lua configuration

    report parse errors with ParseWarning, functionality may be reduced but appid will still work

commit a0a9c28afccfc93f550369d9f60d3e47f8c1c916
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Nov 2 10:26:40 2016 -0400

    refactor NetworkSet utility functions into a proper class

commit cabb0a02458a3f3ff3c8eec9de7b36b5f992515e
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Nov 2 08:54:12 2016 -0400

    consolidate utility functions to single utilities file or file where the function is used, eliminate duplicated types for custom config elements, delete deprecated files

commit 10e5cac96c626f8dbc6cd5322b612cb0969545c4
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Nov 2 07:48:07 2016 -0400

    reduce appid chatiness - changed LogMessage to DebugMessage where appropriate, move more functions to appropriate source file and delete files no longer useful, ensure all Debug* logging for AppId is controlled by the DEBUG_APPID flag

commit 8913c81160ae3ed00361b6946a369eb48856fa9e
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Nov 2 06:48:16 2016 -0400

    refactoring to move functions and data defs to appropriate source file and delete source files no longer useful
66 files changed:
lua/snort.lua
src/network_inspectors/appid/CMakeLists.txt
src/network_inspectors/appid/Makefile.am
src/network_inspectors/appid/app_info_table.cc
src/network_inspectors/appid/app_info_table.h
src/network_inspectors/appid/appid.h [deleted file]
src/network_inspectors/appid/appid_api.cc
src/network_inspectors/appid/appid_config.cc
src/network_inspectors/appid/appid_config.h
src/network_inspectors/appid/appid_http_event_handler.cc
src/network_inspectors/appid/appid_inspector.cc
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/appid_session.h
src/network_inspectors/appid/appid_stats.cc
src/network_inspectors/appid/appid_utils/appid_utils.cc [moved from src/network_inspectors/appid/appid_utils/sfutil.cc with 69% similarity]
src/network_inspectors/appid/appid_utils/appid_utils.h [moved from src/network_inspectors/appid/appid_utils/sfutil.h with 71% similarity]
src/network_inspectors/appid/appid_utils/common_util.h [deleted file]
src/network_inspectors/appid/appid_utils/ip_funcs.cc
src/network_inspectors/appid/appid_utils/network_set.cc
src/network_inspectors/appid/appid_utils/network_set.h
src/network_inspectors/appid/appid_utils/output_file.cc [deleted file]
src/network_inspectors/appid/appid_utils/output_file.h [deleted file]
src/network_inspectors/appid/appid_utils/sf_mlmp.cc
src/network_inspectors/appid/appid_utils/sfksearch.cc [deleted file]
src/network_inspectors/appid/appid_utils/sfksearch.h [deleted file]
src/network_inspectors/appid/application_ids.h
src/network_inspectors/appid/client_plugins/client_app_aim.cc
src/network_inspectors/appid/client_plugins/client_app_api.h
src/network_inspectors/appid/client_plugins/client_app_base.cc
src/network_inspectors/appid/client_plugins/client_app_base.h
src/network_inspectors/appid/detector_plugins/detector_api.h
src/network_inspectors/appid/detector_plugins/detector_base.cc
src/network_inspectors/appid/detector_plugins/detector_dns.cc
src/network_inspectors/appid/detector_plugins/detector_imap.cc
src/network_inspectors/appid/detector_plugins/detector_kerberos.cc
src/network_inspectors/appid/detector_plugins/detector_pop3.cc
src/network_inspectors/appid/detector_plugins/detector_sip.cc
src/network_inspectors/appid/flow_error.h [deleted file]
src/network_inspectors/appid/fw_appid.cc [deleted file]
src/network_inspectors/appid/fw_appid.h [deleted file]
src/network_inspectors/appid/http_common.h
src/network_inspectors/appid/lua_detector_api.cc
src/network_inspectors/appid/lua_detector_flow_api.cc
src/network_inspectors/appid/lua_detector_module.cc
src/network_inspectors/appid/service_plugins/service_api.h
src/network_inspectors/appid/service_plugins/service_base.cc
src/network_inspectors/appid/service_plugins/service_bgp.cc
src/network_inspectors/appid/service_plugins/service_bit.cc
src/network_inspectors/appid/service_plugins/service_bootp.cc
src/network_inspectors/appid/service_plugins/service_config.h
src/network_inspectors/appid/service_plugins/service_dcerpc.cc
src/network_inspectors/appid/service_plugins/service_direct_connect.cc
src/network_inspectors/appid/service_plugins/service_flap.cc
src/network_inspectors/appid/service_plugins/service_mdns.cc
src/network_inspectors/appid/service_plugins/service_mysql.cc
src/network_inspectors/appid/service_plugins/service_netbios.cc
src/network_inspectors/appid/service_plugins/service_rfb.cc
src/network_inspectors/appid/service_plugins/service_rlogin.cc
src/network_inspectors/appid/service_plugins/service_rpc.cc
src/network_inspectors/appid/service_plugins/service_rshell.cc
src/network_inspectors/appid/service_plugins/service_rsync.cc
src/network_inspectors/appid/service_plugins/service_rtmp.cc
src/network_inspectors/appid/service_plugins/service_ssh.cc
src/network_inspectors/appid/service_plugins/service_ssl.cc
src/network_inspectors/appid/test/appid_http_event_test.cc
src/network_inspectors/appid/thirdparty_appid_utils.cc