src: make include guards more library friendly

Include guards for libraries should use a prefix that is meaningful for the library to avoid conflicts with other user code. For Suricata, use SURICATA. Additionally, remove the pattern of leading and trailing underscores as these are reserved for the language implementation per the C and C++ standards.
2026-10-11 22:09:53 +00:00 · 2024-03-10 07:59:54 +01:00
parent 632ca75dd3
commit 44388f1b69
579 changed files with 1705 additions and 1856 deletions
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __ACTION_GLOBALS_H__
-#define __ACTION_GLOBALS_H__
+#ifndef SURICATA_ACTION_GLOBALS_H
+#define SURICATA_ACTION_GLOBALS_H

 /* Changing them as flags, so later we can have alerts
 * and drop simultaneously */
@@ -38,4 +38,4 @@

 #define ACTION_DROP_REJECT (ACTION_REJECT_ANY | ACTION_DROP)

-#endif /* __ACTION_GLOBALS_H__ */
+#endif /* SURICATA_ACTION_GLOBALS_H */
@@ -21,10 +21,9 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __ALERT_DEBUGLOG_H__
-#define __ALERT_DEBUGLOG_H__
+#ifndef SURICATA_ALERT_DEBUGLOG_H
+#define SURICATA_ALERT_DEBUGLOG_H

 void AlertDebugLogRegister(void);

-#endif /* __ALERT_DEBUGLOG_H__ */
-
+#endif /* SURICATA_ALERT_DEBUGLOG_H */
@@ -21,11 +21,10 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __ALERT_FASTLOG_H__
-#define __ALERT_FASTLOG_H__
+#ifndef SURICATA_ALERT_FASTLOG_H
+#define SURICATA_ALERT_FASTLOG_H

 void AlertFastLogRegister(void);
 OutputInitResult AlertFastLogInitCtx(ConfNode *);

-#endif /* __ALERT_FASTLOG_H__ */
-
+#endif /* SURICATA_ALERT_FASTLOG_H */
@@ -24,10 +24,9 @@
 *
 */

-#ifndef __ALERT_SYSLOG_H__
-#define __ALERT_SYSLOG_H__
+#ifndef SURICATA_ALERT_SYSLOG_H
+#define SURICATA_ALERT_SYSLOG_H

 void AlertSyslogRegister(void);

-#endif /* __ALERT_SYSLOG_H__ */
-
+#endif /* SURICATA_ALERT_SYSLOG_H */
@@ -22,8 +22,8 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __APP_LAYER_DETECT_PROTO__H__
-#define __APP_LAYER_DETECT_PROTO__H__
+#ifndef SURICATA_APP_LAYER_DETECT_PROTO__H
+#define SURICATA_APP_LAYER_DETECT_PROTO__H

 #include "flow.h"
 #include "app-layer-protos.h"
@@ -228,4 +228,4 @@ void AppLayerProtoDetectUnittestsRegister(void);

 #endif /* UNITTESTS */

-#endif /* __APP_LAYER_DETECT_PROTO__H__ */
+#endif /* SURICATA_APP_LAYER_DETECT_PROTO__H */
@@ -23,8 +23,8 @@
 * This file contains the types (definitions) of the DNP3 objects.
 */

-#ifndef __APP_LAYER_DNP3_OBJECTS_H__
-#define __APP_LAYER_DNP3_OBJECTS_H__
+#ifndef SURICATA_APP_LAYER_DNP3_OBJECTS_H
+#define SURICATA_APP_LAYER_DNP3_OBJECTS_H

 #define DNP3_OBJECT_CODE(group, variation) (group << 8 | variation)

