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.

src/action-globals.h

@@ -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 */

src/alert-debuglog.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 */

src/alert-fastlog.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 */

src/alert-syslog.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 */

src/app-layer-detect-proto.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 */

src/app-layer-dnp3-objects.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 */

src/app-layer-dnp3.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 */

src/app-layer-enip-common.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 */

src/app-layer-enip.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 */

src/app-layer-events.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 */

src/app-layer-expectation.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 */

src/app-layer-frames.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"
 

src/app-layer-ftp.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 */

src/app-layer-htp-body.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 */

src/app-layer-htp-file.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 */

src/app-layer-htp-libhtp.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 */

src/app-layer-htp-range.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 */

src/app-layer-htp-xff.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 */

src/app-layer-htp.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 */
 
 /**
  * @}

src/app-layer-http2.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 */

src/app-layer-ike.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 */

src/app-layer-krb5.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 */

src/app-layer-modbus.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 */

src/app-layer-nfs-tcp.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 */

src/app-layer-nfs-udp.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 */