]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #517 in SNORT/snort3 from appid_port_ws1_merge_this to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 14 Jun 2016 20:24:28 +0000 (16:24 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 14 Jun 2016 20:24:28 +0000 (16:24 -0400)
commit35da82be59ba1a4a8d2fa8dbddc9d49294fd2377
tree2ccfaa9747aec580b8869df61dd86104899bc9c3
parentf62ebed97e7d2e2fdfa3f72d61032449b3c5be57
Merge pull request #517 in SNORT/snort3 from appid_port_ws1_merge_this to master

Squashed commit of the following:

commit b53b7f1d5e5c5249515b25b7db35f65cdbeebe71
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date:   Thu Jun 9 11:50:39 2016 -0400

    initial prep work to port appid to snort++
    initial work to get dns/smtp detectors working and cleanup of many issues left from initial prep of appid
    search tool unit tests
    Moved AM_CPPFLAGS change into appid specific Makefile.am files.
    fixed compiler warnings
    fixed formating issues, misc minor code review nits
    Fix cmake problems and warnings.
    use REMOVED_WHILE_NOT_IN_USE for all code #ifdef'ed out for porting issues
    change patterns defined by const char* to const char array
    init net_list_by_zone array to 0
    initialize all array member variables to nullptr
    initial net list by zone array to nullptr
    free memory allocated by snort_strdup for module config strings
    AppIdModuleConfig is now a class not a struct
    for now use snort_free instead of delete
    no defaults for appid detector dir and thirdparty dir
    init member variables for AppIdData
    free memory allocated for AppIdData member variables
    initialize ALL member variables of AppIdData class
    move functions called to free memory in AppIdData to the AppIdData class
    source formating issue, fix type mismatch on debug print specifier for IpProtocol