@@ -1461,4 +1461,4 @@ int DNP3DecodeObject(int group, int variation, const uint8_t **buf,
 DNP3PointList *DNP3PointListAlloc(void);
 void DNP3FreeObjectPointList(int group, int variation, DNP3PointList *);

-#endif /* __APP_LAYER_DNP3_OBJECTS_H__ */
+#endif /* SURICATA_APP_LAYER_DNP3_OBJECTS_H */
@@ -21,8 +21,8 @@
 * DNP3 application layer protocol header file
 */

-#ifndef __APP_LAYER_DNP3_H__
-#define __APP_LAYER_DNP3_H__
+#ifndef SURICATA_APP_LAYER_DNP3_H
+#define SURICATA_APP_LAYER_DNP3_H

 #include "rust.h"
 #if __BYTE_ORDER == __BIG_ENDIAN
@@ -257,4 +257,4 @@ void RegisterDNP3Parsers(void);
 void DNP3ParserRegisterTests(void);
 int DNP3PrefixIsSize(uint8_t);

-#endif /* __APP_LAYER_DNP3_H__ */
+#endif /* SURICATA_APP_LAYER_DNP3_H */
@@ -21,8 +21,8 @@
 * \author Kevin Wong <[email protected]>
 */

-#ifndef __APP_LAYER_ENIP_COMMON_H__
-#define __APP_LAYER_ENIP_COMMON_H__
+#ifndef SURICATA_APP_LAYER_ENIP_COMMON_H
+#define SURICATA_APP_LAYER_ENIP_COMMON_H

 #include "rust.h"

@@ -242,4 +242,4 @@ int DecodeCIPRequestMSPPDU(const uint8_t *input, uint32_t input_len,
 int DecodeCIPResponseMSPPDU(const uint8_t *input, uint32_t input_len,
        ENIPTransaction *enip_data, uint16_t offset);

-#endif /* __APP_LAYER_ENIP_COMMON_H__ */
+#endif /* SURICATA_APP_LAYER_ENIP_COMMON_H */
@@ -21,12 +21,11 @@
 * \author Kevin Wong <[email protected]>
 */

-#ifndef __APP_LAYER_ENIP_H__
-#define __APP_LAYER_ENIP_H__
-
+#ifndef SURICATA_APP_LAYER_ENIP_H
+#define SURICATA_APP_LAYER_ENIP_H

 void RegisterENIPUDPParsers(void);
 void RegisterENIPTCPParsers(void);
 void ENIPParserRegisterTests(void);

-#endif /* __APP_LAYER_ENIP_H__ */
+#endif /* SURICATA_APP_LAYER_ENIP_H */
@@ -22,8 +22,8 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __APP_LAYER_EVENTS_H__
-#define __APP_LAYER_EVENTS_H__
+#ifndef SURICATA_APP_LAYER_EVENTS_H
+#define SURICATA_APP_LAYER_EVENTS_H

 /* contains fwd declaration of AppLayerDecoderEvents_ */
 #include "decode.h"
@@ -78,5 +78,4 @@ void AppLayerDecoderEventsResetEvents(AppLayerDecoderEvents *events);
 void AppLayerDecoderEventsFreeEvents(AppLayerDecoderEvents **events);
 int DetectEngineGetEventInfo(const char *event_name, int *event_id, AppLayerEventType *event_type);

-#endif /* __APP_LAYER_EVENTS_H__ */
-
+#endif /* SURICATA_APP_LAYER_EVENTS_H */
@@ -21,8 +21,8 @@
 * \author Eric Leblond <[email protected]>
 */

-#ifndef __APP_LAYER_EXPECTATION__H__
-#define __APP_LAYER_EXPECTATION__H__
+#ifndef SURICATA_APP_LAYER_EXPECTATION__H
+#define SURICATA_APP_LAYER_EXPECTATION__H

 #include "flow-storage.h"

@@ -36,4 +36,4 @@ void AppLayerExpectationClean(Flow *f);

 uint64_t ExpectationGetCounter(void);

-#endif /* __APP_LAYER_EXPECTATION__H__ */
+#endif /* SURICATA_APP_LAYER_EXPECTATION__H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __APP_LAYER_FRAMES_H__
-#define __APP_LAYER_FRAMES_H__
+#ifndef SURICATA_APP_LAYER_FRAMES_H
+#define SURICATA_APP_LAYER_FRAMES_H

 #include "rust.h"

@@ -22,8 +22,8 @@
 * \author Jeff Lucovsky <[email protected]>
 */

-#ifndef __APP_LAYER_FTP_H__
-#define __APP_LAYER_FTP_H__
+#ifndef SURICATA_APP_LAYER_FTP_H
+#define SURICATA_APP_LAYER_FTP_H

 #include "rust.h"

@@ -192,5 +192,4 @@ uint64_t FTPMemcapGlobalCounter(void);
 uint16_t JsonGetNextLineFromBuffer(const char *buffer, const uint16_t len);
 bool EveFTPDataAddMetadata(void *vtx, JsonBuilder *jb);

-#endif /* __APP_LAYER_FTP_H__ */
-
+#endif /* SURICATA_APP_LAYER_FTP_H */
@@ -25,12 +25,12 @@
 * This file provides a HTTP protocol support for the engine using HTP library.
 */

-#ifndef __APP_LAYER_HTP_BODY_H__
-#define __APP_LAYER_HTP_BODY_H__
+#ifndef SURICATA_APP_LAYER_HTP_BODY_H
+#define SURICATA_APP_LAYER_HTP_BODY_H

 int HtpBodyAppendChunk(const HTPCfgDir *, HtpBody *, const uint8_t *, uint32_t);
 void HtpBodyPrint(HtpBody *);
 void HtpBodyFree(const HTPCfgDir *, HtpBody *);
 void HtpBodyPrune(HtpState *, HtpBody *, int);

-#endif /* __APP_LAYER_HTP_BODY_H__ */
+#endif /* SURICATA_APP_LAYER_HTP_BODY_H */
@@ -22,8 +22,8 @@
 *
 */

-#ifndef __APP_LAYER_HTP_FILE_H__
-#define __APP_LAYER_HTP_FILE_H__
+#ifndef SURICATA_APP_LAYER_HTP_FILE_H
+#define SURICATA_APP_LAYER_HTP_FILE_H

 #include "app-layer-htp.h"

@@ -41,4 +41,4 @@ int HTPFileClose(HtpState *, HtpTxUserData *tx, const uint8_t *data, uint32_t da

 void HTPFileParserRegisterTests(void);

-#endif /* __APP_LAYER_HTP_FILE_H__ */
+#endif /* SURICATA_APP_LAYER_HTP_FILE_H */
@@ -43,11 +43,11 @@
 * APIs from libhtp 0.5.x.
 */

-#ifndef __APP_LAYER_HTP_LIBHTP__H__
-#define __APP_LAYER_HTP_LIBHTP__H__
+#ifndef SURICATA_APP_LAYER_HTP_LIBHTP__H
+#define SURICATA_APP_LAYER_HTP_LIBHTP__H

 #include "suricata-common.h"

 bstr *SCHTPGenerateNormalizedUri(htp_tx_t *tx, htp_uri_t *uri, bool uri_include_all);

-#endif /* __APP_LAYER_HTP_LIBHTP__H__ */
+#endif /* SURICATA_APP_LAYER_HTP_LIBHTP__H */
@@ -15,8 +15,8 @@
 * 02110-1301, USA.
 */

-#ifndef __APP_LAYER_HTP_RANGE_H__
-#define __APP_LAYER_HTP_RANGE_H__
+#ifndef SURICATA_APP_LAYER_HTP_RANGE_H
+#define SURICATA_APP_LAYER_HTP_RANGE_H

 #include "suricata-common.h"

@@ -111,4 +111,4 @@ HttpRangeContainerBlock *HttpRangeContainerOpenFile(const unsigned char *key, ui

 void HttpRangeFreeBlock(HttpRangeContainerBlock *b);

-#endif /* __APP_LAYER_HTP_RANGE_H__ */
+#endif /* SURICATA_APP_LAYER_HTP_RANGE_H */
@@ -22,8 +22,8 @@
 * \author Duarte Silva <[email protected]>
 */

-#ifndef __APP_LAYER_HTP_XFF_H__
-#define __APP_LAYER_HTP_XFF_H__
+#ifndef SURICATA_APP_LAYER_HTP_XFF_H
+#define SURICATA_APP_LAYER_HTP_XFF_H

 /** XFF is disabled */
 #define XFF_DISABLED 1
@@ -51,4 +51,4 @@ int HttpXFFGetIP(const Flow *f, HttpXFFCfg *xff_cfg, char *dstbuf, int dstbuflen

 void HTPXFFParserRegisterTests(void);

-#endif /* __APP_LAYER_HTP_XFF_H__ */
+#endif /* SURICATA_APP_LAYER_HTP_XFF_H */
@@ -30,8 +30,8 @@
 * This file provides a HTTP protocol support for the engine using HTP library.
 */

-#ifndef __APP_LAYER_HTP_H__
-#define __APP_LAYER_HTP_H__
+#ifndef SURICATA_APP_LAYER_HTP_H
+#define SURICATA_APP_LAYER_HTP_H

 #include "rust.h"
 #include "app-layer-frames.h"
@@ -297,7 +297,7 @@ void HtpConfigRestoreBackup(void);

 void *HtpGetTxForH2(void *);

-#endif	/* __APP_LAYER_HTP_H__ */
+#endif /* SURICATA_APP_LAYER_HTP_H */

 /**
 * @}
@@ -21,11 +21,11 @@
 * \author Philippe Antoine <[email protected]>
 */

-#ifndef __APP_LAYER_HTTP2_H__
-#define __APP_LAYER_HTTP2_H__
+#ifndef SURICATA_APP_LAYER_HTTP2_H
+#define SURICATA_APP_LAYER_HTTP2_H

 void RegisterHTTP2Parsers(void);

 void HTTP2MimicHttp1Request(void *, void *);

-#endif /* __APP_LAYER_HTTP2_H__ */
+#endif /* SURICATA_APP_LAYER_HTTP2_H */
@@ -22,8 +22,8 @@
 * \author Frank Honza <[email protected]>
 */

-#ifndef __APP_LAYER_IKE_H__
-#define __APP_LAYER_IKE_H__
+#ifndef SURICATA_APP_LAYER_IKE_H
+#define SURICATA_APP_LAYER_IKE_H

 void RegisterIKEParsers(void);
 void IKEParserRegisterTests(void);
@@ -32,4 +32,4 @@ void IKEParserRegisterTests(void);
 typedef struct IKEState_ IKEState;
 typedef struct IKETransaction_ IKETransaction;

-#endif /* __APP_LAYER_IKE_H__ */
+#endif /* SURICATA_APP_LAYER_IKE_H */
@@ -21,8 +21,8 @@
 * \author Pierre Chifflier <[email protected]>
 */

-#ifndef __APP_LAYER_KRB5_H__
-#define __APP_LAYER_KRB5_H__
+#ifndef SURICATA_APP_LAYER_KRB5_H
+#define SURICATA_APP_LAYER_KRB5_H

 void RegisterKRB5Parsers(void);
 void KRB5ParserRegisterTests(void);
@@ -31,4 +31,4 @@ void KRB5ParserRegisterTests(void);
 typedef struct KRB5State_ KRB5State;
 typedef struct KRB5Transaction_ KRB5Transaction;

-#endif /* __APP_LAYER_KRB5_H__ */
+#endif /* SURICATA_APP_LAYER_KRB5_H */
@@ -31,9 +31,9 @@
 * \author David DIALLO <[email protected]>
 */

-#ifndef __APP_LAYER_MODBUS_H__
-#define __APP_LAYER_MODBUS_H__
+#ifndef SURICATA_APP_LAYER_MODBUS_H
+#define SURICATA_APP_LAYER_MODBUS_H

 void RegisterModbusParsers(void);

-#endif /* __APP_LAYER_MODBUS_H__ */
+#endif /* SURICATA_APP_LAYER_MODBUS_H */
@@ -21,9 +21,9 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __APP_LAYER_NFS_TCP_H__
-#define __APP_LAYER_NFS_TCP_H__
+#ifndef SURICATA_APP_LAYER_NFS_TCP_H
+#define SURICATA_APP_LAYER_NFS_TCP_H

 void RegisterNFSTCPParsers(void);

-#endif /* __APP_LAYER_NFS_TCP_H__ */
+#endif /* SURICATA_APP_LAYER_NFS_TCP_H */
@@ -21,10 +21,10 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __APP_LAYER_NFS_UDP_H__
-#define __APP_LAYER_NFS_UDP_H__
+#ifndef SURICATA_APP_LAYER_NFS_UDP_H
+#define SURICATA_APP_LAYER_NFS_UDP_H

 void RegisterNFSUDPParsers(void);
 void NFSUDPParserRegisterTests(void);

-#endif /* __APP_LAYER_NFS_UDP_H__ */
+#endif /* SURICATA_APP_LAYER_NFS_UDP_H */
@@ -21,8 +21,8 @@
 * \author Pierre Chifflier <[email protected]>
 */

-#ifndef __APP_LAYER_NTP_H__
-#define __APP_LAYER_NTP_H__
+#ifndef SURICATA_APP_LAYER_NTP_H
+#define SURICATA_APP_LAYER_NTP_H

 void RegisterNTPParsers(void);
 void NTPParserRegisterTests(void);
@@ -31,4 +31,4 @@ void NTPParserRegisterTests(void);
 typedef struct NTPState_ NTPState;
 typedef struct NTPTransaction_ NTPTransaction;

-#endif /* __APP_LAYER_NTP_H__ */
+#endif /* SURICATA_APP_LAYER_NTP_H */
@@ -22,8 +22,8 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __APP_LAYER_PARSER_H__
-#define __APP_LAYER_PARSER_H__
+#ifndef SURICATA_APP_LAYER_PARSER_H
+#define SURICATA_APP_LAYER_PARSER_H

 #include "app-layer-events.h"
 #include "util-file.h"
@@ -334,4 +334,4 @@ void UTHAppLayerParserStateGetIds(void *ptr, uint64_t *i1, uint64_t *i2, uint64_
 void AppLayerFramesFreeContainer(Flow *f);
 void FileApplyTxFlags(const AppLayerTxData *txd, const uint8_t direction, File *file);

-#endif /* __APP_LAYER_PARSER_H__ */
+#endif /* SURICATA_APP_LAYER_PARSER_H */
@@ -22,8 +22,8 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __APP_LAYER_PROTOS_H__
-#define __APP_LAYER_PROTOS_H__
+#ifndef SURICATA_APP_LAYER_PROTOS_H
+#define SURICATA_APP_LAYER_PROTOS_H

 enum AppProtoEnum {
    ALPROTO_UNKNOWN = 0,
@@ -117,4 +117,4 @@ const char *AppProtoToString(AppProto alproto);
 */
 AppProto StringToAppProto(const char *proto_name);

-#endif /* __APP_LAYER_PROTOS_H__ */
+#endif /* SURICATA_APP_LAYER_PROTOS_H */
@@ -20,9 +20,9 @@
 *
 */

-#ifndef __APP_LAYER_QUIC_H__
-#define __APP_LAYER_QUIC_H__
+#ifndef SURICATA_APP_LAYER_QUIC_H
+#define SURICATA_APP_LAYER_QUIC_H

 void RegisterQuicParsers(void);

-#endif /* __APP_LAYER_QUIC_H__ */
+#endif /* SURICATA_APP_LAYER_QUIC_H */
@@ -21,9 +21,9 @@
 * \author Zach Kelly <[email protected]>
 */

-#ifndef __APP_LAYER_RDP_H__
-#define __APP_LAYER_RDP_H__
+#ifndef SURICATA_APP_LAYER_RDP_H
+#define SURICATA_APP_LAYER_RDP_H

 void RegisterRdpParsers(void);

-#endif /* __APP_LAYER_RDP_H__ */
+#endif /* SURICATA_APP_LAYER_RDP_H */
@@ -21,8 +21,8 @@
 * \author Pierre Chifflier <[email protected]>
 */

-#ifndef __APP_LAYER_REGISTER_H__
-#define __APP_LAYER_REGISTER_H__
+#ifndef SURICATA_APP_LAYER_REGISTER_H
+#define SURICATA_APP_LAYER_REGISTER_H

 #include "app-layer-detect-proto.h"

@@ -100,4 +100,4 @@ int AppLayerRegisterParser(const struct AppLayerParser *p, AppProto alproto);

 int AppLayerRegisterParserAlias(const char *proto_name, const char *proto_alias);

-#endif /* __APP_LAYER_REGISTER_H__ */
+#endif /* SURICATA_APP_LAYER_REGISTER_H */
@@ -21,9 +21,9 @@
 * \author Sascha Steinbiss <[email protected]>
 */

-#ifndef __APP_LAYER_RFB_H__
-#define __APP_LAYER_RFB_H__
+#ifndef SURICATA_APP_LAYER_RFB_H
+#define SURICATA_APP_LAYER_RFB_H

 void RegisterRFBParsers(void);

-#endif /* __APP_LAYER_RFB_H__ */
+#endif /* SURICATA_APP_LAYER_RFB_H */
@@ -21,9 +21,9 @@
 * \author Giuseppe Longo <[email protected]>
 */

-#ifndef __APP_LAYER_SIP_H__
-#define __APP_LAYER_SIP_H__
+#ifndef SURICATA_APP_LAYER_SIP_H
+#define SURICATA_APP_LAYER_SIP_H

 void RegisterSIPParsers(void);

-#endif /* __APP_LAYER_SIP_H__ */
+#endif /* SURICATA_APP_LAYER_SIP_H */
@@ -21,9 +21,9 @@
 * SMB protocol handling
 */

-#ifndef __APP_LAYER_SMB_H__
-#define __APP_LAYER_SMB_H__
+#ifndef SURICATA_APP_LAYER_SMB_H
+#define SURICATA_APP_LAYER_SMB_H

 void RegisterSMBParsers(void);

-#endif /* !__APP_LAYER_SMB_H__ */
+#endif /* !SURICATA_APP_LAYER_SMB_H */
@@ -21,8 +21,8 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __APP_LAYER_SMTP_H__
-#define __APP_LAYER_SMTP_H__
+#ifndef SURICATA_APP_LAYER_SMTP_H
+#define SURICATA_APP_LAYER_SMTP_H

 #include "util-decode-mime.h"
 #include "util-streaming-buffer.h"
@@ -164,4 +164,4 @@ void RegisterSMTPParsers(void);
 void SMTPParserCleanup(void);
 void SMTPParserRegisterTests(void);

-#endif /* __APP_LAYER_SMTP_H__ */
+#endif /* SURICATA_APP_LAYER_SMTP_H */
@@ -21,8 +21,8 @@
 * \author Pierre Chifflier <[email protected]>
 */

-#ifndef __APP_LAYER_SNMP_H__
-#define __APP_LAYER_SNMP_H__
+#ifndef SURICATA_APP_LAYER_SNMP_H
+#define SURICATA_APP_LAYER_SNMP_H

 void RegisterSNMPParsers(void);

@@ -30,4 +30,4 @@ void RegisterSNMPParsers(void);
 typedef struct SNMPState_ SNMPState;
 typedef struct SNMPTransaction_ SNMPTransaction;

-#endif /* __APP_LAYER_SNMP_H__ */
+#endif /* SURICATA_APP_LAYER_SNMP_H */
@@ -22,13 +22,12 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __APP_LAYER_SSH_H__
-#define __APP_LAYER_SSH_H__
+#ifndef SURICATA_APP_LAYER_SSH_H
+#define SURICATA_APP_LAYER_SSH_H

 void RegisterSSHParsers(void);
 void SSHParserRegisterTests(void);

 bool SSHTxLogCondition(ThreadVars *, const Packet *, void *state, void *tx, uint64_t tx_id);

-#endif /* __APP_LAYER_SSH_H__ */
-
+#endif /* SURICATA_APP_LAYER_SSH_H */
@@ -23,8 +23,8 @@
 *
 */

-#ifndef __APP_LAYER_SSL_H__
-#define __APP_LAYER_SSL_H__
+#ifndef SURICATA_APP_LAYER_SSL_H
+#define SURICATA_APP_LAYER_SSL_H

 #include "util-ja3.h"
 #include "rust.h"
@@ -308,4 +308,4 @@ void SSLVersionToString(uint16_t, char *);
 void SSLEnableJA3(void);
 bool SSLJA3IsEnabled(void);

-#endif /* __APP_LAYER_SSL_H__ */
+#endif /* SURICATA_APP_LAYER_SSL_H */
@@ -21,8 +21,8 @@
 * \author Clément Galland <[email protected]>
 */

-#ifndef __APP_LAYER_TFTP_H__
-#define __APP_LAYER_TFTP_H__
+#ifndef SURICATA_APP_LAYER_TFTP_H
+#define SURICATA_APP_LAYER_TFTP_H

 void RegisterTFTPParsers(void);

@@ -30,4 +30,4 @@ void RegisterTFTPParsers(void);
 typedef struct TFTPState_ TFTPState;
 typedef struct TFTPTransaction_  TFTPTransaction;

-#endif /* __APP_LAYER_TFTP_H__ */
+#endif /* SURICATA_APP_LAYER_TFTP_H */
@@ -24,8 +24,8 @@
 *  Application layer handling and protocols implementation
 */

-#ifndef __APP_LAYER_H__
-#define __APP_LAYER_H__
+#ifndef SURICATA_APP_LAYER_H
+#define SURICATA_APP_LAYER_H

 #include "threadvars.h"
 #include "decode.h"
@@ -21,8 +21,8 @@
 * \author Endace Technology Limited - Jason Ish <[email protected]>
 */

-#ifndef __CONF_YAML_LOADER_H__
-#define __CONF_YAML_LOADER_H__
+#ifndef SURICATA_CONF_YAML_LOADER_H
+#define SURICATA_CONF_YAML_LOADER_H

 #include "conf.h"

@@ -33,4 +33,4 @@ int ConfYamlHandleInclude(ConfNode *parent, const char *filename);

 void ConfYamlRegisterTests(void);

-#endif /* !__CONF_YAML_LOADER_H__ */
+#endif /* !SURICATA_CONF_YAML_LOADER_H */
@@ -21,8 +21,8 @@
 * \author Endace Technology Limited - Jason Ish <[email protected]>
 */

-#ifndef __CONF_H__
-#define __CONF_H__
+#ifndef SURICATA_CONF_H
+#define SURICATA_CONF_H

 #include "queue.h"

@@ -98,4 +98,4 @@ ConfNode *ConfSetIfaceNode(const char *ifaces_node_name, const char *iface);
 int ConfSetRootAndDefaultNodes(
        const char *ifaces_node_name, const char *iface, ConfNode **if_root, ConfNode **if_default);
 ConfNode *ConfNodeGetNodeOrCreate(ConfNode *parent, const char *name, int final);
-#endif /* ! __CONF_H__ */
+#endif /* ! SURICATA_CONF_H */
@@ -22,8 +22,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __COUNTERS_H__
-#define __COUNTERS_H__
+#ifndef SURICATA_COUNTERS_H
+#define SURICATA_COUNTERS_H

 #include "threads.h"

@@ -143,5 +143,4 @@ TmEcode StatsOutputCounterSocket(json_t *cmd,
                                 json_t *answer, void *data);
 #endif

-#endif /* __COUNTERS_H__ */
-
+#endif /* SURICATA_COUNTERS_H */
@@ -21,8 +21,8 @@
 * \author Eric Leblond <[email protected]>
 */

-#ifndef __DATASETS_IPV4_H__
-#define __DATASETS_IPV4_H__
+#ifndef SURICATA_DATASETS_IPV4_H
+#define SURICATA_DATASETS_IPV4_H

 #include "datasets-reputation.h"

@@ -36,4 +36,4 @@ bool IPv4Compare(void *a, void *b);
 uint32_t IPv4Hash(void *s);
 void IPv4Free(void *s);

-#endif /* __DATASETS_IPV4_H__ */
+#endif /* SURICATA_DATASETS_IPV4_H */
@@ -21,8 +21,8 @@
 * \author Eric Leblond <[email protected]>
 */

-#ifndef __DATASETS_IPV6_H__
-#define __DATASETS_IPV6_H__
+#ifndef SURICATA_DATASETS_IPV6_H
+#define SURICATA_DATASETS_IPV6_H

 #include "datasets-reputation.h"

@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DATASETS_MD5_H__
-#define __DATASETS_MD5_H__
+#ifndef SURICATA_DATASETS_MD5_H
+#define SURICATA_DATASETS_MD5_H

 #include "datasets-reputation.h"

@@ -36,4 +36,4 @@ bool Md5StrCompare(void *a, void *b);
 uint32_t Md5StrHash(void *s);
 void Md5StrFree(void *s);

-#endif /* __DATASETS_MD5_H__ */
+#endif /* SURICATA_DATASETS_MD5_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DATASETS_REPUTATION_H__
-#define __DATASETS_REPUTATION_H__
+#ifndef SURICATA_DATASETS_REPUTATION_H
+#define SURICATA_DATASETS_REPUTATION_H

 typedef struct DataRepType {
    uint16_t value;
@@ -33,4 +33,4 @@ typedef struct DataRepResultType {
    DataRepType rep;
 } DataRepResultType;

-#endif /* __DATASETS_REPUTATION_H__ */
+#endif /* SURICATA_DATASETS_REPUTATION_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DATASETS_SHA256_H__
-#define __DATASETS_SHA256_H__
+#ifndef SURICATA_DATASETS_SHA256_H
+#define SURICATA_DATASETS_SHA256_H

 #include "datasets-reputation.h"

@@ -36,4 +36,4 @@ bool Sha256StrCompare(void *a, void *b);
 uint32_t Sha256StrHash(void *s);
 void Sha256StrFree(void *s);

-#endif /* __DATASETS_SHA256_H__ */
+#endif /* SURICATA_DATASETS_SHA256_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DATASETS_STRING_H__
-#define __DATASETS_STRING_H__
+#ifndef SURICATA_DATASETS_STRING_H
+#define SURICATA_DATASETS_STRING_H

 #include "datasets-reputation.h"

@@ -38,4 +38,4 @@ uint32_t StringHash(void *s);
 void StringFree(void *s);
 int StringAsBase64(const void *s, char *out, size_t out_size);

-#endif /* __DATASETS_STRING_H__ */
+#endif /* SURICATA_DATASETS_STRING_H */
@@ -15,8 +15,8 @@
 * 02110-1301, USA.
 */

-#ifndef __DATASETS_H__
-#define __DATASETS_H__
+#ifndef SURICATA_DATASETS_H
+#define SURICATA_DATASETS_H

 #include "util-thash.h"
 #include "datasets-reputation.h"
@@ -64,4 +64,4 @@ int DatasetAddSerialized(Dataset *set, const char *string);
 int DatasetRemoveSerialized(Dataset *set, const char *string);
 int DatasetLookupSerialized(Dataset *set, const char *string);

-#endif /* __DATASETS_H__ */
+#endif /* SURICATA_DATASETS_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_CHDLC_H__
-#define __DECODE_CHDLC_H__
+#ifndef SURICATA_DECODE_CHDLC_H
+#define SURICATA_DECODE_CHDLC_H

 #define CHDLC_HEADER_LEN           4

@@ -34,4 +34,4 @@ typedef struct CHDLCHdr_ {

 void DecodeCHDLCRegisterTests(void);

-#endif /* __DECODE_CHDLC_H__ */
+#endif /* SURICATA_DECODE_CHDLC_H */
@@ -22,9 +22,8 @@
 *
 */

-#ifndef __DECODE_ERSPAN_H__
-#define __DECODE_ERSPAN_H__
-
+#ifndef SURICATA_DECODE_ERSPAN_H
+#define SURICATA_DECODE_ERSPAN_H

 typedef struct ErspanHdr_ {
    uint16_t ver_vlan;
@@ -33,4 +32,4 @@ typedef struct ErspanHdr_ {
 } __attribute__((__packed__)) ErspanHdr;

 void DecodeERSPANConfig(void);
-#endif /* __DECODE_ERSPAN_H__ */
+#endif /* SURICATA_DECODE_ERSPAN_H */
@@ -19,8 +19,8 @@
 * \file
 */

-#ifndef __DECODE_ESP_H__
-#define __DECODE_ESP_H__
+#ifndef SURICATA_DECODE_ESP_H
+#define SURICATA_DECODE_ESP_H

 /** \brief size of the ESP header */
 #define ESP_HEADER_LEN 8
@@ -48,4 +48,4 @@ typedef struct ESPHdr_ {

 void DecodeESPRegisterTests(void);

-#endif /* __DECODE_ESP_H__ */
+#endif /* SURICATA_DECODE_ESP_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_ETHERNET_H__
-#define __DECODE_ETHERNET_H__
+#ifndef SURICATA_DECODE_ETHERNET_H
+#define SURICATA_DECODE_ETHERNET_H

 #define ETHERNET_HEADER_LEN           14

@@ -59,5 +59,4 @@ typedef struct EthernetHdr_ {

 void DecodeEthernetRegisterTests(void);

-#endif /* __DECODE_ETHERNET_H__ */
-
+#endif /* SURICATA_DECODE_ETHERNET_H */
@@ -22,8 +22,8 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __DECODE_EVENTS_H__
-#define __DECODE_EVENTS_H__
+#ifndef SURICATA_DECODE_EVENTS_H
+#define SURICATA_DECODE_EVENTS_H

 /* packet decoder events */
 enum {
@@ -313,4 +313,4 @@ struct DecodeEvents_ {
 /* +1 for the end of table marker */
 extern const struct DecodeEvents_ DEvents[DECODE_EVENT_MAX + 1];

-#endif /* __DECODE_EVENTS_H__ */
+#endif /* SURICATA_DECODE_EVENTS_H */
@@ -23,11 +23,11 @@
 * Geneve decoder.
 */

-#ifndef __DECODE_GENEVE_H__
-#define __DECODE_GENEVE_H__
+#ifndef SURICATA_DECODE_GENEVE_H
+#define SURICATA_DECODE_GENEVE_H

 void DecodeGeneveRegisterTests(void);
 void DecodeGeneveConfig(void);
 bool DecodeGeneveEnabledForPort(const uint16_t sp, const uint16_t dp);

-#endif /* !__DECODE_GENEVE_H__ */
+#endif /* !SURICATA_DECODE_GENEVE_H */
@@ -23,8 +23,8 @@
 * Generic Route Encapsulation (GRE) from RFC 1701.
 */

-#ifndef __DECODE_GRE_H__
-#define __DECODE_GRE_H__
+#ifndef SURICATA_DECODE_GRE_H
+#define SURICATA_DECODE_GRE_H

 #ifndef IPPROTO_GRE
 #define IPPROTO_GRE 47
@@ -84,5 +84,4 @@ typedef struct GRESreHdr_

 void DecodeGRERegisterTests(void);

-#endif /* __DECODE_GRE_H__ */
-
+#endif /* SURICATA_DECODE_GRE_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_ICMPV4_H__
-#define __DECODE_ICMPV4_H__
+#ifndef SURICATA_DECODE_ICMPV4_H
+#define SURICATA_DECODE_ICMPV4_H

 #include "decode-tcp.h"
 #include "decode-udp.h"
@@ -346,4 +346,4 @@ static inline uint16_t ICMPV4CalculateChecksum(const uint16_t *pkt, uint16_t tle

 int ICMPv4GetCounterpart(uint8_t type);

-#endif /* __DECODE_ICMPV4_H__ */
+#endif /* SURICATA_DECODE_ICMPV4_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_ICMPV6_H__
-#define __DECODE_ICMPV6_H__
+#ifndef SURICATA_DECODE_ICMPV6_H
+#define SURICATA_DECODE_ICMPV6_H

 #include "decode-tcp.h"
 #include "decode-udp.h"
@@ -267,4 +267,4 @@ static inline uint16_t ICMPV6CalculateChecksum(
    return (uint16_t) ~csum;
 }

-#endif /* __DECODE_ICMPV6_H__ */
+#endif /* SURICATA_DECODE_ICMPV6_H */
@@ -22,8 +22,8 @@
 * \author Brian Rectanus <[email protected]>
 */

-#ifndef __DECODE_IPV4_H__
-#define __DECODE_IPV4_H__
+#ifndef SURICATA_DECODE_IPV4_H
+#define SURICATA_DECODE_IPV4_H

 #define IPV4_HEADER_LEN           20    /**< Header length */
 #define IPV4_OPTMAX               40    /**< Max options length */
@@ -243,4 +243,4 @@ static inline uint16_t IPV4Checksum(const uint16_t *pkt, uint16_t hlen, uint16_t
    return (uint16_t) ~csum;
 }

-#endif /* __DECODE_IPV4_H__ */
+#endif /* SURICATA_DECODE_IPV4_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_IPV6_H__
-#define __DECODE_IPV6_H__
+#ifndef SURICATA_DECODE_IPV6_H
+#define SURICATA_DECODE_IPV6_H

 #define IPV6_HEADER_LEN            40
 #define	IPV6_MAXPACKET	           65535 /* maximum packet size */
@@ -242,4 +242,4 @@ typedef struct IPV6ExtHdrs_

 void DecodeIPV6RegisterTests(void);

-#endif /* __DECODE_IPV6_H__ */
+#endif /* SURICATA_DECODE_IPV6_H */
@@ -23,12 +23,12 @@
 * MPLS decoder.
 */

-#ifndef __DECODE_MPLS_H__
-#define __DECODE_MPLS_H__
+#ifndef SURICATA_DECODE_MPLS_H
+#define SURICATA_DECODE_MPLS_H

 #define ETHERNET_TYPE_MPLS_UNICAST   0x8847
 #define ETHERNET_TYPE_MPLS_MULTICAST 0x8848

 void DecodeMPLSRegisterTests(void);

-#endif /* !__DECODE_MPLS_H__ */
+#endif /* !SURICATA_DECODE_MPLS_H */
@@ -22,9 +22,8 @@
 *
 */

-#ifndef __DECODE_NSH_H__
-#define __DECODE_NSH_H__
-
+#ifndef SURICATA_DECODE_NSH_H
+#define SURICATA_DECODE_NSH_H

 #define NSH_NEXT_PROTO_UNASSIGNED  0x0
 #define NSH_NEXT_PROTO_IPV4        0x1
@@ -47,4 +46,4 @@ typedef struct NshHdr_ {

 void DecodeNSHRegisterTests(void);

-#endif /* __DECODE_NSH_H__ */
+#endif /* SURICATA_DECODE_NSH_H */
@@ -21,8 +21,8 @@
 * \author Breno Silva Pinto <[email protected]>
 */

-#ifndef __DECODE_PPP_H__
-#define __DECODE_PPP_H__
+#ifndef SURICATA_DECODE_PPP_H
+#define SURICATA_DECODE_PPP_H

 /** Point to Point Protocol RFC1331 - Supported tyes */
 #define PPP_IP         0x0021       /* Internet Protocol */
@@ -72,5 +72,4 @@ typedef struct PPPHdr_ {

 void DecodePPPRegisterTests(void);

-#endif /* __DECODE_PPP_H__ */
-
+#endif /* SURICATA_DECODE_PPP_H */
@@ -21,9 +21,8 @@
 * \author James Riden <[email protected]>
 */

-#ifndef __DECODE_PPPOE_H__
-#define __DECODE_PPPOE_H__
-
+#ifndef SURICATA_DECODE_PPPOE_H
+#define SURICATA_DECODE_PPPOE_H

 // Session header length minus the protocol field
 #define PPPOE_SESSION_HEADER_MIN_LEN     7
@@ -77,5 +76,4 @@ typedef struct PPPOEDiscoveryHdr_

 void DecodePPPOERegisterTests(void);

-#endif /* __DECODE_PPPOE_H__ */
-
+#endif /* SURICATA_DECODE_PPPOE_H */
@@ -21,8 +21,7 @@
 * \author William Metcalf <[email protected]>
 */

-#ifndef __DECODE_RAW_H__
-#define __DECODE_RAW_H__
+#ifndef SURICATA_DECODE_RAW_H
+#define SURICATA_DECODE_RAW_H
 void DecodeRawRegisterTests(void);
-#endif /* __DECODE_RAW_H__ */
-
+#endif /* SURICATA_DECODE_RAW_H */
@@ -21,8 +21,8 @@
 * \author Eric Leblond <[email protected]>
 */

-#ifndef __DECODE_SCTP_H__
-#define __DECODE_SCTP_H__
+#ifndef SURICATA_DECODE_SCTP_H
+#define SURICATA_DECODE_SCTP_H

 /** size of the packet header without any chunk headers */
 #define SCTP_HEADER_LEN                       12
@@ -48,4 +48,4 @@ typedef struct SCTPHdr_

 void DecodeSCTPRegisterTests(void);

-#endif /* __DECODE_SCTP_H__ */
+#endif /* SURICATA_DECODE_SCTP_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_SLL_H__
-#define __DECODE_SLL_H__
+#ifndef SURICATA_DECODE_SLL_H
+#define SURICATA_DECODE_SLL_H

 #define SLL_HEADER_LEN                16

@@ -34,5 +34,4 @@ typedef struct SllHdr_ {
    uint16_t sll_protocol;     /* protocol */
 } __attribute__((__packed__)) SllHdr;

-#endif /* __DECODE_SLL_H__ */
-
+#endif /* SURICATA_DECODE_SLL_H */
@@ -22,8 +22,8 @@
 * \todo RAW* macro's should be returning the raw value, not the host order
 */

-#ifndef __DECODE_TCP_H__
-#define __DECODE_TCP_H__
+#ifndef SURICATA_DECODE_TCP_H
+#define SURICATA_DECODE_TCP_H

 #define TCP_HEADER_LEN                       20
 #define TCP_OPTLENMAX                        40
@@ -308,4 +308,4 @@ static inline uint16_t TCPV6Checksum(
    return (uint16_t)~csum;
 }

-#endif /* __DECODE_TCP_H__ */
+#endif /* SURICATA_DECODE_TCP_H */
@@ -22,8 +22,8 @@
 *
 */

-#ifndef __DECODE_TEMPLATE_H__
-#define __DECODE_TEMPLATE_H__
+#ifndef SURICATA_DECODE_TEMPLATE_H
+#define SURICATA_DECODE_TEMPLATE_H

 /* Header layout. Keep things like alignment and endianness in
 * mind while constructing this. */
@@ -34,4 +34,4 @@ typedef struct TemplateHdr_ {
    uint16_t pad1;
 } __attribute__((__packed__)) TemplateHdr;

-#endif /* __DECODE_TEMPLATE_H__ */
+#endif /* SURICATA_DECODE_TEMPLATE_H */
@@ -15,8 +15,8 @@
 * 02110-1301, USA.
 */

-#ifndef __DECODE_TEREDO_H__
-#define __DECODE_TEREDO_H__
+#ifndef SURICATA_DECODE_TEREDO_H
+#define SURICATA_DECODE_TEREDO_H

 int DecodeTeredo(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
                 const uint8_t *pkt, uint16_t len);
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_UDP_H__
-#define __DECODE_UDP_H__
+#ifndef SURICATA_DECODE_UDP_H
+#define SURICATA_DECODE_UDP_H

 #define UDP_HEADER_LEN         8

@@ -191,4 +191,4 @@ static inline uint16_t UDPV6Checksum(
        return csum_u16;
 }

-#endif /* __DECODE_UDP_H__ */
+#endif /* SURICATA_DECODE_UDP_H */
@@ -21,8 +21,8 @@
 * \author Breno Silva <[email protected]>
 */

-#ifndef __DECODE_VLAN_H__
-#define __DECODE_VLAN_H__
+#ifndef SURICATA_DECODE_VLAN_H
+#define SURICATA_DECODE_VLAN_H

 /* return vlan id in host byte order */
 uint16_t DecodeVLANGetId(const struct Packet_ *, uint8_t layer);
@@ -51,5 +51,4 @@ void DecodeVLANRegisterTests(void);
 #define VLAN_MAX_LAYERS    3
 #define VLAN_MAX_LAYER_IDX (VLAN_MAX_LAYERS - 1)

-#endif /* __DECODE_VLAN_H__ */
-
+#endif /* SURICATA_DECODE_VLAN_H */
@@ -21,8 +21,8 @@
 * \author Jeff Lucovsky <[email protected]>
 */

-#ifndef __DECODE_VNTAG_H__
-#define __DECODE_VNTAG_H__
+#ifndef SURICATA_DECODE_VNTAG_H
+#define SURICATA_DECODE_VNTAG_H

 /* https://www.ieee802.org/1/files/public/docs2009/new-pelissier-vntag-seminar-0508.pdf */
 /** VNTag macros to access VNTag direction, dst vif_id, dest, looped, version, src vif_id **/
@@ -45,4 +45,4 @@ typedef struct VNTagHdr_ {

 void DecodeVNTagRegisterTests(void);

-#endif /* __DECODE_VNTAG_H__ */
+#endif /* SURICATA_DECODE_VNTAG_H */
@@ -23,11 +23,11 @@
 * VXLAN decoder.
 */

-#ifndef __DECODE_VXLAN_H__
-#define __DECODE_VXLAN_H__
+#ifndef SURICATA_DECODE_VXLAN_H
+#define SURICATA_DECODE_VXLAN_H

 void DecodeVXLANRegisterTests(void);
 void DecodeVXLANConfig(void);
 bool DecodeVXLANEnabledForPort(const uint16_t sp, const uint16_t dp);

-#endif /* !__DECODE_VXLAN_H__ */
+#endif /* !SURICATA_DECODE_VXLAN_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DECODE_H__
-#define __DECODE_H__
+#ifndef SURICATA_DECODE_H
+#define SURICATA_DECODE_H

 //#define DBG_THREADS
 #define COUNTERS
@@ -1218,4 +1218,4 @@ static inline bool DecodeNetworkLayer(ThreadVars *tv, DecodeThreadVars *dtv,
    return true;
 }

-#endif /* __DECODE_H__ */
+#endif /* SURICATA_DECODE_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DEFRAG_HASH_H__
-#define __DEFRAG_HASH_H__
+#ifndef SURICATA_DEFRAG_HASH_H
+#define SURICATA_DEFRAG_HASH_H

 #include "decode.h"
 #include "defrag.h"
@@ -102,5 +102,4 @@ int DefragTrackerSetMemcap(uint64_t);
 uint64_t DefragTrackerGetMemcap(void);
 uint64_t DefragTrackerGetMemuse(void);

-#endif /* __DEFRAG_HASH_H__ */
-
+#endif /* SURICATA_DEFRAG_HASH_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DEFRAG_QUEUE_H__
-#define __DEFRAG_QUEUE_H__
+#ifndef SURICATA_DEFRAG_QUEUE_H
+#define SURICATA_DEFRAG_QUEUE_H

 #include "suricata-common.h"
 #include "defrag.h"
@@ -80,5 +80,4 @@ void DefragTrackerEnqueue (DefragTrackerQueue *, DefragTracker *);
 DefragTracker *DefragTrackerDequeue (DefragTrackerQueue *);
 uint32_t DefragTrackerQueueLen(DefragTrackerQueue *);

-#endif /* __DEFRAG_QUEUE_H__ */
-
+#endif /* SURICATA_DEFRAG_QUEUE_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DEFRAG_TIMEOUT_H__
-#define __DEFRAG_TIMEOUT_H__
+#ifndef SURICATA_DEFRAG_TIMEOUT_H
+#define SURICATA_DEFRAG_TIMEOUT_H

 uint32_t DefragTimeoutHash(SCTime_t ts);

@@ -21,8 +21,8 @@
 * \author Endace Technology Limited, Jason Ish <[email protected]>
 */

-#ifndef __DEFRAG_H__
-#define __DEFRAG_H__
+#ifndef SURICATA_DEFRAG_H
+#define SURICATA_DEFRAG_H

 #include "threads.h"
 #include "util-pool.h"
@@ -131,4 +131,4 @@ void DefragTrackerFreeFrags(DefragTracker *);
 Packet *Defrag(ThreadVars *, DecodeThreadVars *, Packet *);
 void DefragRegisterTests(void);

-#endif /* __DEFRAG_H__ */
+#endif /* SURICATA_DEFRAG_H */
@@ -21,9 +21,9 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __DETECT_APP_LAYER_EVENT_H__
-#define __DETECT_APP_LAYER_EVENT_H__
+#ifndef SURICATA_DETECT_APP_LAYER_EVENT_H
+#define SURICATA_DETECT_APP_LAYER_EVENT_H

 void DetectAppLayerEventRegister(void);

-#endif /* __DETECT_APP_LAYER_EVENT_H__ */
+#endif /* SURICATA_DETECT_APP_LAYER_EVENT_H */
@@ -21,9 +21,9 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __DETECT_APP_LAYER_PROTOCOL__H__
-#define __DETECT_APP_LAYER_PROTOCOL__H__
+#ifndef SURICATA_DETECT_APP_LAYER_PROTOCOL__H
+#define SURICATA_DETECT_APP_LAYER_PROTOCOL__H

 void DetectAppLayerProtocolRegister(void);

-#endif /* __DETECT_APP_LAYER_PROTOCOL__H__ */
+#endif /* SURICATA_DETECT_APP_LAYER_PROTOCOL__H */
@@ -20,8 +20,8 @@
 *
 * Implements "asn1" keyword
 */
-#ifndef __DETECT_ASN1_H__
-#define __DETECT_ASN1_H__
+#ifndef SURICATA_DETECT_ASN1_H
+#define SURICATA_DETECT_ASN1_H

 /* prototypes */
 void DetectAsn1Register (void);
@@ -29,4 +29,4 @@ void DetectAsn1Register (void);
 bool DetectAsn1Match(const SigMatchData *smd, const uint8_t *buffer, const uint32_t buffer_len,
        const uint32_t offset);

-#endif /* __DETECT_ASN1_H__ */
+#endif /* SURICATA_DETECT_ASN1_H */
@@ -15,9 +15,9 @@
 * 02110-1301, USA.
 */

-#ifndef __DETECT_BASE64_DATA_H__
-#define __DETECT_BASE64_DATA_H__
+#ifndef SURICATA_DETECT_BASE64_DATA_H
+#define SURICATA_DETECT_BASE64_DATA_H

 void DetectBase64DataRegister(void);

-#endif /* __DETECT_BASE64_DATA_H__ */
+#endif /* SURICATA_DETECT_BASE64_DATA_H */
@@ -15,11 +15,11 @@
 * 02110-1301, USA.
 */

-#ifndef __DETECT_BASE64_DECODE_H__
-#define __DETECT_BASE64_DECODE_H__
+#ifndef SURICATA_DETECT_BASE64_DECODE_H
+#define SURICATA_DETECT_BASE64_DECODE_H

 void DetectBase64DecodeRegister(void);
 int DetectBase64DecodeDoMatch(DetectEngineThreadCtx *, const Signature *,
    const SigMatchData *, const uint8_t *, uint32_t);

-#endif /* __DETECT_BASE64_DECODE_H__ */
+#endif /* SURICATA_DETECT_BASE64_DECODE_H */
@@ -21,11 +21,11 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DETECT_BSIZE_H__
-#define	__DETECT_BSIZE_H__
+#ifndef SURICATA_DETECT_BSIZE_H
+#define SURICATA_DETECT_BSIZE_H

 void DetectBsizeRegister(void);
 int DetectBsizeMatch(const SigMatchCtx *ctx, const uint64_t buffer_size, bool eof);
 bool DetectBsizeValidateContentCallback(Signature *s, const SignatureInitDataBuffer *);

-#endif /* __DETECT_BSIZE_H__ */
+#endif /* SURICATA_DETECT_BSIZE_H */
@@ -21,9 +21,9 @@
 *  \author Giuseppe Longo <[email protected]>
 */

-#ifndef __DETECT_BYPASS_H__
-#define __DETECT_BYPASS_H__
+#ifndef SURICATA_DETECT_BYPASS_H
+#define SURICATA_DETECT_BYPASS_H

 void DetectBypassRegister(void);

-#endif /* __DETECT_BYPASS_H__ */
+#endif /* SURICATA_DETECT_BYPASS_H */
@@ -21,8 +21,8 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __DETECT_BYTEEXTRACT_H__
-#define __DETECT_BYTEEXTRACT_H__
+#ifndef SURICATA_DETECT_BYTEEXTRACT_H
+#define SURICATA_DETECT_BYTEEXTRACT_H

 /* flags */
 #define DETECT_BYTE_EXTRACT_FLAG_RELATIVE   0x01
@@ -65,4 +65,4 @@ SigMatch *DetectByteExtractRetrieveSMVar(const char *, const Signature *);
 int DetectByteExtractDoMatch(DetectEngineThreadCtx *, const SigMatchData *, const Signature *,
        const uint8_t *, uint32_t, uint64_t *, uint8_t);

-#endif /* __DETECT_BYTEEXTRACT_H__ */
+#endif /* SURICATA_DETECT_BYTEEXTRACT_H */
@@ -21,12 +21,12 @@
 * \author Jeff Lucovsky <[email protected]>
 */

-#ifndef __DETECT_BYTE_H__
-#define __DETECT_BYTE_H__
+#ifndef SURICATA_DETECT_BYTE_H
+#define SURICATA_DETECT_BYTE_H
 #include "detect.h"

 typedef uint8_t DetectByteIndexType;

 bool DetectByteRetrieveSMVar(const char *, const Signature *, DetectByteIndexType *);

-#endif /* __DETECT_BYTE_H__ */
+#endif /* SURICATA_DETECT_BYTE_H */
@@ -21,8 +21,8 @@
 * \author Brian Rectanus <[email protected]>
 */

-#ifndef __DETECT_BYTEJUMP_H__
-#define __DETECT_BYTEJUMP_H__
+#ifndef SURICATA_DETECT_BYTEJUMP_H
+#define SURICATA_DETECT_BYTEJUMP_H

 /** Bytejump Base */
 #define DETECT_BYTEJUMP_BASE_UNSET  0 /**< Unset type value string (automatic)*/
@@ -75,5 +75,4 @@ void DetectBytejumpRegister (void);
 bool DetectBytejumpDoMatch(DetectEngineThreadCtx *, const Signature *, const SigMatchCtx *,
        const uint8_t *, uint32_t, uint16_t, int32_t, int32_t);

-#endif /* __DETECT_BYTEJUMP_H__ */
-
+#endif /* SURICATA_DETECT_BYTEJUMP_H */
@@ -21,8 +21,8 @@
 * \author Jeff Lucovsky <[email protected]>
 */

-#ifndef __DETECT_BYTEMATH_H__
-#define __DETECT_BYTEMATH_H__
+#ifndef SURICATA_DETECT_BYTEMATH_H
+#define SURICATA_DETECT_BYTEMATH_H

 void DetectBytemathRegister(void);

@@ -30,4 +30,4 @@ SigMatch *DetectByteMathRetrieveSMVar(const char *, const Signature *);
 int DetectByteMathDoMatch(DetectEngineThreadCtx *, const DetectByteMathData *, const Signature *,
        const uint8_t *, const uint32_t, uint8_t, uint64_t, uint64_t *, uint8_t);

-#endif /* __DETECT_BYTEMATH_H__ */
+#endif /* SURICATA_DETECT_BYTEMATH_H */
@@ -21,8 +21,8 @@
 * \author Brian Rectanus <[email protected]>
 */

-#ifndef __DETECT_BYTETEST_H__
-#define __DETECT_BYTETEST_H__
+#ifndef SURICATA_DETECT_BYTETEST_H
+#define SURICATA_DETECT_BYTETEST_H

 /** Bytetest Operators */
 #define DETECT_BYTETEST_OP_LT     1 /**< "less than" operator */
@@ -74,4 +74,4 @@ void DetectBytetestRegister (void);
 int DetectBytetestDoMatch(DetectEngineThreadCtx *, const Signature *, const SigMatchCtx *ctx,
        const uint8_t *, uint32_t, uint16_t, int32_t, int32_t, uint64_t);

-#endif /* __DETECT_BYTETEST_H__ */
+#endif /* SURICATA_DETECT_BYTETEST_H */
@@ -21,11 +21,10 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __DETECT_CLASSTYPE_H__
-#define __DETECT_CLASSTYPE_H__
+#ifndef SURICATA_DETECT_CLASSTYPE_H
+#define SURICATA_DETECT_CLASSTYPE_H

 /* prototypes */
 void DetectClasstypeRegister(void);

-#endif /* __DETECT_CLASSTYPE_H__ */
-
+#endif /* SURICATA_DETECT_CLASSTYPE_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DETECT_CONFIG_H__
-#define __DETECT_CONFIG_H__
+#ifndef SURICATA_DETECT_CONFIG_H
+#define SURICATA_DETECT_CONFIG_H

 #include "util-config.h"

@@ -35,4 +35,4 @@ typedef struct DetectConfigData_ {
 /* prototypes */
 void DetectConfigRegister (void);

-#endif /* __DETECT_CONFIG_H__ */
+#endif /* SURICATA_DETECT_CONFIG_H */
@@ -21,8 +21,8 @@
 * \author Victor Julien <[email protected]>
 */

-#ifndef __DETECT_CONTENT_H__
-#define __DETECT_CONTENT_H__
+#ifndef SURICATA_DETECT_CONTENT_H
+#define SURICATA_DETECT_CONTENT_H

 /* Flags affecting this content */

@@ -134,4 +134,4 @@ void SigParseRequiredContentSize(
        const Signature *s, const int max, const SigMatch *sm, int *len, int *offset);
 int DetectContentConvertToNocase(DetectEngineCtx *de_ctx, DetectContentData *cd);

-#endif /* __DETECT_CONTENT_H__ */
+#endif /* SURICATA_DETECT_CONTENT_H */
@@ -21,10 +21,9 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __DETECT_CSUM_H__
-#define __DETECT_CSUM_H__
+#ifndef SURICATA_DETECT_CSUM_H
+#define SURICATA_DETECT_CSUM_H

 void DetectCsumRegister(void);

-#endif /* __DETECT_CSUM_H__ */
-
+#endif /* SURICATA_DETECT_CSUM_H */
@@ -21,8 +21,8 @@
 *  \author Victor Julien <[email protected]>
 */

-#ifndef __DETECT_DATAREP_H__
-#define __DETECT_DATAREP_H__
+#ifndef SURICATA_DETECT_DATAREP_H
+#define SURICATA_DETECT_DATAREP_H

 #include "datasets.h"
 #include "datasets-reputation.h"
@@ -47,4 +47,4 @@ int DetectDatarepBufferMatch(DetectEngineThreadCtx *det_ctx,
 /* prototypes */
 void DetectDatarepRegister (void);

-#endif /* __DETECT_DATAREP_H__ */
+#endif /* SURICATA_DETECT_DATAREP_H */
@@ -21,8 +21,8 @@
 *  \author Victor Julien <[email protected]>
 */

-#ifndef __DETECT_DATASET_H__
-#define __DETECT_DATASET_H__
+#ifndef SURICATA_DETECT_DATASET_H
+#define SURICATA_DETECT_DATASET_H

 #include "datasets.h"

@@ -43,4 +43,4 @@ int DetectDatasetBufferMatch(DetectEngineThreadCtx *det_ctx,
 /* prototypes */
 void DetectDatasetRegister (void);

-#endif /* __DETECT_DATASET_H__ */
+#endif /* SURICATA_DETECT_DATASET_H */
@@ -15,10 +15,9 @@
 * 02110-1301, USA.
 */

-#ifndef __DETECT_DCE_IFACE_H__
-#define __DETECT_DCE_IFACE_H__
-
+#ifndef SURICATA_DETECT_DCE_IFACE_H
+#define SURICATA_DETECT_DCE_IFACE_H

 void DetectDceIfaceRegister(void);

-#endif /* __DETECT_DCE_IFACE_H__ */
+#endif /* SURICATA_DETECT_DCE_IFACE_H */
@@ -21,10 +21,9 @@
 * \author Anoop Saldanha <[email protected]>
 */

-#ifndef __DETECT_DCE_OPNUM_H__
-#define __DETECT_DCE_OPNUM_H__
-
+#ifndef SURICATA_DETECT_DCE_OPNUM_H
+#define SURICATA_DETECT_DCE_OPNUM_H

 void DetectDceOpnumRegister(void);

-#endif /* __DETECT_DCE_OPNUM_H__ */
+#endif /* SURICATA_DETECT_DCE_OPNUM_H */
--- a/Show More
+++ b/Show More