From: Russ Combs (rucombs) Date: Thu, 1 Dec 2016 21:09:03 +0000 (-0500) Subject: Merge pull request #733 in SNORT/snort3 from appid_spaces to master X-Git-Tag: 3.0.0-233~164 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9807f3f96893b44d496e19888ca29ad4398ff6a4;p=thirdparty%2Fsnort3.git Merge pull request #733 in SNORT/snort3 from appid_spaces to master Squashed commit of the following: commit 173463dad3d45eb063097764374f396aa07f5356 Author: Carter Waxman Date: Thu Dec 1 12:04:25 2016 -0500 removed underscores from all pegs outside of appid commit d696ac7ee5ac0d1b4be029e610f344b04ef3568b Author: Carter Waxman Date: Wed Nov 23 15:25:44 2016 -0500 removed '_' from appid pegs --- diff --git a/src/file_api/file_module.cc b/src/file_api/file_module.cc index 3dc6f3f20..5933421f9 100644 --- a/src/file_api/file_module.cc +++ b/src/file_api/file_module.cc @@ -171,9 +171,9 @@ static const Parameter file_id_params[] = static const PegInfo file_pegs[] = { - { "total_files", "number of files processed" }, - { "total_file_data", "number of file data bytes processed" }, - { "cache_failures", "number of file cache add failures" }, + { "total files", "number of files processed" }, + { "total file data", "number of file data bytes processed" }, + { "cache failures", "number of file cache add failures" }, { nullptr, nullptr } }; diff --git a/src/network_inspectors/appid/appid_module.cc b/src/network_inspectors/appid/appid_module.cc index 3638ca0f3..8c41f4f28 100644 --- a/src/network_inspectors/appid/appid_module.cc +++ b/src/network_inspectors/appid/appid_module.cc @@ -44,73 +44,73 @@ const PegInfo appid_pegs[] = { "packets", "count of packets received by appid inspector" }, { "processed packets", "count of packets processed by appid inspector" }, { "ignored packets", "count of packets ignored by appid inspector" }, - { "aim_clients", "count of aim clients discovered by appid" }, - { "battlefield_flows", "count of battle field flows discovered by appid" }, - { "bgp_flows", "count of bgp flows discovered by appid" }, - { "bit_clients", "count of bittorrent clients discovered by appid" }, - { "bit_flows", "count of bittorrent flows discovered by appid" }, - { "bittracker_clients", "count of bittorrent tracker clients discovered by appid" }, - { "bootp_flows", "count of bootp flows discovered by appid" }, - { "dcerpc_tcp_flows", "count of dce rpc flows over tcp discovered by appid" }, - { "dcerpc_udp_flows", "count of dce rpc flows over udp discovered by appid" }, - { "direct_connect_flows", "count of direct connect flows discovered by appid" }, - { "dns_tcp_flows", "count of dns flows over tcp discovered by appid" }, - { "dns_udp_flows", "count of dns flows over udp discovered by appid" }, - { "ftp_flows", "count of ftp flows discovered by appid" }, - { "ftps_flows", "count of ftps flows discovered by appid" }, - { "http_flows", "count of http flows discovered by appid" }, - { "imap_flows", "count of imap service flows discovered by appid" }, - { "imaps_flows", "count of imap TLS service flows discovered by appid" }, - { "irc_flows", "count of irc service flows discovered by appid" }, - { "kerberos_clients", "count of kerberos clients discovered by appid" }, - { "kerberos_flows", "count of kerberos service flows discovered by appid" }, - { "kerberos_users", "count of kerberos users discovered by appid" }, - { "lpr_flows", "count of lpr service flows discovered by appid" }, - { "mdns_flows", "count of mdns service flows discovered by appid" }, - { "msn_clients", "count of msn clients discovered by appid" }, - { "mysql_flows", "count of mysql service flows discovered by appid" }, - { "netbios_dgm_flows", "count of netbios-dgm service flows discovered by appid" }, - { "netbios_ns_flows", "count of netbios-ns service flows discovered by appid" }, - { "netbios_ssn_flows", "count of netbios-ssn service flows discovered by appid" }, - { "nntp_flows", "count of nntp flows discovered by appid" }, - { "ntp_flows", "count of ntp flows discovered by appid" }, - { "pop_flows", "count of pop service flows discovered by appid" }, - { "radius_flows", "count of radius flows discovered by appid" }, - { "rexec_flows", "count of rexec flows discovered by appid" }, - { "rfb_flows", "count of rfb flows discovered by appid" }, - { "rlogin_flows", "count of rlogin flows discovered by appid" }, - { "rpc_flows", "count of rpc flows discovered by appid" }, - { "rshell_flows", "count of rshell flows discovered by appid" }, - { "rsync_flows", "count of rsync service flows discovered by appid" }, - { "rtmp_flows", "count of rtmp flows discovered by appid" }, - { "rtp_clients", "count of rtp clients discovered by appid" }, - { "sip_clients", "count of SIP clients discovered by appid" }, - { "sip_flows", "count of SIP flows discovered by appid" }, - { "smtp_aol_clients", "count of AOL smtp clients discovered by appid" }, - { "smtp_applemail_clients", "count of Apple Mail smtp clients discovered by appid" }, - { "smtp_eudora_clients", "count of Eudora smtp clients discovered by appid" }, - { "smtp_eudora_pro_clients", "count of Eudora Pro smtp clients discovered by appid" }, - { "smtp_evolution_clients", "count of Evolution smtp clients discovered by appid" }, - { "smtp_kmail_clients", "count of KMail smtp clients discovered by appid" }, - { "smtp_lotus_notes_clients", "count of Lotus Notes smtp clients discovered by appid" }, - { "smtp_microsoft_outlook_clients", "count of Microsoft Outlook smtp clients discovered by appid" }, - { "smtp_microsoft_outlook_express_clients", "count of Microsoft Outlook Express smtp clients discovered by appid" }, - { "smtp_microsoft_outlook_imo_clients", "count of Microsoft Outlook IMO smtp clients discovered by appid" }, - { "smtp_mutt_clients", "count of Mutt smtp clients discovered by appid" }, - { "smtp_thunderbird_clients", "count of Thunderbird smtp clients discovered by appid" }, - { "smtp_flows", "count of smtp flows discovered by appid" }, - { "smtps_flows", "count of smtps flows discovered by appid" }, - { "snmp_flows", "count of snmp flows discovered by appid" }, - { "ssh_clients", "count of ssh clients discovered by appid" }, - { "ssh_flows", "count of ssh flows discovered by appid" }, - { "ssl_flows", "count of ssl flows discovered by appid" }, - { "telnet_flows", "count of telnet flows discovered by appid" }, - { "tftp_flows", "count of tftp flows discovered by appid" }, - { "timbuktu_flows", "count of timbuktu flows discovered by appid" }, - { "tns_clients", "count of tns clients discovered by appid" }, - { "tns_flows", "count of tns flows discovered by appid" }, - { "vnc_clients", "count of vnc clients discovered by appid" }, - { "yahoo_messenger_clients", "count of Yahoo Messenger clients discovered by appid" }, + { "aim clients", "count of aim clients discovered by appid" }, + { "battlefield flows", "count of battle field flows discovered by appid" }, + { "bgp flows", "count of bgp flows discovered by appid" }, + { "bit clients", "count of bittorrent clients discovered by appid" }, + { "bit flows", "count of bittorrent flows discovered by appid" }, + { "bittracker clients", "count of bittorrent tracker clients discovered by appid" }, + { "bootp flows", "count of bootp flows discovered by appid" }, + { "dcerpc tcp flows", "count of dce rpc flows over tcp discovered by appid" }, + { "dcerpc udp flows", "count of dce rpc flows over udp discovered by appid" }, + { "direct connect flows", "count of direct connect flows discovered by appid" }, + { "dns tcp flows", "count of dns flows over tcp discovered by appid" }, + { "dns udp flows", "count of dns flows over udp discovered by appid" }, + { "ftp flows", "count of ftp flows discovered by appid" }, + { "ftps flows", "count of ftps flows discovered by appid" }, + { "http flows", "count of http flows discovered by appid" }, + { "imap flows", "count of imap service flows discovered by appid" }, + { "imaps flows", "count of imap TLS service flows discovered by appid" }, + { "irc flows", "count of irc service flows discovered by appid" }, + { "kerberos clients", "count of kerberos clients discovered by appid" }, + { "kerberos flows", "count of kerberos service flows discovered by appid" }, + { "kerberos users", "count of kerberos users discovered by appid" }, + { "lpr flows", "count of lpr service flows discovered by appid" }, + { "mdns flows", "count of mdns service flows discovered by appid" }, + { "msn clients", "count of msn clients discovered by appid" }, + { "mysql flows", "count of mysql service flows discovered by appid" }, + { "netbios dgm flows", "count of netbios-dgm service flows discovered by appid" }, + { "netbios ns flows", "count of netbios-ns service flows discovered by appid" }, + { "netbios ssn flows", "count of netbios-ssn service flows discovered by appid" }, + { "nntp flows", "count of nntp flows discovered by appid" }, + { "ntp flows", "count of ntp flows discovered by appid" }, + { "pop flows", "count of pop service flows discovered by appid" }, + { "radius flows", "count of radius flows discovered by appid" }, + { "rexec flows", "count of rexec flows discovered by appid" }, + { "rfb flows", "count of rfb flows discovered by appid" }, + { "rlogin flows", "count of rlogin flows discovered by appid" }, + { "rpc flows", "count of rpc flows discovered by appid" }, + { "rshell flows", "count of rshell flows discovered by appid" }, + { "rsync flows", "count of rsync service flows discovered by appid" }, + { "rtmp flows", "count of rtmp flows discovered by appid" }, + { "rtp clients", "count of rtp clients discovered by appid" }, + { "sip clients", "count of SIP clients discovered by appid" }, + { "sip flows", "count of SIP flows discovered by appid" }, + { "smtp aol clients", "count of AOL smtp clients discovered by appid" }, + { "smtp applemail clients", "count of Apple Mail smtp clients discovered by appid" }, + { "smtp eudora clients", "count of Eudora smtp clients discovered by appid" }, + { "smtp eudora pro clients", "count of Eudora Pro smtp clients discovered by appid" }, + { "smtp evolution clients", "count of Evolution smtp clients discovered by appid" }, + { "smtp kmail clients", "count of KMail smtp clients discovered by appid" }, + { "smtp lotus notes clients", "count of Lotus Notes smtp clients discovered by appid" }, + { "smtp microsoft outlook clients", "count of Microsoft Outlook smtp clients discovered by appid" }, + { "smtp microsoft outlook express clients", "count of Microsoft Outlook Express smtp clients discovered by appid" }, + { "smtp microsoft outlook imo clients", "count of Microsoft Outlook IMO smtp clients discovered by appid" }, + { "smtp mutt clients", "count of Mutt smtp clients discovered by appid" }, + { "smtp thunderbird clients", "count of Thunderbird smtp clients discovered by appid" }, + { "smtp flows", "count of smtp flows discovered by appid" }, + { "smtps flows", "count of smtps flows discovered by appid" }, + { "snmp flows", "count of snmp flows discovered by appid" }, + { "ssh clients", "count of ssh clients discovered by appid" }, + { "ssh flows", "count of ssh flows discovered by appid" }, + { "ssl flows", "count of ssl flows discovered by appid" }, + { "telnet flows", "count of telnet flows discovered by appid" }, + { "tftp flows", "count of tftp flows discovered by appid" }, + { "timbuktu flows", "count of timbuktu flows discovered by appid" }, + { "tns clients", "count of tns clients discovered by appid" }, + { "tns flows", "count of tns flows discovered by appid" }, + { "vnc clients", "count of vnc clients discovered by appid" }, + { "yahoo messenger clients", "count of Yahoo Messenger clients discovered by appid" }, { nullptr, nullptr } }; diff --git a/src/network_inspectors/reputation/reputation_inspect.cc b/src/network_inspectors/reputation/reputation_inspect.cc index 228b87701..1348c08f7 100644 --- a/src/network_inspectors/reputation/reputation_inspect.cc +++ b/src/network_inspectors/reputation/reputation_inspect.cc @@ -57,7 +57,7 @@ const PegInfo reputation_peg_names[] = { "blacklisted", "number of packets blacklisted" }, { "whitelisted", "number of packets whitelisted" }, { "monitored", "number of packets monitored" }, - { "memory_allocated", "total memory allocated" }, + { "memory allocated", "total memory allocated" }, { nullptr, nullptr } };