202 files changed:
configure.ac
src/Makefile.am
src/flow/flow.cc
src/main/snort_debug.h
src/network_inspectors/CMakeLists.txt
src/network_inspectors/Makefile.am
src/network_inspectors/appid/CHEAT_SHEET.txt [new file with mode: 0644]
src/network_inspectors/appid/CMakeLists.txt [new file with mode: 0644]
src/network_inspectors/appid/MANIFEST.txt [new file with mode: 0644]
src/network_inspectors/appid/Makefile.am [new file with mode: 0644]
src/network_inspectors/appid/app_forecast.cc [new file with mode: 0644]
src/network_inspectors/appid/app_forecast.h [new file with mode: 0644]
src/network_inspectors/appid/app_info_table.cc [new file with mode: 0644]
src/network_inspectors/appid/app_info_table.h [new file with mode: 0644]
src/network_inspectors/appid/appid.h [new file with mode: 0644]
src/network_inspectors/appid/appid_api.cc [new file with mode: 0644]
src/network_inspectors/appid/appid_api.h [new file with mode: 0644]
src/network_inspectors/appid/appid_config.cc [new file with mode: 0644]
src/network_inspectors/appid/appid_config.h [new file with mode: 0644]
src/network_inspectors/appid/appid_flow_data.cc [new file with mode: 0644]
src/network_inspectors/appid/appid_flow_data.h [new file with mode: 0644]
src/network_inspectors/appid/appid_inspector.cc [new file with mode: 0644]
src/network_inspectors/appid/appid_inspector.h [new file with mode: 0644]
src/network_inspectors/appid/appid_module.cc [new file with mode: 0644]
src/network_inspectors/appid/appid_module.h [new file with mode: 0644]
src/network_inspectors/appid/appid_stats.cc [new file with mode: 0644]
src/network_inspectors/appid/appid_stats.h [new file with mode: 0644]
src/network_inspectors/appid/application_ids.h [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/CMakeLists.txt [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/Makefile.am [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_aim.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_aim.h [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_api.h [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_base.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_base.h [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_bit.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_bit_tracker.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_config.h [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_msn.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_msn.h [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_rtp.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_smtp.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_smtp.h [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_ssh.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_timbuktu.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_tns.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_vnc.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_ym.cc [new file with mode: 0644]
src/network_inspectors/appid/client_plugins/client_app_ym.h [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/CMakeLists.txt [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/Makefile.am [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_api.h [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_base.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_base.h [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_dns.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_dns.h [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_http.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_http.h [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_imap.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_kerberos.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_pattern.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_pattern.h [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_pop3.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_sip.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/detector_sip.h [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/http_url_patterns.cc [new file with mode: 0644]
src/network_inspectors/appid/detector_plugins/http_url_patterns.h [new file with mode: 0644]
src/network_inspectors/appid/dns_defs.h [new file with mode: 0644]
src/network_inspectors/appid/errors.sh [new file with mode: 0755]
src/network_inspectors/appid/flow_error.h [new file with mode: 0644]
src/network_inspectors/appid/fw_appid.cc [new file with mode: 0644]
src/network_inspectors/appid/fw_appid.h [new file with mode: 0644]
src/network_inspectors/appid/host_port_app_cache.cc [new file with mode: 0644]
src/network_inspectors/appid/host_port_app_cache.h [new file with mode: 0644]
src/network_inspectors/appid/http_common.h [new file with mode: 0644]
src/network_inspectors/appid/length_app_cache.cc [new file with mode: 0644]
src/network_inspectors/appid/length_app_cache.h [new file with mode: 0644]
src/network_inspectors/appid/lua_detector_api.cc [new file with mode: 0644]
src/network_inspectors/appid/lua_detector_api.h [new file with mode: 0644]
src/network_inspectors/appid/lua_detector_flow_api.cc [new file with mode: 0644]
src/network_inspectors/appid/lua_detector_flow_api.h [new file with mode: 0644]
src/network_inspectors/appid/lua_detector_module.cc [new file with mode: 0644]
src/network_inspectors/appid/lua_detector_module.h [new file with mode: 0644]
src/network_inspectors/appid/lua_detector_util.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/CMakeLists.txt [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/Makefile.am [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/dcerpc.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/dcerpc.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_api.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_base.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_base.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_battle_field.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_battle_field.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_bgp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_bgp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_bit.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_bootp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_bootp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_config.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_dcerpc.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_dcerpc.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_direct_connect.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_direct_connect.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_flap.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_flap.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ftp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ftp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_irc.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_irc.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_lpr.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_lpr.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_mdns.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_mdns.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_mysql.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_mysql.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_netbios.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_netbios.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_nntp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_nntp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ntp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ntp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_radius.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_radius.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rexec.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rexec.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rfb.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rfb.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rlogin.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rlogin.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rpc.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rpc.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rshell.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rshell.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rsync.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rsync.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rtmp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_rtmp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_smtp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_smtp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_snmp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_snmp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ssh.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ssh.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ssl.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_ssl.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_telnet.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_telnet.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_tftp.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_tftp.h [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_timbuktu.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_tns.cc [new file with mode: 0644]
src/network_inspectors/appid/service_plugins/service_util.h [new file with mode: 0644]
src/network_inspectors/appid/service_state.cc [new file with mode: 0644]
src/network_inspectors/appid/service_state.h [new file with mode: 0644]
src/network_inspectors/appid/sfaddr_temp.h [new file with mode: 0644]
src/network_inspectors/appid/test/CMakeLists.txt [new file with mode: 0644]
src/network_inspectors/appid/test/Makefile.am [new file with mode: 0644]
src/network_inspectors/appid/test/appid_simple_test.cc [new file with mode: 0644]
src/network_inspectors/appid/test/appid_tests.cc [new file with mode: 0644]
src/network_inspectors/appid/test/external_apis.cc [new file with mode: 0644]
src/network_inspectors/appid/test/external_apis.h [new file with mode: 0644]
src/network_inspectors/appid/test/mpse.cc [new file with mode: 0644]
src/network_inspectors/appid/test/process_http_test.cc [new file with mode: 0644]
src/network_inspectors/appid/test/rna.conf [new file with mode: 0644]
src/network_inspectors/appid/test/session_file.cc [new file with mode: 0644]
src/network_inspectors/appid/test/session_file.h [new file with mode: 0644]
src/network_inspectors/appid/test/sf_iph.cc [new file with mode: 0644]
src/network_inspectors/appid/test/snort.lua [new file with mode: 0644]
src/network_inspectors/appid/thirdparty_appid_api.h [new file with mode: 0644]
src/network_inspectors/appid/thirdparty_appid_types.h [new file with mode: 0644]
src/network_inspectors/appid/thirdparty_appid_utils.cc [new file with mode: 0644]
src/network_inspectors/appid/thirdparty_appid_utils.h [new file with mode: 0644]
src/network_inspectors/appid/util/CMakeLists.txt [new file with mode: 0644]
src/network_inspectors/appid/util/Makefile.am [new file with mode: 0644]
src/network_inspectors/appid/util/common_util.h [new file with mode: 0644]
src/network_inspectors/appid/util/fw_avltree.cc [new file with mode: 0644]
src/network_inspectors/appid/util/fw_avltree.h [new file with mode: 0644]
src/network_inspectors/appid/util/ip_funcs.cc [new file with mode: 0644]
src/network_inspectors/appid/util/ip_funcs.h [new file with mode: 0644]
src/network_inspectors/appid/util/network_set.cc [new file with mode: 0644]
src/network_inspectors/appid/util/network_set.h [new file with mode: 0644]
src/network_inspectors/appid/util/output_file.cc [new file with mode: 0644]
src/network_inspectors/appid/util/output_file.h [new file with mode: 0644]
src/network_inspectors/appid/util/sf_mlmp.cc [new file with mode: 0644]
src/network_inspectors/appid/util/sf_mlmp.h [new file with mode: 0644]
src/network_inspectors/appid/util/sf_multi_mpse.cc [new file with mode: 0644]
src/network_inspectors/appid/util/sf_multi_mpse.h [new file with mode: 0644]
src/network_inspectors/appid/util/sfksearch.cc [new file with mode: 0644]
src/network_inspectors/appid/util/sfksearch.h [new file with mode: 0644]
src/network_inspectors/appid/util/sfutil.cc [new file with mode: 0644]
src/network_inspectors/appid/util/sfutil.h [new file with mode: 0644]
src/network_inspectors/network_inspectors.cc
src/search_engines/ac_bnfa.cc
src/search_engines/search_tool.cc
src/search_engines/search_tool.h
src/search_engines/test/Makefile.am
src/search_engines/test/search_tool_test.cc [new file with mode: 0644]
src/sfip/sfip_t.h
tools/snort2lua/preprocessor_states/CMakeLists.txt
tools/snort2lua/preprocessor_states/Makefile.am
tools/snort2lua/preprocessor_states/pps_appid.cc [new file with mode: 0644]
tools/snort2lua/preprocessor_states/preprocessor_api.cc