Unifying *.h guards.

This commit is contained in:
Robin Sommer 2013-04-19 15:38:08 -07:00
parent 3959e254e2
commit d8259b34dd
51 changed files with 102 additions and 103 deletions

View file

@ -1,5 +1,4 @@
- add functions.bif where needed
- update *.h guards
- cleanup analyzer descriptions
- can now lower-case the analyzer name in plugin

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef arp_h
#define arp_h
#ifndef ANALYZER_PROTOCOL_ARP_ARP_H
#define ANALYZER_PROTOCOL_ARP_ARP_H
#include "config.h"
#include <sys/types.h>

View file

@ -1,5 +1,5 @@
#ifndef AYIYA_h
#define AYIYA_h
#ifndef ANALYZER_PROTOCOL_AYIYA_AYIYA_H
#define ANALYZER_PROTOCOL_AYIYA_AYIYA_H
#include "ayiya_pac.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef backdoor_h
#define backdoor_h
#ifndef ANALYZER_PROTOCOL_BACKDOOR_BACKDOOR_H
#define ANALYZER_PROTOCOL_BACKDOOR_BACKDOOR_H
#include "analyzer/protocols/tcp/TCP.h"
#include "Timer.h"

View file

@ -1,7 +1,7 @@
// This code contributed by Nadi Sarrar.
#ifndef bittorrent_h
#define bittorrent_h
#ifndef ANALYZER_PROTOCOL_BITTORRENT_BITTORRENT_H
#define ANALYZER_PROTOCOL_BITTORRENT_BITTORRENT_H
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,7 +1,7 @@
// This code contributed by Nadi Sarrar.
#ifndef bittorrenttracker_h
#define bittorrenttracker_h
#ifndef ANALYZER_PROTOCOL_BITTORRENT_BITTORRENTTRACKER_H
#define ANALYZER_PROTOCOL_BITTORRENT_BITTORRENTTRACKER_H
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,8 +1,8 @@
// See the file "COPYING" in the main distribution directory for copyright.
//
#ifndef CONNSTATS_H
#define CONNSTATS_H
#ifndef ANALYZER_PROTOCOL_CONN_SIZE_CONNSIZE_H
#define ANALYZER_PROTOCOL_CONN_SIZE_CONNSIZE_H
#include "analyzer/Analyzer.h"
#include "NetVar.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef dce_rpc_h
#define dce_rpc_h
#ifndef ANALYZER_PROTOCOL_DCE_RPC_DCE_RPC_H
#define ANALYZER_PROTOCOL_DCE_RPC_DCE_RPC_H
// NOTE: This is a somewhat crude analyzer for DCE/RPC (used on Microsoft
// Windows systems) and shouldn't be considered as stable.
@ -88,7 +88,7 @@ enum DCE_RPC_PTYPE {
};
*/
#define DCE_RPC_HEADER_LENGTH 16
#define ANALYZER_PROTOCOL_DCE_RPC_DCE_RPC_HEADER_LENGTH 16
class DCE_RPC_Header {
public:

View file

@ -1,5 +1,5 @@
#ifndef dhcp_binpac_h
#define dhcp_binpac_h
#ifndef ANALYZER_PROTOCOL_DHCP_DHCP_H
#define ANALYZER_PROTOCOL_DHCP_DHCP_H
#include "analyzer/protocols/udp/UDP.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef dns_h
#define dns_h
#ifndef ANALYZER_PROTOCOL_DNS_DNS_H
#define ANALYZER_PROTOCOL_DNS_DNS_H
#include "analyzer/protocols/tcp/TCP.h"
#include "binpac_bro.h"

View file

@ -1,7 +1,7 @@
// Analyzer for connections that transfer binary data.
#ifndef FILEANALYZER_H
#define FILEANALYZER_H
#ifndef ANALYZER_PROTOCOL_FILE_FILE_H
#define ANALYZER_PROTOCOL_FILE_FILE_H
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef finger_h
#define finger_h
#ifndef ANALYZER_PROTOCOL_FINGER_FINGER_H
#define ANALYZER_PROTOCOL_FINGER_FINGER_H
#include "analyzer/protocols/tcp/TCP.h"
#include "analyzer/protocols/tcp/ContentLine.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef ftp_h
#define ftp_h
#ifndef ANALYZER_PROTOCOL_FTP_FTP_H
#define ANALYZER_PROTOCOL_FTP_FTP_H
#include "analyzer/protocols/login/NVT.h"
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef gnutella_h
#define gnutella_h
#ifndef ANALYZER_PROTOCOL_GNUTELLA_GNUTELLA_H
#define ANALYZER_PROTOCOL_GNUTELLA_GNUTELLA_H
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,5 +1,5 @@
#ifndef GTPv1_h
#define GTPv1_h
#ifndef ANALYZER_PROTOCOL_GTPV1_GTPV1_H
#define ANALYZER_PROTOCOL_GTPV1_GTPV1_H
#include "gtpv1_pac.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef http_h
#define http_h
#ifndef ANALYZER_PROTOCOL_HTTP_HTTP_H
#define ANALYZER_PROTOCOL_HTTP_HTTP_H
#include "analyzer/protocols/tcp/TCP.h"
#include "analyzer/protocols/tcp/ContentLine.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef icmp_h
#define icmp_h
#ifndef ANALYZER_PROTOCOL_ICMP_ICMP_H
#define ANALYZER_PROTOCOL_ICMP_ICMP_H
#include "RuleMatcher.h"
#include "analyzer/Analyzer.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef ident_h
#define ident_h
#ifndef ANALYZER_PROTOCOL_IDENT_IDENT_H
#define ANALYZER_PROTOCOL_IDENT_IDENT_H
#include "analyzer/protocols/tcp/TCP.h"
#include "analyzer/protocols/tcp/ContentLine.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef interconn_h
#define interconn_h
#ifndef ANALYZER_PROTOCOL_INTERCONN_INTERCONN_H
#define ANALYZER_PROTOCOL_INTERCONN_INTERCONN_H
#include "analyzer/protocols/tcp/TCP.h"
#include "Timer.h"

View file

@ -1,7 +1,7 @@
// An IRC analyzer contributed by Roland Gruber.
#ifndef irc_h
#define irc_h
#ifndef ANALYZER_PROTOCOL_IRC_IRC_H
#define ANALYZER_PROTOCOL_IRC_IRC_H
#include "analyzer/protocols/tcp/TCP.h"
namespace analyzer { namespace irc {

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef login_h
#define login_h
#ifndef ANALYZER_PROTOCOL_LOGIN_LOGIN_H
#define ANALYZER_PROTOCOL_LOGIN_LOGIN_H
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef nvt_h
#define nvt_h
#ifndef ANALYZER_PROTOCOL_LOGIN_NVT_H
#define ANALYZER_PROTOCOL_LOGIN_NVT_H
#include "analyzer/protocols/tcp/ContentLine.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef rsh_h
#define rsh_h
#ifndef ANALYZER_PROTOCOL_LOGIN_RSH_H
#define ANALYZER_PROTOCOL_LOGIN_RSH_H
#include "Login.h"
#include "analyzer/protocols/tcp/ContentLine.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef rlogin_h
#define rlogin_h
#ifndef ANALYZER_PROTOCOL_LOGIN_RLOGIN_H
#define ANALYZER_PROTOCOL_LOGIN_RLOGIN_H
#include "Login.h"
#include "analyzer/protocols/tcp/ContentLine.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef telnet_h
#define telnet_h
#ifndef ANALYZER_PROTOCOL_LOGIN_TELNET_H
#define ANALYZER_PROTOCOL_LOGIN_TELNET_H
#include "Login.h"

View file

@ -1,5 +1,5 @@
#ifndef mime_h
#define mime_h
#ifndef ANALYZER_PROTOCOL_MIME_MIME_H
#define ANALYZER_PROTOCOL_MIME_MIME_H
#include <assert.h>
#include <openssl/md5.h>

View file

@ -1,5 +1,5 @@
#ifndef MODBUS_H
#define MODBUS_H
#ifndef ANALYZER_PROTOCOL_MODBUS_MODBUS_H
#define ANALYZER_PROTOCOL_MODBUS_MODBUS_H
#include "analyzer/protocols/tcp/TCP.h"
#include "modbus_pac.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef ncp_h
#define ncp_h
#ifndef ANALYZER_PROTOCOL_NCP_NCP_H
#define ANALYZER_PROTOCOL_NCP_NCP_H
// A very crude analyzer for NCP (Netware Core Protocol)
//
@ -73,7 +73,7 @@ protected:
int buf_len; // size off msg_buf
};
#define NCP_TCPIP_HEADER_LENGTH 8
#define ANALYZER_PROTOCOL_NCP_NCP_HEADER_LENGTH 8
class NCP_FrameBuffer : public FrameBuffer {
public:

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef netbios_ssn_h
#define netbios_ssn_h
#ifndef ANALYZER_PROTOCOL_NETBIOS_SSN_NETBIOSSSN_H
#define ANALYZER_PROTOCOL_NETBIOS_SSN_NETBIOSSSN_H
#include "analyzer/protocols/udp/UDP.h"
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef ntp_h
#define ntp_h
#ifndef ANALYZER_PROTOCOL_NTP_NTP_H
#define ANALYZER_PROTOCOL_NTP_NTP_H
#include "analyzer/protocols/udp/UDP.h"

View file

@ -1,7 +1,7 @@
// An analyzer for application-layer protocol-detection.
#ifndef PIA_H
#define PIA_H
#ifndef ANALYZER_PROTOCOL_PIA_PIA_H
#define ANALYZER_PROTOCOL_PIA_PIA_H
#include "analyzer/Analyzer.h"
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -2,8 +2,8 @@
//
// An analyser for the POP3 protocol.
#ifndef pop3_h
#define pop3_h
#ifndef ANALYZER_PROTOCOL_POP3_POP3_H
#define ANALYZER_PROTOCOL_POP3_POP3_H
#include <vector>
#include <string>

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef nfs_h
#define nfs_h
#ifndef ANALYZER_PROTOCOL_RPC_NFS_H
#define ANALYZER_PROTOCOL_RPC_NFS_H
#include "RPC.h"
#include "XDR.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef portmap_h
#define portmap_h
#ifndef ANALYZER_PROTOCOL_RPC_PORTMAP_H
#define ANALYZER_PROTOCOL_RPC_PORTMAP_H
#include "RPC.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef rpc_h
#define rpc_h
#ifndef ANALYZER_PROTOCOL_RPC_RPC_H
#define ANALYZER_PROTOCOL_RPC_RPC_H
#include "analyzer/protocols/tcp/TCP.h"
#include "analyzer/protocols/udp/UDP.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef xdr_h
#define xdr_h
#ifndef ANALYZER_PROTOCOL_RPC_XDR_H
#define ANALYZER_PROTOCOL_RPC_XDR_H
#include <sys/types.h>
#include <netinet/in.h>

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef smb_h
#define smb_h
#ifndef ANALYZER_PROTOCOL_SMB_SMB_H
#define ANALYZER_PROTOCOL_SMB_SMB_H
// SMB (CIFS) analyzer.
// Reference: http://www.snia.org/tech_activities/CIFS/CIFS-TR-1p00_FINAL.pdf

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef smtp_h
#define smtp_h
#ifndef ANALYZER_PROTOCOL_SMTP_SMTP_H
#define ANALYZER_PROTOCOL_SMTP_SMTP_H
#include <list>
using namespace std;

View file

@ -1,5 +1,5 @@
#ifndef socks_h
#define socks_h
#ifndef ANALYZER_PROTOCOL_SOCKS_SOCKS_H
#define ANALYZER_PROTOCOL_SOCKS_SOCKS_H
// SOCKS v4 analyzer.

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef ssh_h
#define ssh_h
#ifndef ANALYZER_PROTOCOL_SSH_SSH_H
#define ANALYZER_PROTOCOL_SSH_SSH_H
#include "analyzer/protocols/tcp/TCP.h"
#include "analyzer/protocols/tcp/ContentLine.h"

View file

@ -1,5 +1,5 @@
#ifndef ssl_h
#define ssl_h
#ifndef ANALYZER_PROTOCOL_SSL_SSL_H
#define ANALYZER_PROTOCOL_SSL_SSL_H
#include "events.bif.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef steppingstone_h
#define steppingstone_h
#ifndef ANALYZER_PROTOCOL_STEPPING_STONE_STEPPINGSTONE_H
#define ANALYZER_PROTOCOL_STEPPING_STONE_STEPPINGSTONE_H
#include "Queue.h"
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,6 +1,6 @@
#ifndef Syslog_h
#define Syslog_h
#ifndef ANALYZER_PROTOCOL_SYSLOG_SYSLOG_H
#define ANALYZER_PROTOCOL_SYSLOG_SYSLOG_H
#include "analyzer/protocols/udp/UDP.h"
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,7 +1,7 @@
// Support-analyzer to split a reassembled stream into lines.
#ifndef CONTENTLINE_H
#define CONTENTLINE_H
#ifndef ANALYZER_PROTOCOL_TCP_CONTENTLINE_H
#define ANALYZER_PROTOCOL_TCP_CONTENTLINE_H
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,6 +1,6 @@
#ifndef ANALYZER_PROTOCOLS_TCP_STATS_H
#define ANALYZER_PROTOCOLS_TCP_STATS_H
#ifndef ANALYZER_PROTOCOL_TCP_STATS_H
#define ANALYZER_PROTOCOL_TCP_STATS_H
#include "TCP_Endpoint.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef TCP_H
#define TCP_H
#ifndef ANALYZER_PROTOCOL_TCP_TCP_H
#define ANALYZER_PROTOCOL_TCP_TCP_H
#include "analyzer/Analyzer.h"
#include "analyzer/protocols/tcp/TCP.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef tcpendpoint_h
#define tcpendpoint_h
#ifndef ANALYZER_PROTOCOL_TCP_TCP_ENDPOINT_H
#define ANALYZER_PROTOCOL_TCP_TCP_ENDPOINT_H
#include "IPAddr.h"

View file

@ -1,5 +1,5 @@
#ifndef TCP_REASSEMBLER_H
#define TCP_REASSEMBLER_H
#ifndef ANALYZER_PROTOCOL_TCP_TCP_REASSEMBLER_H
#define ANALYZER_PROTOCOL_TCP_TCP_REASSEMBLER_H
#include "Reassem.h"
#include "TCP_Endpoint.h"

View file

@ -1,5 +1,5 @@
#ifndef Teredo_h
#define Teredo_h
#ifndef ANALYZER_PROTOCOL_TEREDO_TEREDO_H
#define ANALYZER_PROTOCOL_TEREDO_TEREDO_H
#include "analyzer/Analyzer.h"
#include "NetVar.h"

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef udp_h
#define udp_h
#ifndef ANALYZER_PROTOCOL_UDP_UDP_H
#define ANALYZER_PROTOCOL_UDP_UDP_H
#include "analyzer/Analyzer.h"
#include <netinet/udp.h>

View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright.
#ifndef zip_h
#define zip_h
#ifndef ANALYZER_PROTOCOL_ZIP_ZIP_H
#define ANALYZER_PROTOCOL_ZIP_ZIP_H
#include "config.h"