]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 723c0ff) | patch
Merge pull request #1939 in SNORT/snort3 from ~SVLASIUK/snort3:multiple_ftp_server_in...
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 28 Jan 2020 16:54:44 +0000 (16:54 +0000)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 28 Jan 2020 16:54:44 +0000 (16:54 +0000)
commit19f413a8db2f671f02feae145ffb36124a904e93
treec75d47ad584f8df66000d2b0cc9d46ab870dcca8tree
parent723c0ffaa3d917279e6942115d50d80d5f8c6876commit | diff
Merge pull request #1939 in SNORT/snort3 from ~SVLASIUK/snort3:multiple_ftp_server_in_output to master

Squashed commit of the following:

commit 29b6f44f49d8d15a30d0fe8c37e43ff80fbb1630
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Mon Jan 13 12:21:27 2020 +0200

    inspectors: print label for type and alias in inspector manager. Remove printing module name in inspectors ::show() method.
39 files changed:
src/file_api/file_flows.cc diff | blob | blame | history
src/file_api/file_log.cc diff | blob | blame | history
src/managers/inspector_manager.cc diff | blob | blame | history
src/managers/module_manager.cc diff | blob | blame | history
src/network_inspectors/appid/appid_inspector.cc diff | blob | blame | history
src/network_inspectors/arp_spoof/arp_spoof.cc diff | blob | blame | history
src/network_inspectors/binder/binder.cc diff | blob | blame | history
src/network_inspectors/normalize/normalize.cc diff | blob | blame | history
src/network_inspectors/perf_monitor/perf_monitor.cc diff | blob | blame | history
src/network_inspectors/port_scan/port_scan.cc diff | blob | blame | history
src/network_inspectors/reputation/reputation_inspect.cc diff | blob | blame | history
src/network_inspectors/rna/rna_inspector.cc diff | blob | blame | history
src/service_inspectors/back_orifice/back_orifice.cc diff | blob | blame | history
src/service_inspectors/cip/cip.cc diff | blob | blame | history
src/service_inspectors/dce_rpc/dce_smb_module.cc diff | blob | blame | history
src/service_inspectors/dce_rpc/dce_tcp_module.cc diff | blob | blame | history
src/service_inspectors/dce_rpc/dce_udp_module.cc diff | blob | blame | history
src/service_inspectors/dnp3/dnp3_module.cc diff | blob | blame | history
src/service_inspectors/dns/dns.cc diff | blob | blame | history
src/service_inspectors/ftp_telnet/ftp.cc diff | blob | blame | history
src/service_inspectors/ftp_telnet/ftp_print.cc diff | blob | blame | history
src/service_inspectors/ftp_telnet/telnet.cc diff | blob | blame | history
src/service_inspectors/http2_inspect/http2_inspect.h diff | blob | blame | history
src/service_inspectors/http_inspect/http_inspect.cc diff | blob | blame | history
src/service_inspectors/imap/imap.cc diff | blob | blame | history
src/service_inspectors/pop/pop.cc diff | blob | blame | history
src/service_inspectors/rpc_decode/rpc_decode.cc diff | blob | blame | history
src/service_inspectors/sip/sip.cc diff | blob | blame | history
src/service_inspectors/smtp/smtp.cc diff | blob | blame | history
src/service_inspectors/ssh/ssh.cc diff | blob | blame | history
src/service_inspectors/ssl/ssl_inspector.cc diff | blob | blame | history
src/service_inspectors/wizard/wizard.cc diff | blob | blame | history
src/stream/base/stream_base.cc diff | blob | blame | history
src/stream/icmp/stream_icmp.cc diff | blob | blame | history
src/stream/ip/ip_defrag.cc diff | blob | blame | history
src/stream/ip/stream_ip.cc diff | blob | blame | history
src/stream/tcp/tcp_stream_config.cc diff | blob | blame | history
src/stream/udp/stream_udp.cc diff | blob | blame | history
src/stream/user/stream_user.cc diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git