]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
src: make include guards more library friendly 10610/head
authorJason Ish <jason.ish@oisf.net>
Sat, 9 Mar 2024 18:12:43 +0000 (12:12 -0600)
committerVictor Julien <victor@inliniac.net>
Sun, 10 Mar 2024 06:59:54 +0000 (07:59 +0100)
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.

579 files changed:
src/action-globals.h
src/alert-debuglog.h
src/alert-fastlog.h
src/alert-syslog.h
src/app-layer-detect-proto.h
src/app-layer-dnp3-objects.h
src/app-layer-dnp3.h
src/app-layer-enip-common.h
src/app-layer-enip.h
src/app-layer-events.h
src/app-layer-expectation.h
src/app-layer-frames.h
src/app-layer-ftp.h
src/app-layer-htp-body.h
src/app-layer-htp-file.h
src/app-layer-htp-libhtp.h
src/app-layer-htp-range.h
src/app-layer-htp-xff.h
src/app-layer-htp.h
src/app-layer-http2.h
src/app-layer-ike.h
src/app-layer-krb5.h
src/app-layer-modbus.h
src/app-layer-nfs-tcp.h
src/app-layer-nfs-udp.h
src/app-layer-ntp.h
src/app-layer-parser.h
src/app-layer-protos.h
src/app-layer-quic.h
src/app-layer-rdp.h
src/app-layer-register.h
src/app-layer-rfb.h
src/app-layer-sip.h
src/app-layer-smb.h
src/app-layer-smtp.h
src/app-layer-snmp.h
src/app-layer-ssh.h
src/app-layer-ssl.h
src/app-layer-tftp.h
src/app-layer.h
src/conf-yaml-loader.h
src/conf.h
src/counters.h
src/datasets-ipv4.h
src/datasets-ipv6.h
src/datasets-md5.h
src/datasets-reputation.h
src/datasets-sha256.h
src/datasets-string.h
src/datasets.h
src/decode-chdlc.h
src/decode-erspan.h
src/decode-esp.h
src/decode-ethernet.h
src/decode-events.h
src/decode-geneve.h
src/decode-gre.h
src/decode-icmpv4.h
src/decode-icmpv6.h
src/decode-ipv4.h
src/decode-ipv6.h
src/decode-mpls.h
src/decode-nsh.h
src/decode-ppp.h
src/decode-pppoe.h
src/decode-raw.h
src/decode-sctp.h
src/decode-sll.h
src/decode-tcp.h
src/decode-template.h
src/decode-teredo.h
src/decode-udp.h
src/decode-vlan.h
src/decode-vntag.h
src/decode-vxlan.h
src/decode.h
src/defrag-hash.h
src/defrag-queue.h
src/defrag-timeout.h
src/defrag.h
src/detect-app-layer-event.h
src/detect-app-layer-protocol.h
src/detect-asn1.h
src/detect-base64-data.h
src/detect-base64-decode.h
src/detect-bsize.h
src/detect-bypass.h
src/detect-byte-extract.h
src/detect-byte.h
src/detect-bytejump.h
src/detect-bytemath.h
src/detect-bytetest.h
src/detect-classtype.h
src/detect-config.h
src/detect-content.h
src/detect-csum.h
src/detect-datarep.h
src/detect-dataset.h
src/detect-dce-iface.h
src/detect-dce-opnum.h
src/detect-dce-stub-data.h
src/detect-depth.h
src/detect-detection-filter.h
src/detect-dhcp-leasetime.h
src/detect-dhcp-rebinding-time.h
src/detect-dhcp-renewal-time.h
src/detect-distance.h
src/detect-dnp3.h
src/detect-dns-answer-name.h
src/detect-dns-opcode.h
src/detect-dns-query-name.h
src/detect-dns-query.h
src/detect-dns-rcode.h
src/detect-dns-rrtype.h
src/detect-dsize.h
src/detect-engine-address-ipv4.h
src/detect-engine-address-ipv6.h
src/detect-engine-address.h
src/detect-engine-alert.h
src/detect-engine-analyzer.h
src/detect-engine-build.h
src/detect-engine-content-inspection.h
src/detect-engine-dcepayload.h
src/detect-engine-enip.h
src/detect-engine-event.h
src/detect-engine-file.h
src/detect-engine-iponly.h
src/detect-engine-loader.h
src/detect-engine-mpm.h
src/detect-engine-payload.h
src/detect-engine-port.h
src/detect-engine-prefilter-common.h
src/detect-engine-prefilter.h
src/detect-engine-proto.h
src/detect-engine-register.h
src/detect-engine-siggroup.h
src/detect-engine-sigorder.h
src/detect-engine-state.h
src/detect-engine-tag.h
src/detect-engine-threshold.h
src/detect-engine-uint.h
src/detect-engine.h
src/detect-fast-pattern.h
src/detect-file-data.h
src/detect-file-hash-common.h
src/detect-filemagic.h
src/detect-filemd5.h
src/detect-filename.h
src/detect-filesha1.h
src/detect-filesha256.h
src/detect-filesize.h
src/detect-filestore.h
src/detect-flow-age.h
src/detect-flow-pkts.h
src/detect-flow.h
src/detect-flowbits.h
src/detect-flowint.h
src/detect-flowvar.h
src/detect-fragbits.h
src/detect-fragoffset.h
src/detect-frame.h
src/detect-ftpbounce.h
src/detect-ftpdata.h
src/detect-geoip.h
src/detect-gid.h
src/detect-hostbits.h
src/detect-http-accept-enc.h
src/detect-http-accept-lang.h
src/detect-http-accept.h
src/detect-http-client-body.h
src/detect-http-connection.h
src/detect-http-content-len.h
src/detect-http-content-type.h
src/detect-http-header-common.h
src/detect-http-header-names.h
src/detect-http-header.h
src/detect-http-headers.h
src/detect-http-host.h
src/detect-http-location.h
src/detect-http-method.h
src/detect-http-protocol.h
src/detect-http-raw-header.h
src/detect-http-referer.h
src/detect-http-request-line.h
src/detect-http-response-line.h
src/detect-http-server-body.h
src/detect-http-server.h
src/detect-http-start.h
src/detect-http-ua.h
src/detect-icmp-id.h
src/detect-icmp-seq.h
src/detect-icode.h
src/detect-id.h
src/detect-ike-chosen-sa.h
src/detect-ike-exch-type.h
src/detect-ike-key-exchange-payload-length.h
src/detect-ike-key-exchange-payload.h
src/detect-ike-nonce-payload-length.h
src/detect-ike-nonce-payload.h
src/detect-ike-spi.h
src/detect-ike-vendor.h
src/detect-ipaddr.h
src/detect-ipopts.h
src/detect-ipproto.h
src/detect-iprep.h
src/detect-isdataat.h
src/detect-itype.h
src/detect-krb5-cname.h
src/detect-krb5-errcode.h
src/detect-krb5-msgtype.h
src/detect-krb5-sname.h
src/detect-krb5-ticket-encryption.h
src/detect-l3proto.h
src/detect-lua-extensions.h
src/detect-lua.h
src/detect-mark.h
src/detect-metadata.h
src/detect-modbus.h
src/detect-mqtt-connack-sessionpresent.h
src/detect-mqtt-connect-clientid.h
src/detect-mqtt-connect-flags.h
src/detect-mqtt-connect-password.h
src/detect-mqtt-connect-protocol-string.h
src/detect-mqtt-connect-username.h
src/detect-mqtt-connect-willmessage.h
src/detect-mqtt-connect-willtopic.h
src/detect-mqtt-flags.h
src/detect-mqtt-protocol-version.h
src/detect-mqtt-publish-message.h
src/detect-mqtt-publish-topic.h
src/detect-mqtt-qos.h
src/detect-mqtt-reason-code.h
src/detect-mqtt-subscribe-topic.h
src/detect-mqtt-type.h
src/detect-mqtt-unsubscribe-topic.h
src/detect-msg.h
src/detect-nfs-procedure.h
src/detect-nfs-version.h
src/detect-noalert.h
src/detect-nocase.h
src/detect-offset.h
src/detect-parse.h
src/detect-pcre.h
src/detect-pkt-data.h
src/detect-pktvar.h
src/detect-prefilter.h
src/detect-priority.h
src/detect-quic-cyu-hash.h
src/detect-quic-cyu-string.h
src/detect-quic-sni.h
src/detect-quic-ua.h
src/detect-quic-version.h
src/detect-rawbytes.h
src/detect-reference.h
src/detect-replace.h
src/detect-requires.h
src/detect-rev.h
src/detect-rfb-name.h
src/detect-rfb-secresult.h
src/detect-rfb-sectype.h
src/detect-rpc.h
src/detect-sameip.h
src/detect-sid.h
src/detect-sip-method.h
src/detect-sip-protocol.h
src/detect-sip-request-line.h
src/detect-sip-response-line.h
src/detect-sip-stat-code.h
src/detect-sip-stat-msg.h
src/detect-sip-uri.h
src/detect-smb-ntlmssp.h
src/detect-smb-share.h
src/detect-smb-version.h
src/detect-snmp-community.h
src/detect-snmp-pdu_type.h
src/detect-snmp-usm.h
src/detect-snmp-version.h
src/detect-ssh-hassh-server-string.h
src/detect-ssh-hassh-server.h
src/detect-ssh-hassh-string.h
src/detect-ssh-hassh.h
src/detect-ssh-proto-version.h
src/detect-ssh-proto.h
src/detect-ssh-software-version.h
src/detect-ssh-software.h
src/detect-tag.h
src/detect-target.h
src/detect-tcp-ack.h
src/detect-tcp-flags.h
src/detect-tcp-seq.h
src/detect-tcp-window.h
src/detect-template-rust-buffer.h
src/detect-template.h
src/detect-threshold.h
src/detect-tls-cert-fingerprint.h
src/detect-tls-cert-issuer.h
src/detect-tls-cert-serial.h
src/detect-tls-cert-subject.h
src/detect-tls-cert-validity.h
src/detect-tls-certs.h
src/detect-tls-ja3-hash.h
src/detect-tls-ja3-string.h
src/detect-tls-ja3s-hash.h
src/detect-tls-ja3s-string.h
src/detect-tls-random.h
src/detect-tls-sni.h
src/detect-tls-version.h
src/detect-tls.h
src/detect-tos.h
src/detect-transform-casechange.h
src/detect-transform-compress-whitespace.h
src/detect-transform-dotprefix.h
src/detect-transform-header-lowercase.h
src/detect-transform-md5.h
src/detect-transform-pcrexform.h
src/detect-transform-sha1.h
src/detect-transform-sha256.h
src/detect-transform-strip-pseudo-headers.h
src/detect-transform-strip-whitespace.h
src/detect-transform-urldecode.h
src/detect-transform-xor.h
src/detect-uricontent.h
src/detect-within.h
src/detect-xbits.h
src/detect.h
src/device-storage.h
src/feature.h
src/flow-bit.h
src/flow-bypass.h
src/flow-hash.h
src/flow-manager.h
src/flow-private.h
src/flow-queue.h
src/flow-spare-pool.h
src/flow-storage.h
src/flow-timeout.h
src/flow-util.h
src/flow-var.h
src/flow-worker.h
src/flow.h
src/host-bit.h
src/host-queue.h
src/host-storage.h
src/host-timeout.h
src/host.h
src/ippair-bit.h
src/ippair-queue.h
src/ippair-storage.h
src/ippair-timeout.h
src/ippair.h
src/log-cf-common.h
src/log-httplog.h
src/log-pcap.h
src/log-stats.h
src/log-tcp-data.h
src/log-tlslog.h
src/log-tlsstore.h
src/output-eve-stream.h
src/output-eve-syslog.h
src/output-file.h
src/output-filedata.h
src/output-filestore.h
src/output-flow.h
src/output-json-alert.h
src/output-json-anomaly.h
src/output-json-bittorrent-dht.h
src/output-json-dcerpc.h
src/output-json-dhcp.h
src/output-json-dnp3-objects.h
src/output-json-dnp3.h
src/output-json-dns.h
src/output-json-drop.h
src/output-json-email-common.h
src/output-json-file.h
src/output-json-flow.h
src/output-json-frame.h
src/output-json-ftp.h
src/output-json-http.h
src/output-json-http2.h
src/output-json-ike.h
src/output-json-krb5.h
src/output-json-metadata.h
src/output-json-modbus.h
src/output-json-mqtt.h
src/output-json-netflow.h
src/output-json-nfs.h
src/output-json-pgsql.h
src/output-json-quic.h
src/output-json-rdp.h
src/output-json-rfb.h
src/output-json-sip.h
src/output-json-smb.h
src/output-json-smtp.h
src/output-json-snmp.h
src/output-json-ssh.h
src/output-json-stats.h
src/output-json-template.h
src/output-json-tftp.h
src/output-json-tls.h
src/output-json.h
src/output-lua.h
src/output-packet.h
src/output-stats.h
src/output-streaming.h
src/output-tx.h
src/output.h
src/packet-queue.h
src/packet.h
src/pkt-var.h
src/reputation.h
src/respond-reject-libnet11.h
src/respond-reject.h
src/runmode-af-packet.h
src/runmode-af-xdp.h
src/runmode-dpdk.h
src/runmode-erf-dag.h
src/runmode-erf-file.h
src/runmode-ipfw.h
src/runmode-napatech.h
src/runmode-netmap.h
src/runmode-nflog.h
src/runmode-nfq.h
src/runmode-pcap-file.h
src/runmode-pcap.h
src/runmode-pfring.h
src/runmode-unittests.h
src/runmode-unix-socket.h
src/runmode-windivert.h
src/runmodes.h
src/rust-context.h
src/rust.h
src/source-af-packet.h
src/source-af-xdp.h
src/source-dpdk.h
src/source-erf-dag.h
src/source-erf-file.h
src/source-ipfw.h
src/source-napatech.h
src/source-netmap.h
src/source-nflog.h
src/source-nfq-prototypes.h
src/source-nfq.h
src/source-pcap-file-directory-helper.h
src/source-pcap-file-helper.h
src/source-pcap-file.h
src/source-pcap.h
src/source-pfring.h
src/source-windivert-prototypes.h
src/source-windivert.h
src/stream-tcp-cache.h
src/stream-tcp-inline.h
src/stream-tcp-list.h
src/stream-tcp-private.h
src/stream-tcp-reassemble.h
src/stream-tcp-sack.h
src/stream-tcp-util.h
src/stream-tcp.h
src/stream.h
src/suricata-common.h
src/suricata-plugin.h
src/suricata.h
src/threads-debug.h
src/threads-profile.h
src/threads.h
src/threadvars.h
src/tm-modules.h
src/tm-queuehandlers.h
src/tm-queues.h
src/tm-threads-common.h
src/tm-threads.h
src/tmqh-flow.h
src/tmqh-packetpool.h
src/tmqh-simple.h
src/util-action.h
src/util-affinity.h
src/util-atomic.h
src/util-base64.h
src/util-bloomfilter-counting.h
src/util-bloomfilter.h
src/util-bpf.h
src/util-buffer.h
src/util-byte.h
src/util-checksum.h
src/util-cidr.h
src/util-classification-config.h
src/util-clock.h
src/util-conf.h
src/util-config.h
src/util-coredump-config.h
src/util-cpu.h
src/util-daemon.h
src/util-datalink.h
src/util-debug-filters.h
src/util-debug.h
src/util-device.h
src/util-ebpf.h
src/util-enum.h
src/util-error.h
src/util-exception-policy.h
src/util-file-decompression.h
src/util-file-swf-decompression.h
src/util-file.h
src/util-fmemopen.h
src/util-hash-lookup3.h
src/util-hash-string.h
src/util-hash.h
src/util-hashlist.h
src/util-host-info.h
src/util-host-os-info.h
src/util-hyperscan.h
src/util-ip.h
src/util-ja3.h
src/util-landlock.h
src/util-log-redis.h
src/util-logopenfile.h
src/util-lua-common.h
src/util-lua-dnp3-objects.h
src/util-lua-dnp3.h
src/util-lua-dns.h
src/util-lua-hassh.h
src/util-lua-http.h
src/util-lua-ja3.h
src/util-lua-smtp.h
src/util-lua-ssh.h
src/util-lua-tls.h
src/util-lua.h
src/util-luajit.h
src/util-macset.h
src/util-magic.h
src/util-mem.h
src/util-memcmp.h
src/util-memcpy.h
src/util-memrchr.h
src/util-misc.h
src/util-mpm-ac-ks.h
src/util-mpm-ac.h
src/util-mpm-hs.h
src/util-mpm.h
src/util-napatech.h
src/util-optimize.h
src/util-pages.h
src/util-path.h
src/util-pidfile.h
src/util-plugin.h
src/util-pool-thread.h
src/util-pool.h
src/util-port-interval-tree.h
src/util-prefilter.h
src/util-print.h
src/util-profiling-locks.h
src/util-profiling.h
src/util-proto-name.h
src/util-radix-tree.h
src/util-random.h
src/util-reference-config.h
src/util-rohash.h
src/util-rule-vars.h
src/util-runmodes.h
src/util-running-modes.h
src/util-signal.h
src/util-spm-bm.h
src/util-spm-bs.h
src/util-spm-bs2bm.h
src/util-spm-hs.h
src/util-spm.h
src/util-storage.h
src/util-streaming-buffer.h
src/util-thash.h
src/util-threshold-config.h
src/util-time.h
src/util-unittest-helper.h
src/util-unittest.h
src/util-validate.h
src/util-var-name.h
src/util-var.h
src/win32-misc.h
src/win32-service.h
src/win32-syscall.h
src/win32-syslog.h

index b63086f668d31cd03170a918313a7650ef58abde..edf3d9fc2ff1c626e202b69eb3fa8bdd05bb03af 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index f7c411c3ab3eeb888294b15070afcfad3c50c69a..b2cd0118bfccb3db24edf9d9b06f780923aea3c7 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index cdac2a49d404b33e73a50262b5bea9e8d92a55eb..acae1919728bfc6155372eefa099b027a9b55069 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 0655a3ae47cbc6c22034d946e79796f83a120a85..3557827039f34e6184eb62d05f369216126d6571 100644 (file)
  *
  */
 
-#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 */
index 4ee4bac10ad840e704291880f20cb7984edee792..158ad234dd4955452ab0f9794b17009116b476d5 100644 (file)
@@ -22,8 +22,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index e292f012758be02a1c11926b45c351b29b3354b1..adb4ca6a51447b52b2f4079a3af634a34852bd65 100644 (file)
@@ -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 */
index aae07f9c8095118c9d6f924800ca9bb5d582b053..fb142305ef2ab0803ae66bb86da224585f36ba5e 100644 (file)
@@ -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 */
index 1578343a69eb90d8e9a24344cb29d7f166a64139..936bf082243d1903d7d813be553be1b4d05e0c03 100644 (file)
@@ -21,8 +21,8 @@
  * \author Kevin Wong <kwong@solananetworks.com>
  */
 
-#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 */
index 25cb1d5745dab62975650439e426a30fcd64cb81..8736c02a8a6f4b4e4ab30e34e41240aa75e6f614 100644 (file)
  * \author Kevin Wong <kwong@solananetworks.com>
  */
 
-#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 */
index 8b0dc8276d61642c499f9860059299e61e6db42c..40bda72abf4d769526554e5a82ce211ab33e0b09 100644 (file)
@@ -22,8 +22,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index 0219e33bcf243cff598306ad8abe2d98f1379e16..2d8b4af9164cb2569c4a8e4c96b80132d50cb1ee 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#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 */
index 65ba5b6a691957e7a4c03a2a968a2fc744221d3a..1904917b42c248ab996c69bbdfc27301ce146c56 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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"
 
index fb71d6b52de7bcdbc29aa681f22854781b55df52..353feb3582e2d56eab942512a9ef3c7fa7d27818 100644 (file)
@@ -22,8 +22,8 @@
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#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 */
index fe59ac6210ea770d6658ae9a9fbff4f74231935b..bcb58938f3daf40277ca9858c04ee6e14ac36998 100644 (file)
  * 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 */
index b0436df22f549b9af271489b35ffe8785032f079..5e05bcb28b17bcc6a333f2a12600f3c461bc02c9 100644 (file)
@@ -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 */
index b08cda508ece1450b433f8782a3c43525b576902..fa9a9ecc3b2547b66a94b5d572788c6a9e3cbadd 100644 (file)
  * 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 */
index 8a668aee6d2c54ee2c34ac31abef6ddb0da08723..9ca28905501f73f5583a1a3963e2241ec296721f 100644 (file)
@@ -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 */
index 03671d3fbb7121c1ad8f4e0f82000ef698dd1178..2d14f3f55bf5f50e57c92fdcb835ab03a11b1e94 100644 (file)
@@ -22,8 +22,8 @@
  * \author Duarte Silva <duarte.silva@serializing.me>
  */
 
-#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 */
index 5972bdaf50015f08152f18eaa7ebcc2b627f8d9c..a61121db595cd8300acfcc0b6ec1ec3f7e45121a 100644 (file)
@@ -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 */
 
 /**
  * @}
index b3c52c1d70dcd3fa57139cd29b184fefc870c71f..b2d4d0ef778f8020bb47588fe008258a44a559d2 100644 (file)
  * \author Philippe Antoine <p.antoine@catenacyber.fr>
  */
 
-#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 */
index c6270cccc5831a4762da69b33f506b8e1e66c57f..a4c97e9fa69cf6f0f2d38040e495c4c6edb26f2e 100644 (file)
@@ -22,8 +22,8 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#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 */
index 19968fc50bd1c74e9b43c83ef8ad216baa3dc8d1..ec8d5a54062d68e6adb67f2bdd7c4c364239c358 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#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 */
index 04a12bcee9ebf8cc2c851ccbc514315f7e9a7afe..8a399e12e09c2673ee723a9cadf9cad6b7d86cb7 100644 (file)
@@ -31,9 +31,9 @@
  * \author David DIALLO <diallo@et.esiea.fr>
  */
 
-#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 */
index d1c72d72ff6d3f84a076197c86bd04fbd8281dde..ea1b4fac22ffa17a88b88f0837b2f7ead31853f0 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 4cb11dd1260ce21f9c6feb214f94e3955c686674..f70873689a32a11261e1939fba9bcdec254030d5 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 21606395509c919489f1ef201134f98da811aaed..08797d413ae7df0b602fb415ba45ad5c7095461e 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#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 */
index e9f8cf55e925587aadbc9cf72e2a48cadb5af9fb..7fd034195a5aaebf12808cfef03e0c6761fd5c4e 100644 (file)
@@ -22,8 +22,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index e2efbec4d4b1791f078facd0fbd437418883cd5d..dc17ddca1ea38e417900c80dd9be6e26c162219b 100644 (file)
@@ -22,8 +22,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index d8a833d108c91e2fab89ee75f9077a6af70f99ff..79551ae6a98620ad9e9e4cd4897c0cbeb123ee22 100644 (file)
@@ -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 */
index 8ede7cfdbb1a22d71d3d3146fe45c4cc62d38460..4b804f7ee0b102e23936a96b9bdb8f9789873ee7 100644 (file)
@@ -21,9 +21,9 @@
  * \author Zach Kelly <zach.kelly@lmco.com>
  */
 
-#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 */
index 4fcbe6cf8b6cfbf4e615820b4dd5c70037c347f3..b3aa65ac38c418802e1736bfac77a7eec83a5983 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#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 */
index 79c2f49b81157b59a61eb5d60d733e3e35a4c270..0a19ad4199fe9f386f6689fc74bff30e61e1bac9 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha.steinbiss@dcso.de>
  */
 
-#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 */
index 19ee002236f6db9fee8e629e266d4af69408d8b8..af4f4e1f6c806d906b72217c473ea77dcec3ed86 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#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 */
index 39ae0411544036423ccefa3d1e30d96472372d28..f8b1d66b86e8b2bf318aa1d398c953727788a58a 100644 (file)
@@ -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 */
index 33b81d026a49af0f7eefd030331d33971517dfda..37369af034f3cd61cebadcce609463823ad122f7 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index 7c2d09680c7e137e5683c92eb101fd367ef469b8..637e94f370ecde496eccf75e12e9a3d9e2003d1f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#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 */
index 996cc260c7356c8ba5b7d374892238381880cc8c..e356c7ef9e022b1298a64004feed42c543b0d5bd 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index f2e42622308e1bff40214f3d124b929b27774e9e..82e33f5411920479e5c8ff4d6b67e36c8b1bb8d0 100644 (file)
@@ -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 */
index 65dd8f4c9bbd123884acb96626b96d08d8bcb11d..b45e6d92197f5ea18d794c740faf1e5b1e7e1064 100644 (file)
@@ -21,8 +21,8 @@
  * \author Clément Galland <clement.galland@epita.fr>
  */
 
-#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 */
index cbe2fbc9af84ba0495d4a42f0d78abfa48ba0487..2a6b4df1462afceb1f2660ed70c67c74ac9a09fe 100644 (file)
@@ -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"
index fcf73aaa8d6b98ca9ebe277e034d9e9366843742..0355ebc5c9989704f5d66b3628fb16ba369c2f0d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Endace Technology Limited - Jason Ish <jason.ish@endace.com>
  */
 
-#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 */
index 0b278a0f608e5ff18d767d020598860b6243f7aa..c1dbd5318a229df5218cabffcb1a07dc57e1a4d8 100644 (file)
@@ -21,8 +21,8 @@
  * \author Endace Technology Limited - Jason Ish <jason.ish@endace.com>
  */
 
-#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 */
index b3ffddbd569f415d458b13834ed20ae044b71093..e16186daa40153c3a4ecf9705f04d6b3bc1ea21c 100644 (file)
@@ -22,8 +22,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 277acc6b88e6824b099c4d85eda82c2d118a6c73..db7abd685140a0b7c06c378bf7d767356125c4ff 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <el@stamus-networks.com>
  */
 
-#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 */
index a4cabcaf78fe3f16d383954401f5d47a680cd517..f3f59a0a9676a2a8aa388778446a9ef9b67b6659 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <el@stamus-networks.com>
  */
 
-#ifndef __DATASETS_IPV6_H__
-#define __DATASETS_IPV6_H__
+#ifndef SURICATA_DATASETS_IPV6_H
+#define SURICATA_DATASETS_IPV6_H
 
 #include "datasets-reputation.h"
 
index ad4d0e28a3896064e24fc4a9ef35b38869ea44d0..e6030540df35be9c45044c97d72f701312c38039 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 48c8820b904de0536a01a10963d32d35b0252227..3483d823cd6e0e7ba190042a3fafd3ba8b88fb9e 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 8793cc17a56ea3a510bda599adb01d1fa38f67d1..716fa93dcf223930430fda44ad80a427947d82be 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index b1513e358459a57aa615c96afb2e68aa8a6ce67e..b9c3c3002454e7187304faea59aaf18c40beb387 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index af4fc173f1946bab592f2647ebe1b1444db03a78..78602548ca7e8848039cae25f43ad6139e3f6a96 100644 (file)
@@ -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 */
index 47e0d7c1a3ef96eec700e50be70dbbae3f81af8d..6ec32814ea7756bdda5139fcaa9cf0caf4fbe0f7 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index d92965db027fce812c46d6d22ea288d275a95999..350eb5ef302539f3c1235e39acb1154611ebe7c1 100644 (file)
@@ -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 */
index 432de276d7388099fd66de5906f404694e883df9..2ac1ab0645e16834d307d23c27dfcebf0aa12663 100644 (file)
@@ -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 */
index aa077056d67260beabb603dd58d5372c5e0632d8..05e6425eef5984f93455ed5cf5a2b7ee28f855cc 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 5547866fa59bef5c6442df62da2e1f830d83485c..27a2299cd679fdff36776b52084a3cb76eb40fab 100644 (file)
@@ -22,8 +22,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index 3c1cb23d595d14c02b77d56df3546c2fda39c80e..9ca487cd7b19e4eea3099aab921ea421888d5b3b 100644 (file)
  * 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 */
index adf576fbd980d0aeb807cc239f82802c96f9ae9e..2e05ae4e465328e8fa7fe50e727c822399c2fddf 100644 (file)
@@ -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 */
index f3a94ad2e5942ee15a0ab6c0dc278e6e91ae3d1f..87bcd9bd75c5d96907ab1fd35b473137b663fdf2 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index aa66c1f64a3efe29ba54104500871f5f1f663768..412d9c5fa3b8b386d7e1eb6bb8b76036a6462a44 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index d247fa9f00330c9f78781b3b5a6d6028fba68bf5..de32ed8277d8c11ec9b7621f20a739282cdcc85b 100644 (file)
@@ -22,8 +22,8 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#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 */
index 651939ae567f5c913c426cc61f43f70a4ccf1795..a2b833c4ccb3a2dfe535600af446a3c9693a8636 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index c701d3df210236b8478dda616ed74d752eeb51cb..578b4ac53f1fac7443ef703263613bcfe4ad2d4e 100644 (file)
  * 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 */
index a45cce3029e0db84e35907382af580d6c2b9c5b6..54ab257ad3d07ded675fab862f8cdf6c3aafe96a 100644 (file)
@@ -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 */
index f8914cf2e77dd9d6f11857e7d329bd1c0c11ec45..ee5258c694861611e7d62cc07bb713f33113c9ec 100644 (file)
@@ -21,8 +21,8 @@
  * \author Breno Silva Pinto <breno.silva@gmail.com>
  */
 
-#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 */
index 836d4a30c35016982805dfa3dbd5fc9570366db5..6a0a7704320bea53a6e84eab8086984a75a40b86 100644 (file)
@@ -21,9 +21,8 @@
  * \author James Riden <jamesr@europe.com>
  */
 
-#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 */
index ff637870ad141a46d403d38a255dd1c0121832ca..1f86cfc62b1db915eba609625b7ac8c46f730a3c 100644 (file)
@@ -21,8 +21,7 @@
  * \author William Metcalf <william.metcalf@gmail.com>
  */
 
-#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 */
index 53aa007dbbc0adc26caeb9976ab5c4379acca1fe..6ec20cca331f45b0e7bfdaa005d002ef37057bc3 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#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 */
index babdd7ac21091cd7090117875d87fb88fe9b0856..cbc41f9dd1bdb29f0f1ab15f2012274473732f39 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 4b26df5c26f4db27b38aa54a32e5713f79f0c181..8c3e337a7e7b4a85eb2d2518d98ba57c3bf40e15 100644 (file)
@@ -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 */
index f02187faf1e01660abbf50666279cb3baab4932b..b0a7823c5db475920db284420f7c4a1393a4e76b 100644 (file)
@@ -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 */
index bbd9dc816383c47ab7bcf6311f310b3c6c3f8982..eb97c265f560c58ad52def511542758701a9d6a4 100644 (file)
@@ -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);
index 6f695bd1779ea906af4e6f03d715fc77bb08913c..c34812de7a07c7bc93503ce7c6cc04ad81e9b649 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 809038dbe6fcf5389cdedc4db377b18b8bdadddc..586e210ae9064a75bf2fd98034dd017d8a572a6f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#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 */
index 02392589b1a0b302e13a2e8345cdf312b1ef893d..77a628090f457da6dd00f4e93342aef53115006a 100644 (file)
@@ -21,8 +21,8 @@
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#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 */
index 988b35125a46a66fcb7cbef2c384c66c8f2dd790..f80ebd001a7c0974260872ecf949cbbe5b62a0bd 100644 (file)
  * 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 */
index 6392f3361e58565fb90e33f169ec9e9645336c45..22a512b93573c73525c78a9fa4b85a9fad55f230 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index b115b13a91d71c9ec191c3619c0ac9f6814226e2..0cbbef184066be322f25b8738e5117c620baf7a2 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 63a58d0786450175aad8b103636d9234cb2978f5..21480635660e324f1b3d0d19a0ff1eadf0cda12f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index baece4516e87826062484b88354b8e712497e76d..6a24fc0f42a5aef5870e05f796d2e217ea78fa5f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DEFRAG_TIMEOUT_H__
-#define __DEFRAG_TIMEOUT_H__
+#ifndef SURICATA_DEFRAG_TIMEOUT_H
+#define SURICATA_DEFRAG_TIMEOUT_H
 
 uint32_t DefragTimeoutHash(SCTime_t ts);
 
index 11e6a619b2f1fadbff068b775f0e8405f9bd0a04..e9a15923aeb534fabeb9e8179ed5ea2c5b8c4a8a 100644 (file)
@@ -21,8 +21,8 @@
  * \author Endace Technology Limited, Jason Ish <jason.ish@endace.com>
  */
 
-#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 */
index 4400545aa0905b5247c3466bd751bbd715d08926..8b5a16e6daef1d4d9b5c9549bd51f549a9448b86 100644 (file)
@@ -21,9 +21,9 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index 864bd671b266f9e8da3c89bb188b65d3ea40dda0..02f13968a0e86a7023d8a31c7e30c1379f6a13d1 100644 (file)
@@ -21,9 +21,9 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index 8c81ddcb305b95d0f3d86a8a52d8dbb7a8ea8e4d..7c4812c98b9b8428ae441b848e84fde2c37c33f9 100644 (file)
@@ -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 */
index 4b7d54d04ebeb703bc2e530c3de9d1ba843e2ef3..b1987fae7c916bb831399cfce888b165551b9712 100644 (file)
@@ -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 */
index 58f4e526884c7f4cb4d85c1b8aee10532aa02f45..04543da41c585dd092da0d34a1ea827d42537e40 100644 (file)
  * 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 */
index ac0b72e5893d13a0217044f87de71cc4f4b4be1d..9231102d41db84493a7e6de14b2b3f89c35f4d49 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 7afc4c9a323de69de9d63f219d401cbae69bc1af..6a4371f28c248595a1050dacc9f45ed560f08957 100644 (file)
@@ -21,9 +21,9 @@
  *  \author Giuseppe Longo <glongo@stamus-networks.com>
  */
 
-#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 */
index 71b433d3405f9be46de8714f631cc956fd00388a..fc04131d635453f5218e09eae9700f6ffdff03b2 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index 373a57d7e54e53a1dad94a781a3cf5350739c9af..b6b1de03a0f9c980652492246f8a5cdf47a1c4b0 100644 (file)
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#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 */
index 15f610344320b0c6bca3c7c1b2871d9973f920e3..85914c2a81cdf04568aa727bd14101b1a3b9886f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#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 */
index c18a3e82dcab4039f0ae7813ba2d35142ab68880..347c0e467288b9c0536b8a3193afd019fc01b333 100644 (file)
@@ -21,8 +21,8 @@
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#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 */
index 4b4684972b91b277de2b7c5c13531cba043cf334..320a621a3e49c35b904e8236ca2a1be1ee2f8f55 100644 (file)
@@ -21,8 +21,8 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#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 */
index 6e0dd509cf48da359966574845e615d0c9d4094b..383512c8b3045ccf2c8254ecc9d2073bdff09d14 100644 (file)
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index d6948a3f4e294903edc613282e15fefee08aa452..735d1e09a54363acad637f6717d96eb8cbe06ccd 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index bc47562a96f8a78b4de488f986ddc992a5452dd3..0968e4d6ea5cb2a3e1edb994353fe70aff09241b 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index 64914912fe8f22cf3fa438d27319eb5be535b17e..fd4d2859e59497eb06f59c7bb0fb8042fa1fdd96 100644 (file)
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index b6191588240c5dcd61acf0f8843d7d66eb2af29a..cb2248574f4cf3bf40934ef40d65785d1765a1db 100644 (file)
@@ -21,8 +21,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index ca83267d15929a7b6473c8eaf41291635086c880..4dae4a4a1715951f06298282c4479242bda15702 100644 (file)
@@ -21,8 +21,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#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 */
index edaded404442035a62f2166ec55a36d75afbc419..161988f929bef3977a8d890ab0a5cb268afbdc96 100644 (file)
  * 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 */
index 1072a60bba62fb4b059b8b51f27ec9973bd56ba8..6ce4e4b6dec64c95e55b0df92a2fa8e8d070a01a 100644 (file)
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#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 */
index 035fa258a558f492c1c3736bfac3ad8091504e4e..2668f699488b6be8d84d798ac3bbd2449ab259da 100644 (file)
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_DCE_STUB_DATA_H__
-#define __DETECT_DCE_STUB_DATA_H__
-
+#ifndef SURICATA_DETECT_DCE_STUB_DATA_H
+#define SURICATA_DETECT_DCE_STUB_DATA_H
 
 void DetectDceStubDataRegister(void);
 
-#endif /* __DETECT_DCE_STUB_DATA_H__ */
+#endif /* SURICATA_DETECT_DCE_STUB_DATA_H */
index b864f62175d8cac65ca79c4309eba59c3e15e067..cafde44cc0d8fdfa0e9b416ea750c2176ec53083 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_DEPTH_H__
-#define __DETECT_DEPTH_H__
+#ifndef SURICATA_DETECT_DEPTH_H
+#define SURICATA_DETECT_DEPTH_H
 
 /* prototypes */
 void DetectDepthRegister (void);
 
-#endif /* __DETECT_DEPTH_H__ */
-
+#endif /* SURICATA_DETECT_DEPTH_H */
index f136d3aca5f91dec2a4d94786f64b287f9d79610..27e6d777a38de9f5817c7a5fdc1d2b7d58f55965 100644 (file)
@@ -21,8 +21,8 @@
  * \author Gerardo Iglesias <iglesiasg@gmail.com>
  */
 
-#ifndef __DETECT_DETECTION_FILTER_H__
-#define __DETECT_DETECTION_FILTER_H__
+#ifndef SURICATA_DETECT_DETECTION_FILTER_H
+#define SURICATA_DETECT_DETECTION_FILTER_H
 
 /**
  * Registration function for detection_filter: keyword
@@ -30,5 +30,4 @@
 
 void DetectDetectionFilterRegister (void);
 
-#endif /*__DETECT_DETECTION_FILTER_H__ */
-
+#endif /*SURICATA_DETECT_DETECTION_FILTER_H */
index 6a9baeb5fa837ac60682e5a84f973eb71047f130..53b1f42ac73d75f5da0b0ec66db2442b3ecf1d01 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DHCP_LEASETIME_H__
-#define __DETECT_DHCP_LEASETIME_H__
+#ifndef SURICATA_DETECT_DHCP_LEASETIME_H
+#define SURICATA_DETECT_DHCP_LEASETIME_H
 
 void DetectDHCPLeaseTimeRegister(void);
 
-#endif /* __DETECT_DHCP_LEASETIME_H__ */
+#endif /* SURICATA_DETECT_DHCP_LEASETIME_H */
index 169efad70b48f850b6c0b2379986c147c91960b0..b14f0af6613990c999511820dd35a099961f0720 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DHCP_REBINDING_TIME_H__
-#define __DETECT_DHCP_REBINDING_TIME_H__
+#ifndef SURICATA_DETECT_DHCP_REBINDING_TIME_H
+#define SURICATA_DETECT_DHCP_REBINDING_TIME_H
 
 void DetectDHCPRebindingTimeRegister(void);
 
-#endif /* __DETECT_DHCP_REBINDING_TIME_H__ */
+#endif /* SURICATA_DETECT_DHCP_REBINDING_TIME_H */
index 55c27519f41c36117ff30c54d2b58a22564d5de9..06d64c5560b3b74f72a2ad1e601d9dff75745837 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DHCP_RENEWAL_TIME_H__
-#define __DETECT_DHCP_RENEWAL_TIME_H__
+#ifndef SURICATA_DETECT_DHCP_RENEWAL_TIME_H
+#define SURICATA_DETECT_DHCP_RENEWAL_TIME_H
 
 void DetectDHCPRenewalTimeRegister(void);
 
-#endif /* __DETECT_DHCP_RENEWAL_TIME_H__ */
+#endif /* SURICATA_DETECT_DHCP_RENEWAL_TIME_H */
index 80aebe4f71e2040ccc10adbfd7b659a7cfc3a21b..7becab8e38243ff70e17dd71293ed484e2af317d 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_DISTANCE_H__
-#define __DETECT_DISTANCE_H__
+#ifndef SURICATA_DETECT_DISTANCE_H
+#define SURICATA_DETECT_DISTANCE_H
 
 /* prototypes */
 void DetectDistanceRegister (void);
 
-#endif /* __DETECT_DISTANCE_H__ */
-
+#endif /* SURICATA_DETECT_DISTANCE_H */
index 7479d7841aa2f0e71919c072509f14e67e21cedf..050158c182ab3846629b3cff2048e932668cac0e 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DNP3_H__
-#define __DETECT_DNP3_H__
+#ifndef SURICATA_DETECT_DNP3_H
+#define SURICATA_DETECT_DNP3_H
 
 /**
  * Struct for mapping symbolic names to values.
@@ -31,4 +31,4 @@ extern DNP3Mapping DNP3IndicatorsMap[];
 
 void DetectDNP3Register(void);
 
-#endif /* __DETECT_DNP3_H__ */
+#endif /* SURICATA_DETECT_DNP3_H */
index 4f84b4894c1602e558d990305c57683be4111745..e259f1a577d4bfb03f81b0ce4b468adae0e7ac6c 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DNS_ANSWER_NAME_H__
-#define __DETECT_DNS_ANSWER_NAME_H__
+#ifndef SURICATA_DETECT_DNS_ANSWER_NAME_H
+#define SURICATA_DETECT_DNS_ANSWER_NAME_H
 
 void DetectDnsAnswerNameRegister(void);
 
-#endif /* __DETECT_DNS_ANSWER_NAME_H__ */
+#endif /* SURICATA_DETECT_DNS_ANSWER_NAME_H */
index 0518a58b49dc9b1b966f804573756eb4a6479d2a..a26a39e711077bb0ddbc73c003b55b3cc3c15b01 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DNS_OPCODE_H__
-#define __DETECT_DNS_OPCODE_H__
+#ifndef SURICATA_DETECT_DNS_OPCODE_H
+#define SURICATA_DETECT_DNS_OPCODE_H
 
 void DetectDnsOpcodeRegister(void);
 
-#endif /* __DETECT_DNS_OPCODE_H__ */
+#endif /* SURICATA_DETECT_DNS_OPCODE_H */
index b1d7db99e8c5781f6012fa757f0f7397ad630ad3..3f5bc03bf72ff743a2cf9715b780c16c08e72837 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DNS_QUERY_NAME_H__
-#define __DETECT_DNS_QUERY_NAME_H__
+#ifndef SURICATA_DETECT_DNS_QUERY_NAME_H
+#define SURICATA_DETECT_DNS_QUERY_NAME_H
 
 void DetectDnsQueryNameRegister(void);
 
-#endif /* __DETECT_DNS_QUERY_NAME_H__ */
+#endif /* SURICATA_DETECT_DNS_QUERY_NAME_H */
index c894b878dbfb2cddf9694f0a59bb7112731a25ad..33270432c2e2241316b7d551938b9fbb9d2e08a9 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_DNS_QUERY_H__
-#define __DETECT_DNS_QUERY_H__
+#ifndef SURICATA_DETECT_DNS_QUERY_H
+#define SURICATA_DETECT_DNS_QUERY_H
 
 void DetectDnsQueryRegister (void);
 
-#endif /* __DETECT_DNS_QUERY_H__ */
+#endif /* SURICATA_DETECT_DNS_QUERY_H */
index 9501ceb457a4de7ee4ff38ea1fb4a5a592715cc3..cd4188eb365ffb18628488b4871a151d5415cd75 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DNS_RCODE_H__
-#define __DETECT_DNS_RCODE_H__
+#ifndef SURICATA_DETECT_DNS_RCODE_H
+#define SURICATA_DETECT_DNS_RCODE_H
 
 void DetectDnsRcodeRegister(void);
 
-#endif /* __DETECT_DNS_RCODE_H__ */
\ No newline at end of file
+#endif /* SURICATA_DETECT_DNS_RCODE_H */
\ No newline at end of file
index 962364f7e27a12c278b42992fff030547d3321fb..e2913b4a1c35f14352a73c1f34c4f9686b40d0d1 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_DNS_RRTYPE_H__
-#define __DETECT_DNS_RRTYPE_H__
+#ifndef SURICATA_DETECT_DNS_RRTYPE_H
+#define SURICATA_DETECT_DNS_RRTYPE_H
 
 void DetectDnsRrtypeRegister(void);
 
-#endif /* __DETECT_DNS_RRTYPE_H__ */
+#endif /* SURICATA_DETECT_DNS_RRTYPE_H */
index c262a31186feea8f2806970e91d2a032bcbdc600..0d4b8beb3f4cbd5116ac49e33cf22715a6208acc 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_DSIZE_H__
-#define __DETECT_DSIZE_H__
+#ifndef SURICATA_DETECT_DSIZE_H
+#define SURICATA_DETECT_DSIZE_H
 
 #include "detect-engine-uint.h"
 
@@ -50,5 +50,4 @@ static inline bool SigDsizePrefilter(const Packet *p, const Signature *s, uint32
     return false;
 }
 
-#endif /* __DETECT_DSIZE_H__ */
-
+#endif /* SURICATA_DETECT_DSIZE_H */
index 5f2780a3c066d05eb6ddc126cddc110e771e6336..5abce56072a502385475cbb3c33d8532a6cc8104 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_ADDRESS_IPV4_H__
-#define __DETECT_ENGINE_ADDRESS_IPV4_H__
+#ifndef SURICATA_DETECT_ENGINE_ADDRESS_IPV4_H
+#define SURICATA_DETECT_ENGINE_ADDRESS_IPV4_H
 
 int DetectAddressCutNotIPv4(DetectAddress *, DetectAddress **);
 int DetectAddressCmpIPv4(DetectAddress *a, DetectAddress *b);
@@ -33,5 +33,4 @@ int DetectAddressIsCompleteIPSpaceIPv4(DetectAddress *);
 
 void DetectAddressIPv4Tests(void);
 
-#endif /* __DETECT_ENGINE_ADDRESS_IPV4_H__ */
-
+#endif /* SURICATA_DETECT_ENGINE_ADDRESS_IPV4_H */
index b8c573d0ce446c0700af5ef43e7cadfa1b64acea..96727ee2769197c4f8d107d874cc0a0eafc64983 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_ADDRESS_IPV6_H__
-#define __DETECT_ENGINE_ADDRESS_IPV6_H__
+#ifndef SURICATA_DETECT_ENGINE_ADDRESS_IPV6_H
+#define SURICATA_DETECT_ENGINE_ADDRESS_IPV6_H
 
 int AddressIPv6Lt(Address *, Address *);
 int AddressIPv6Gt(Address *, Address *);
@@ -44,5 +44,4 @@ int DetectAddressCutIPv6(DetectEngineCtx *, DetectAddress *, DetectAddress *,
 
 void DetectAddressIPv6Tests(void);
 
-#endif /* __DETECT_ENGINE_ADDRESS_IPV6_H__ */
-
+#endif /* SURICATA_DETECT_ENGINE_ADDRESS_IPV6_H */
index 3c8221e630b4351081a94d998453be791e2c4357..bbeb4bcac26c652cc5025bf07d898befad3b6e5b 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ADDRESS_H__
-#define __DETECT_ADDRESS_H__
-
-
+#ifndef SURICATA_DETECT_ADDRESS_H
+#define SURICATA_DETECT_ADDRESS_H
 
 DetectAddress *DetectAddressInit(void);
 void DetectAddressFree(DetectAddress *);
@@ -54,4 +52,4 @@ const DetectAddressHead *DetectParseAddress(DetectEngineCtx *de_ctx,
 void DetectAddressPrintList(DetectAddress *);
 #endif
 
-#endif /* __DETECT_ADDRESS_H__ */
+#endif /* SURICATA_DETECT_ADDRESS_H */
index 984f0c3228ea5a454c3bdafae13033f054f2c112..9fcd33996ceeccfbbcb9e1c341ea47a114eeb4f9 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_ALERT_H__
-#define __DETECT_ENGINE_ALERT_H__
+#ifndef SURICATA_DETECT_ENGINE_ALERT_H
+#define SURICATA_DETECT_ENGINE_ALERT_H
 
 #include "suricata-common.h"
 #include "decode.h"
@@ -39,4 +39,4 @@ int PacketAlertCheck(Packet *, uint32_t);
 void PacketAlertTagInit(void);
 void DetectEngineAlertRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_ALERT_H__ */
+#endif /* SURICATA_DETECT_ENGINE_ALERT_H */
index 7ad67c6080d2b5589d820125d325397a67c7d011..dda71f3384687bca8954255b43d7df6fb3cb4cbc 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eileen Donlon <emdonlo@gmail.com>
  */
 
-#ifndef __DETECT_ENGINE_ANALYZER_H__
-#define __DETECT_ENGINE_ANALYZER_H__
+#ifndef SURICATA_DETECT_ENGINE_ANALYZER_H
+#define SURICATA_DETECT_ENGINE_ANALYZER_H
 
 #include <stdint.h>
 
@@ -39,4 +39,4 @@ void EngineAnalysisRulesFailure(
 
 void EngineAnalysisRules2(const struct DetectEngineCtx_ *de_ctx, const Signature *s);
 
-#endif /* __DETECT_ENGINE_ANALYZER_H__ */
+#endif /* SURICATA_DETECT_ENGINE_ANALYZER_H */
index 513845477ec6d06362da29383ba3b700acfef940..a61a930f9a05da3b12cbc16dc3c5fe4bea014d7a 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_ENGINE_BUILD_H__
-#define __DETECT_ENGINE_BUILD_H__
+#ifndef SURICATA_DETECT_ENGINE_BUILD_H
+#define SURICATA_DETECT_ENGINE_BUILD_H
 
 void PacketCreateMask(Packet *p, SignatureMask *mask, AppProto alproto,
         bool app_decoder_events);
@@ -40,4 +40,4 @@ void SigCleanSignatures(DetectEngineCtx *);
 int SigGroupBuild(DetectEngineCtx *);
 int SigGroupCleanup (DetectEngineCtx *de_ctx);
 
-#endif /* __DETECT_ENGINE_BUILD_H__ */
+#endif /* SURICATA_DETECT_ENGINE_BUILD_H */
index ec785165df1adb0a82fccf9e78e626b667f0e310..2c253b77ad3d326c8128a6f7d04087748234ffcf 100644 (file)
@@ -22,8 +22,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_CONTENT_INSPECTION_H__
-#define __DETECT_ENGINE_CONTENT_INSPECTION_H__
+#ifndef SURICATA_DETECT_ENGINE_CONTENT_INSPECTION_H
+#define SURICATA_DETECT_ENGINE_CONTENT_INSPECTION_H
 
 /** indication to content engine what type of data
  *  we're inspecting
@@ -70,4 +70,4 @@ bool DetectEngineContentInspectionBuffer(DetectEngineCtx *de_ctx, DetectEngineTh
 
 void DetectEngineContentInspectionRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_CONTENT_INSPECTION_H__ */
+#endif /* SURICATA_DETECT_ENGINE_CONTENT_INSPECTION_H */
index dc2fcd809b68642553bae11b6569f9b97e60303e..504693e632738e34c71616d1135c04fb5e1f8219 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_DCEPAYLOAD_H__
-#define __DETECT_ENGINE_DCEPAYLOAD_H__
+#ifndef SURICATA_DETECT_ENGINE_DCEPAYLOAD_H
+#define SURICATA_DETECT_ENGINE_DCEPAYLOAD_H
 
 // uint8_t DetectEngineInspectDcePayload(DetectEngineCtx *, DetectEngineThreadCtx *,
 //        const Signature *, Flow *, uint8_t, void *);
 
 void DcePayloadRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_DCEPAYLOAD_H__ */
+#endif /* SURICATA_DETECT_ENGINE_DCEPAYLOAD_H */
index 3c263f999770d7ce0cb03594b1222fa87b060fd2..dbc498e0846e898ed069395dc43003e0acb30a0c 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Kevin Wong <kwong@solananetworks.com>
  */
 
-#ifndef __DETECT_ENGINE_ENIP_H__
-#define __DETECT_ENGINE_ENIP_H__
+#ifndef SURICATA_DETECT_ENGINE_ENIP_H
+#define SURICATA_DETECT_ENGINE_ENIP_H
 
 uint8_t DetectEngineInspectCIP(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *,
         const struct DetectEngineAppInspectionEngine_ *, const Signature *, Flow *, uint8_t, void *,
@@ -31,4 +31,4 @@ uint8_t DetectEngineInspectENIP(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *
         const struct DetectEngineAppInspectionEngine_ *, const Signature *, Flow *, uint8_t, void *,
         void *, uint64_t);
 
-#endif /* __DETECT_ENGINE_ENIP_H__ */
+#endif /* SURICATA_DETECT_ENGINE_ENIP_H */
index 178af0472ffbb814cd7574fe844645c7faac88bf..c53e71e76f0502467224244183e50335b1285fba 100644 (file)
@@ -21,9 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_ENGINE_EVENT_H__
-#define __DETECT_ENGINE_EVENT_H__
-
+#ifndef SURICATA_DETECT_ENGINE_EVENT_H
+#define SURICATA_DETECT_ENGINE_EVENT_H
 
 typedef struct DetectEngineEventData_ {
     uint8_t event;
@@ -32,5 +31,4 @@ typedef struct DetectEngineEventData_ {
 /* prototypes */
 void DetectEngineEventRegister (void);
 
-#endif /*__DETECT_ENGINE_EVENT_H__ */
-
+#endif /*SURICATA_DETECT_ENGINE_EVENT_H */
index 3705a8f6e60176a1d8b8cadc4262cb77f1e0c649..13aa7465f436a5118b64e8e5f927c6cfe7e11c74 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_FILE_H__
-#define __DETECT_ENGINE_FILE_H__
+#ifndef SURICATA_DETECT_ENGINE_FILE_H
+#define SURICATA_DETECT_ENGINE_FILE_H
 
 uint8_t DetectFileInspectGeneric(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,
         const struct DetectEngineAppInspectionEngine_ *engine, const Signature *s, Flow *f,
         uint8_t flags, void *_alstate, void *tx, uint64_t tx_id);
 
-#endif /* __DETECT_ENGINE_FILE_H__ */
+#endif /* SURICATA_DETECT_ENGINE_FILE_H */
index 7fa9e223e7432f11d7a68d81e6541637af1d648d..b3297876da0a87f9402d389527629297acd88219 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_IPONLY_H__
-#define __DETECT_ENGINE_IPONLY_H__
+#ifndef SURICATA_DETECT_ENGINE_IPONLY_H
+#define SURICATA_DETECT_ENGINE_IPONLY_H
 
 void IPOnlyCIDRListFree(IPOnlyCIDRItem *tmphead);
 int IPOnlySigParseAddress(const DetectEngineCtx *, Signature *, const char *, char);
@@ -36,5 +36,4 @@ SigIntId IPOnlyTrackSigNum(DetectEngineIPOnlyCtx *, SigIntId);
 void IPOnlyAddSignature(DetectEngineCtx *, DetectEngineIPOnlyCtx *, Signature *);
 void IPOnlyRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_IPONLY_H__ */
-
+#endif /* SURICATA_DETECT_ENGINE_IPONLY_H */
index f43ff9a5491c11112a2dd5847b08517d1639dd14..43eadc407a5fa8a8dea7ec9dfbc78a9062148a60 100644 (file)
@@ -24,8 +24,8 @@
  * that can load multiple detection engines in parallel.
  */
 
-#ifndef __DETECT_ENGINE_LOADER_H__
-#define __DETECT_ENGINE_LOADER_H__
+#ifndef SURICATA_DETECT_ENGINE_LOADER_H
+#define SURICATA_DETECT_ENGINE_LOADER_H
 
 /**
  * \param ctx function specific data
@@ -61,4 +61,4 @@ void TmThreadContinueDetectLoaderThreads(void);
 void DetectLoaderThreadSpawn(void);
 void TmModuleDetectLoaderRegister (void);
 
-#endif /* __DETECT_ENGINE_LOADER_H__ */
+#endif /* SURICATA_DETECT_ENGINE_LOADER_H */
index b05f86e43eb163396fce8913a96419d316b73fdd..c331b5f36fa77a4943519d0acab0dd3f1ffa1262 100644 (file)
@@ -21,9 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_MPM_H__
-#define __DETECT_ENGINE_MPM_H__
-
+#ifndef SURICATA_DETECT_ENGINE_MPM_H
+#define SURICATA_DETECT_ENGINE_MPM_H
 
 #include "detect.h"
 
@@ -135,5 +134,4 @@ struct MpmListIdDataArgs {
 
 void EngineAnalysisAddAllRulePatterns(DetectEngineCtx *de_ctx, const Signature *s);
 
-#endif /* __DETECT_ENGINE_MPM_H__ */
-
+#endif /* SURICATA_DETECT_ENGINE_MPM_H */
index 7ef29db6c66693bde2c9c3ab87d5d349aceceab0..bafaf790ccd493a9349188ef7010ef75032289bd 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_PAYLOAD_H__
-#define __DETECT_ENGINE_PAYLOAD_H__
+#ifndef SURICATA_DETECT_ENGINE_PAYLOAD_H
+#define SURICATA_DETECT_ENGINE_PAYLOAD_H
 
 int PrefilterPktPayloadRegister(DetectEngineCtx *de_ctx,
         SigGroupHead *sgh, MpmCtx *mpm_ctx);
@@ -40,5 +40,4 @@ uint8_t DetectEngineInspectStream(DetectEngineCtx *de_ctx, DetectEngineThreadCtx
 
 void PayloadRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_PAYLOAD_H__ */
-
+#endif /* SURICATA_DETECT_ENGINE_PAYLOAD_H */
index 641a4e238503b910f594636a12aa82a76144de14..a9a1f997badcc256282af992cd9204a8c70f2e90 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_PORT_H__
-#define __DETECT_PORT_H__
+#ifndef SURICATA_DETECT_PORT_H
+#define SURICATA_DETECT_PORT_H
 
 #include "interval-tree.h"
 #include "detect.h"
@@ -80,5 +80,4 @@ int DetectPortHashInit(DetectEngineCtx *de_ctx);
 void DetectPortTests(void);
 #endif
 
-#endif /* __DETECT_PORT_H__ */
-
+#endif /* SURICATA_DETECT_PORT_H */
index f5ea765215270480fd0bfe67c1f17ee8f233df31..8ef3bb5b15e11ef11bdaa0f381d375557fd18608 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_ENGINE_PREFILTER_COMMON_H__
-#define __DETECT_ENGINE_PREFILTER_COMMON_H__
+#ifndef SURICATA_DETECT_ENGINE_PREFILTER_COMMON_H
+#define SURICATA_DETECT_ENGINE_PREFILTER_COMMON_H
 
 #include "rust.h"
 
@@ -107,4 +107,4 @@ static inline bool PrefilterIsPrefilterableById(const Signature *s, enum DetectK
     return false;
 }
 
-#endif /* __DETECT_ENGINE_PREFILTER_COMMON_H__ */
+#endif /* SURICATA_DETECT_ENGINE_PREFILTER_COMMON_H */
index 1f6143fd1545c2c3ce871c75d3f279a17b4e825a..58daeca6e7364f1665e993900784f49680d2d0c8 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_PREFILTER_H__
-#define __DETECT_ENGINE_PREFILTER_H__
+#ifndef SURICATA_DETECT_ENGINE_PREFILTER_H
+#define SURICATA_DETECT_ENGINE_PREFILTER_H
 
 #include "detect.h"
 #include "detect-engine-state.h"
index 4e4c031110db7afe894805c281fde958aa198f23..6008430be68011f215ded9a5807420a1661d0cc8 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_PROTO_H__
-#define __DETECT_PROTO_H__
+#ifndef SURICATA_DETECT_PROTO_H
+#define SURICATA_DETECT_PROTO_H
 
 #define DETECT_PROTO_ANY            (1 << 0) /**< Indicate that given protocol
                                               is considered as IP */
@@ -44,5 +44,4 @@ int DetectProtoContainsProto(const DetectProto *, int);
 
 void DetectProtoTests(void);
 
-#endif /* __DETECT_PROTO_H__ */
-
+#endif /* SURICATA_DETECT_PROTO_H */
index f6f992d13136fd6fd695c587e4d0ad5442d9cd78..f4f2742470e3c8ceac43935ebf077928213d2426 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_REGISTER_H__
-#define __DETECT_ENGINE_REGISTER_H__
+#ifndef SURICATA_DETECT_ENGINE_REGISTER_H
+#define SURICATA_DETECT_ENGINE_REGISTER_H
 
 enum DetectKeywordId {
     DETECT_SID,
@@ -356,4 +356,4 @@ int SigTableList(const char *keyword);
 void SigTableSetup(void);
 void SigTableRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_REGISTER_H__ */
+#endif /* SURICATA_DETECT_ENGINE_REGISTER_H */
index f0638293a6ef8f7a6cd572358437ae6912213f09..4b44f2a64799b6f521e121d673e4e0c580610b0f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_SIGGROUP_H__
-#define __DETECT_ENGINE_SIGGROUP_H__
+#ifndef SURICATA_DETECT_ENGINE_SIGGROUP_H
+#define SURICATA_DETECT_ENGINE_SIGGROUP_H
 
 int SigGroupHeadAppendSig(const DetectEngineCtx *, SigGroupHead **, const Signature *);
 int SigGroupHeadClearSigs(SigGroupHead *);
@@ -59,4 +59,4 @@ void SigGroupHeadSetupFiles(const DetectEngineCtx *de_ctx, SigGroupHead *sgh);
 
 int SigGroupHeadBuildNonPrefilterArray(DetectEngineCtx *de_ctx, SigGroupHead *sgh);
 
-#endif /* __DETECT_ENGINE_SIGGROUP_H__ */
+#endif /* SURICATA_DETECT_ENGINE_SIGGROUP_H */
index 7d7e105361714f1d70dba0997b3b87ea6efbafb2..d45a4e443ff9a4a62300057fa53243da10e0167d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_ENGINE_SIGORDER_H__
-#define __DETECT_ENGINE_SIGORDER_H__
+#ifndef SURICATA_DETECT_ENGINE_SIGORDER_H
+#define SURICATA_DETECT_ENGINE_SIGORDER_H
 
 /**
  * \brief Different kinds of helper data that can be used by the signature
@@ -68,4 +68,4 @@ void SCSigRegisterSignatureOrderingFuncs(DetectEngineCtx *);
 void SCSigRegisterSignatureOrderingTests(void);
 void SCSigSignatureOrderingModuleCleanup(DetectEngineCtx *);
 
-#endif /* __DETECT_ENGINE_SIGORDER_H__ */
+#endif /* SURICATA_DETECT_ENGINE_SIGORDER_H */
index 25cd679a0dae75cae2e056f7dd488cc02df07c25..326b3bad4ecd07ef1e7089bba866c572587756ea 100644 (file)
@@ -31,9 +31,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-
-#ifndef __DETECT_ENGINE_STATE_H__
-#define __DETECT_ENGINE_STATE_H__
+#ifndef SURICATA_DETECT_ENGINE_STATE_H
+#define SURICATA_DETECT_ENGINE_STATE_H
 
 #define DETECT_ENGINE_INSPECT_SIG_NO_MATCH 0
 #define DETECT_ENGINE_INSPECT_SIG_MATCH 1
@@ -108,7 +107,7 @@ DetectEngineState *DetectEngineStateAlloc(void);
  */
 void DetectEngineStateFree(DetectEngineState *state);
 
-#endif /* __DETECT_ENGINE_STATE_H__ */
+#endif /* SURICATA_DETECT_ENGINE_STATE_H */
 
 /**
  * @}
index 73f3fd871a357cf51e1144cc5dcf846a56342e1b..17af74851fa51a4e824bb5ca8f67248b9462dc14 100644 (file)
@@ -24,8 +24,8 @@
  * tag keyword
  */
 
-#ifndef __DETECT_ENGINE_TAG_H__
-#define __DETECT_ENGINE_TAG_H__
+#ifndef SURICATA_DETECT_ENGINE_TAG_H
+#define SURICATA_DETECT_ENGINE_TAG_H
 
 #include "host.h"
 #include "detect.h"
@@ -56,6 +56,4 @@ int TagHostHasTag(Host *host);
 
 void DetectEngineTagRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_TAG_H__ */
-
-
+#endif /* SURICATA_DETECT_ENGINE_TAG_H */
index 6fd7a9feaa5847d97aff2247efbd2d95b246933a..1516359a4b42597151961f8940c1555418c108b1 100644 (file)
@@ -22,8 +22,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_THRESHOLD_H__
-#define __DETECT_ENGINE_THRESHOLD_H__
+#ifndef SURICATA_DETECT_ENGINE_THRESHOLD_H
+#define SURICATA_DETECT_ENGINE_THRESHOLD_H
 
 #include "detect.h"
 #include "host.h"
@@ -51,4 +51,4 @@ int ThresholdHostTimeoutCheck(Host *, SCTime_t);
 int ThresholdIPPairTimeoutCheck(IPPair *, SCTime_t);
 void ThresholdListFree(void *ptr);
 
-#endif /* __DETECT_ENGINE_THRESHOLD_H__ */
+#endif /* SURICATA_DETECT_ENGINE_THRESHOLD_H */
index 81e4cab893ba7889df61baae575a3ba705ff9fe0..36993c611df7fdeca249197431277d12049f6d6f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Philippe Antoine <p.antoine@catenacyber.fr>
  */
 
-#ifndef __DETECT_ENGINE_UINT_H
-#define __DETECT_ENGINE_UINT_H
+#ifndef SURICATA_DETECT_ENGINE_UINT_H
+#define SURICATA_DETECT_ENGINE_UINT_H
 
 #include "rust.h"
 #include "detect-engine-prefilter-common.h"
@@ -60,4 +60,4 @@ DetectUintData_u16 *DetectU16Parse(const char *u16str);
 void PrefilterPacketU16Set(PrefilterPacketHeaderValue *v, void *smctx);
 bool PrefilterPacketU16Compare(PrefilterPacketHeaderValue v, void *smctx);
 
-#endif /* __DETECT_ENGINE_UINT_H */
+#endif /* SURICATA_DETECT_ENGINE_UINT_H */
index c0b694eb017f5cc6f04063c75fc6da0b02138582..a7fa737efe1100a509ec71cff72b80e2fab4500f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_ENGINE_H__
-#define __DETECT_ENGINE_H__
+#ifndef SURICATA_DETECT_ENGINE_H
+#define SURICATA_DETECT_ENGINE_H
 
 #include "detect.h"
 #include "suricata.h"
@@ -206,4 +206,4 @@ void DetectEngineStateResetTxs(Flow *f);
 
 void DeStateRegisterTests(void);
 
-#endif /* __DETECT_ENGINE_H__ */
+#endif /* SURICATA_DETECT_ENGINE_H */
index af57540c74f1f3e903f7c5fcd89497f355ab32bb..97e621060ccea95afd8c67db0576369f9e10d5de 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_FAST_PATTERN_H__
-#define __DETECT_FAST_PATTERN_H__
+#ifndef SURICATA_DETECT_FAST_PATTERN_H
+#define SURICATA_DETECT_FAST_PATTERN_H
 
 void SupportFastPatternForSigMatchList(int list_id, int priority);
 int FastPatternSupportEnabledForSigMatchList(const DetectEngineCtx *de_ctx,
@@ -36,5 +36,4 @@ void DetectEngineFreeFastPatternList(DetectEngineCtx *de_ctx);
 
 void DetectFastPatternRegister(void);
 
-#endif /* __DETECT_FAST_PATTERN_H__ */
-
+#endif /* SURICATA_DETECT_FAST_PATTERN_H */
index 1be9b400104973c85d09f33b0ec9bfe01b73b823..c96eb13194ddbf5005a9d7c702d9d0bfb7ece070 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_FILEDATA_H__
-#define __DETECT_FILEDATA_H__
+#ifndef SURICATA_DETECT_FILEDATA_H
+#define SURICATA_DETECT_FILEDATA_H
 
 /* prototypes */
 void DetectFiledataRegister (void);
@@ -40,4 +40,4 @@ uint8_t DetectEngineInspectFiledata(DetectEngineCtx *de_ctx, DetectEngineThreadC
 int PrefilterMpmFiledataRegister(DetectEngineCtx *de_ctx, SigGroupHead *sgh, MpmCtx *mpm_ctx,
         const DetectBufferMpmRegistry *mpm_reg, int list_id);
 
-#endif /* __DETECT_FILEDATA_H__ */
+#endif /* SURICATA_DETECT_FILEDATA_H */
index b547e03677f220aa67a34a158b886804be2720d7..886289c8955d64ea793b27a1c20a13595a0dfe26 100644 (file)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef __UTIL_DETECT_FILE_HASH_H__
-#define __UTIL_DETECT_FILE_HASH_H__
+#ifndef SURICATA_UTIL_DETECT_FILE_HASH_H
+#define SURICATA_UTIL_DETECT_FILE_HASH_H
 
 #include "util-rohash.h"
 
@@ -42,4 +42,4 @@ int DetectFileHashMatch(DetectEngineThreadCtx *, Flow *, uint8_t,
 int DetectFileHashSetup(DetectEngineCtx *, Signature *, const char *, uint16_t, int);
 void DetectFileHashFree(DetectEngineCtx *, void *);
 
-#endif /* __UTIL_DETECT_FILE_HASH_H__ */
+#endif /* SURICATA_UTIL_DETECT_FILE_HASH_H */
index d005597fca340fa16cc9b1a035b923735ddf23e3..963f0d358d1a86f18252726905b9f21d2447bb2c 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_FILEMAGIC_H__
-#define __DETECT_FILEMAGIC_H__
+#ifndef SURICATA_DETECT_FILEMAGIC_H
+#define SURICATA_DETECT_FILEMAGIC_H
 
 #ifdef HAVE_MAGIC
 /* prototypes */
@@ -30,4 +30,4 @@ int FilemagicThreadLookup(magic_t *ctx, File *file);
 #endif
 void DetectFilemagicRegister (void);
 
-#endif /* __DETECT_FILEMAGIC_H__ */
+#endif /* SURICATA_DETECT_FILEMAGIC_H */
index 0905fc4ce02b91f9d8069f75ae6170017500d80b..2d48dee7de993a7f6fd865fff6e25070aa9cc5ae 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_FILEMD5_H__
-#define __DETECT_FILEMD5_H__
+#ifndef SURICATA_DETECT_FILEMD5_H
+#define SURICATA_DETECT_FILEMD5_H
 
 /* prototypes */
 void DetectFileMd5Register (void);
 
-#endif /* __DETECT_FILEMD5_H__ */
+#endif /* SURICATA_DETECT_FILEMD5_H */
index 02684fcea416c4f389bfa62c8d16db04d2c7df8a..a05bcb04f9f811f4774c1f81e81f291c4168b277 100644 (file)
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_FILENAME_H__
-#define __DETECT_FILENAME_H__
+#ifndef SURICATA_DETECT_FILENAME_H
+#define SURICATA_DETECT_FILENAME_H
 
 /* prototypes */
 void DetectFilenameRegister (void);
 
-#endif /* __DETECT_FILENAME_H__ */
+#endif /* SURICATA_DETECT_FILENAME_H */
index d7504344c6063af587bba5dfc9c96ce3df76702d..a7e1cf829d7ecdb8fbe74441cedd7c4a3f8cf3ac 100644 (file)
  * \author Duarte Silva <duarte.silva@serializing.me>
  */
 
-#ifndef __DETECT_FILESHA1_H__
-#define __DETECT_FILESHA1_H__
+#ifndef SURICATA_DETECT_FILESHA1_H
+#define SURICATA_DETECT_FILESHA1_H
 
 /* prototypes */
 void DetectFileSha1Register (void);
 
-#endif /* __DETECT_FILESHA1_H__ */
+#endif /* SURICATA_DETECT_FILESHA1_H */
index a205b48699a0d18089051c860794e45e5fc0200a..af416c8d2102f4f10460ded21ba3d788613a4857 100644 (file)
  * \author Duarte Silva <duarte.silva@serializing.me>
  */
 
-#ifndef __DETECT_FILESHA256_H__
-#define __DETECT_FILESHA256_H__
+#ifndef SURICATA_DETECT_FILESHA256_H
+#define SURICATA_DETECT_FILESHA256_H
 
 /* prototypes */
 void DetectFileSha256Register (void);
 
-#endif /* __DETECT_FILESHA256_H__ */
+#endif /* SURICATA_DETECT_FILESHA256_H */
index 803b0a3607d6fc514db413ff05b80f6e84ccc6c8..00db41ce7911372b624158ca3d151b7ce31c9ea4 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_FILESIZE_H__
-#define        __DETECT_FILESIZE_H__
+#ifndef SURICATA_DETECT_FILESIZE_H
+#define SURICATA_DETECT_FILESIZE_H
 
 void DetectFilesizeRegister(void);
 
index f394842fbd8bde409ff28446294265ac430cec58..847fce03c1a7877371f87031cb58c7ec212612bf 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_FILESTORE_H__
-#define __DETECT_FILESTORE_H__
+#ifndef SURICATA_DETECT_FILESTORE_H
+#define SURICATA_DETECT_FILESTORE_H
 
 #define FILESTORE_DIR_DEFAULT   0   /* rule dir */
 #define FILESTORE_DIR_TOSERVER  1
@@ -41,4 +41,4 @@ typedef struct DetectFilestoreData_ {
 /* prototypes */
 void DetectFilestoreRegister (void);
 
-#endif /* __DETECT_FILESTORE_H__ */
+#endif /* SURICATA_DETECT_FILESTORE_H */
index 6db3cdba89c0cdb872fe30c6137ca67fbfe13bda..3cf123824347ec3df3c616af752f1b32a2081aba 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_FLOW_AGE_H__
-#define __DETECT_FLOW_AGE_H__
+#ifndef SURICATA_DETECT_FLOW_AGE_H
+#define SURICATA_DETECT_FLOW_AGE_H
 
 void DetectFlowAgeRegister(void);
 
-#endif /* __DETECT_FLOW_AGE_H__ */
+#endif /* SURICATA_DETECT_FLOW_AGE_H */
index ddc5cd172b2b605d0ec7692f2785369f7b046237..da1e0eb5a6aaa95388dfaba7123ca7e463bd173e 100644 (file)
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_FLOW_PKTS_H__
-#define __DETECT_FLOW_PKTS_H__
+#ifndef SURICATA_DETECT_FLOW_PKTS_H
+#define SURICATA_DETECT_FLOW_PKTS_H
 
 void DetectFlowPktsToClientRegister(void);
 void DetectFlowPktsToServerRegister(void);
 void DetectFlowBytesToClientRegister(void);
 void DetectFlowBytesToServerRegister(void);
 
-#endif /* __DETECT_FLOW_PKTS_H__ */
+#endif /* SURICATA_DETECT_FLOW_PKTS_H */
index 0fee4bf8c17a491ae281640f4f34775901256754..990d07b83a0431d5e6ecc9767d31944675eac63e 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_FLOW_H__
-#define __DETECT_FLOW_H__
+#ifndef SURICATA_DETECT_FLOW_H
+#define SURICATA_DETECT_FLOW_H
 
 #define DETECT_FLOW_FLAG_TOSERVER        BIT_U16(0)
 #define DETECT_FLOW_FLAG_TOCLIENT        BIT_U16(1)
@@ -44,5 +44,4 @@ int DetectFlowSetupImplicit(Signature *s, uint32_t flags);
 /* prototypes */
 void DetectFlowRegister (void);
 
-#endif /* __DETECT_FLOW_H__ */
-
+#endif /* SURICATA_DETECT_FLOW_H */
index 5e382de0a7a6dcdb44ac793116bf1c07dc850506..0a5823ef60b3d85c5564ad75474a29ea597928a0 100644 (file)
@@ -22,8 +22,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_FLOWBITS_H__
-#define __DETECT_FLOWBITS_H__
+#ifndef SURICATA_DETECT_FLOWBITS_H
+#define SURICATA_DETECT_FLOWBITS_H
 
 #define DETECT_FLOWBITS_CMD_SET      0
 #define DETECT_FLOWBITS_CMD_TOGGLE   1
@@ -42,5 +42,4 @@ typedef struct DetectFlowbitsData_ {
 /* prototypes */
 void DetectFlowbitsRegister (void);
 
-#endif /* __DETECT_FLOWBITS_H__ */
-
+#endif /* SURICATA_DETECT_FLOWBITS_H */
index 6ffa1f09302632734a7193ec27b28cbdd9b0881d..75422904581dd52743225262f54700293fb2ef76 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_FLOWINT_H__
-#define __DETECT_FLOWINT_H__
+#ifndef SURICATA_DETECT_FLOWINT_H
+#define SURICATA_DETECT_FLOWINT_H
 
 /** Flowint operations allowed */
 enum {
@@ -81,5 +81,4 @@ typedef struct DetectFlowintData_ {
 /* prototypes */
 void DetectFlowintRegister (void);
 
-#endif /* __DETECT_FLOWINT_H__ */
-
+#endif /* SURICATA_DETECT_FLOWINT_H */
index b2988a63517aadb5641180cf373b749d179ae25a..ce0ccdfb591980421db6607be7e35eef816c5171 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_FLOWVAR_H__
-#define __DETECT_FLOWVAR_H__
+#ifndef SURICATA_DETECT_FLOWVAR_H
+#define SURICATA_DETECT_FLOWVAR_H
 
 typedef struct DetectFlowvarData_ {
     char *name;
@@ -56,4 +56,4 @@ static inline void DetectVarProcessList(DetectEngineThreadCtx *det_ctx, Flow *f,
     }
 }
 
-#endif /* __DETECT_FLOWVAR_H__ */
+#endif /* SURICATA_DETECT_FLOWVAR_H */
index 1ab6cae310e3527b04fb19e021fc9379541b8a08..a4b0152a7af419fb2e10dff6931d966df1f444e9 100644 (file)
@@ -21,9 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_FRAGBITS_H__
-#define __DETECT_FRAGBITS_H__
-
+#ifndef SURICATA_DETECT_FRAGBITS_H
+#define SURICATA_DETECT_FRAGBITS_H
 
 /**
  * \struct DetectFragBitsData_
@@ -46,4 +45,4 @@ typedef struct DetectFragBitsData_ {
 
 void DetectFragBitsRegister (void);
 
-#endif /*__DETECT_FRAGBITS_H__ */
+#endif /*SURICATA_DETECT_FRAGBITS_H */
index 408b5377f0438d26dca4845f021f4497f7566263..7c9389cfed5ffb1f3d6ac641bea0b97cd41514e8 100644 (file)
@@ -21,8 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_FRAGOFFSET_H__
-#define __DETECT_FRAGOFFSET_H__
+#ifndef SURICATA_DETECT_FRAGOFFSET_H
+#define SURICATA_DETECT_FRAGOFFSET_H
 
 #define FRAG_LESS 1
 #define FRAG_MORE 2
@@ -35,4 +35,4 @@ typedef struct DetectFragOffsetData_ {
 /* prototypes */
 void DetectFragOffsetRegister(void);
 
-#endif /* __DETECT_FRAGOFFSET_H__ */
+#endif /* SURICATA_DETECT_FRAGOFFSET_H */
index ae094624c2180c066869bc069a0de9b1af6c2b8f..75bbc7c7ec9d0c416532251a4d21ef4fe26e2b32 100644 (file)
  * \file
  */
 
-#ifndef __DETECT_FRAME_H__
-#define __DETECT_FRAME_H__
+#ifndef SURICATA_DETECT_FRAME_H
+#define SURICATA_DETECT_FRAME_H
 
 /* Prototypes */
 void DetectFrameRegister(void);
 
-#endif /* __DETECT_FRAME_H__ */
+#endif /* SURICATA_DETECT_FRAME_H */
index f9cdfe390c11e5576f3036856ec6b40ab2fe784a..94e05323b331b1e56d1e20d42a98d5f4839acd4a 100644 (file)
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_FTPBOUNCE_H__
-#define __DETECT_FTPBOUNCE_H__
+#ifndef SURICATA_DETECT_FTPBOUNCE_H
+#define SURICATA_DETECT_FTPBOUNCE_H
 
 /* prototypes */
 void DetectFtpbounceRegister (void);
 
-#endif /* __DETECT_FTPBOUNCE_H__ */
-
+#endif /* SURICATA_DETECT_FTPBOUNCE_H */
index 9345c68e82056a1a0d489ec043a82f48062b418e..5ec6847754fa6fe79ba04967d3ff3b50c3170f5a 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __DETECT_FTPDATA_H__
-#define __DETECT_FTPDATA_H__
+#ifndef SURICATA_DETECT_FTPDATA_H
+#define SURICATA_DETECT_FTPDATA_H
 
 #include "app-layer-ftp.h"
 
@@ -39,4 +39,4 @@ typedef struct DetectFtpdataData_ {
  *         detect.c::SigTableSetup() */
 void DetectFtpdataRegister(void);
 
-#endif /* __DETECT_FTPDATA_H__ */
+#endif /* SURICATA_DETECT_FTPDATA_H */
index 4ec97b5df8686828d408ca93ac677a6bf3d2101e..aa068bc0ad6deb96ec0547cbe2caf9714052d6ff 100644 (file)
@@ -22,8 +22,8 @@
  * \author Bill Meeks <billmeeks8@gmail.com>
  */
 
-#ifndef __DETECT_GEOIP_H__
-#define __DETECT_GEOIP_H__
+#ifndef SURICATA_DETECT_GEOIP_H
+#define SURICATA_DETECT_GEOIP_H
 
 #ifdef HAVE_GEOIP
 
index fa714ef8f5cfb0306f39e6b7714084d67311a146..015cfcbce340ee901a03d07d433bf28f48b14d3e 100644 (file)
@@ -23,9 +23,8 @@
  * Implements the gid keyword
  */
 
-#ifndef __DETECT_GID_H__
-#define __DETECT_GID_H__
-
+#ifndef SURICATA_DETECT_GID_H
+#define SURICATA_DETECT_GID_H
 
 /**
  * Registration function for gid: keyword
@@ -33,4 +32,4 @@
 
 void DetectGidRegister (void);
 
-#endif /*__DETECT_GID_H__ */
\ No newline at end of file
+#endif /*SURICATA_DETECT_GID_H */
\ No newline at end of file
index 6e9c7f5f0e42ecc60b1b615bfcb13763920b455d..ee55996308a9874fc4aafdc3c63991cbc6b669ab 100644 (file)
@@ -21,8 +21,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_HOSTBITS_H__
-#define __DETECT_HOSTBITS_H__
+#ifndef SURICATA_DETECT_HOSTBITS_H
+#define SURICATA_DETECT_HOSTBITS_H
 
 #include "detect-xbits.h"
 
@@ -31,4 +31,4 @@ int DetectXbitMatchHost(Packet *p, const DetectXbitsData *xd);
 /* prototypes */
 void DetectHostbitsRegister (void);
 
-#endif /* __DETECT_HOSTBITS_H__ */
+#endif /* SURICATA_DETECT_HOSTBITS_H */
index 040ece82ee7d600b66cb5d8f39b17e1bd1c17c47..7deb2ed8ee4d4b670e8d3f9f42df86426d7681d5 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_ACCEPT_LEN_H__
-#define __DETECT_HTTP_ACCEPT_LEN_H__
+#ifndef SURICATA_DETECT_HTTP_ACCEPT_LEN_H
+#define SURICATA_DETECT_HTTP_ACCEPT_LEN_H
 
 void RegisterHttpHeadersAcceptEnc(void);
 
-#endif /* __DETECT_HTTP_ACCEPT_LEN_H__ */
+#endif /* SURICATA_DETECT_HTTP_ACCEPT_LEN_H */
index 735ae9132daf0de6fd30eb6c06a3a1020a9f0087..d75e5375880575e31e726aa500df6f3df79be76b 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_ACCEPT_LANG_H__
-#define __DETECT_HTTP_ACCEPT_LANG_H__
+#ifndef SURICATA_DETECT_HTTP_ACCEPT_LANG_H
+#define SURICATA_DETECT_HTTP_ACCEPT_LANG_H
 
 void RegisterHttpHeadersAcceptLang(void);
 
-#endif /* __DETECT_HTTP_ACCEPT_LANG_H__ */
+#endif /* SURICATA_DETECT_HTTP_ACCEPT_LANG_H */
index c3924af980a324903300607f35530278107c7433..7c3c1c0a9882b62161506f5d8d1b79c4770bee4d 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_ACCEPT_H__
-#define __DETECT_HTTP_ACCEPT_H__
+#ifndef SURICATA_DETECT_HTTP_ACCEPT_H
+#define SURICATA_DETECT_HTTP_ACCEPT_H
 
 void RegisterHttpHeadersAccept(void);
 
-#endif /* __DETECT_HTTP_ACCEPT_H__ */
+#endif /* SURICATA_DETECT_HTTP_ACCEPT_H */
index 7a2249c2308468fa9d146cfd69c0fa95a50aa1c1..b3339d4063e5a637b18cd6a90680b0e10d719669 100644 (file)
@@ -21,9 +21,9 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_HTTP_CLIENT_BODY_H__
-#define __DETECT_HTTP_CLIENT_BODY_H__
+#ifndef SURICATA_DETECT_HTTP_CLIENT_BODY_H
+#define SURICATA_DETECT_HTTP_CLIENT_BODY_H
 
 void DetectHttpClientBodyRegister(void);
 
-#endif /* __DETECT_HTTP_CLIENT_BODY_H__ */
+#endif /* SURICATA_DETECT_HTTP_CLIENT_BODY_H */
index 7210132232b900396950272d67fc36b256860308..729fd2a565f53875ddb93545a925dc558c5b072f 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_CONNECTION_H__
-#define __DETECT_HTTP_CONNECTION_H__
+#ifndef SURICATA_DETECT_HTTP_CONNECTION_H
+#define SURICATA_DETECT_HTTP_CONNECTION_H
 
 void RegisterHttpHeadersConnection(void);
 
-#endif /* __DETECT_HTTP_CONNECTION_H__ */
+#endif /* SURICATA_DETECT_HTTP_CONNECTION_H */
index 1e4b1a260a9646ff57460bc1a70ec2b5924036f1..1e17db436d6cfdad6753860366e59edffdb1b9dc 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_CONTENT_LEN_H__
-#define __DETECT_HTTP_CONTENT_LEN_H__
+#ifndef SURICATA_DETECT_HTTP_CONTENT_LEN_H
+#define SURICATA_DETECT_HTTP_CONTENT_LEN_H
 
 void RegisterHttpHeadersContentLen(void);
 
-#endif /* __DETECT_HTTP_CONTENT_LEN_H__ */
+#endif /* SURICATA_DETECT_HTTP_CONTENT_LEN_H */
index 291b2756d201ed5157e2a95919afdf6affda9212..e12e16d2272ca14854eabae4d43be577ea131100 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_CONTENT_TYPE_H__
-#define __DETECT_HTTP_CONTENT_TYPE_H__
+#ifndef SURICATA_DETECT_HTTP_CONTENT_TYPE_H
+#define SURICATA_DETECT_HTTP_CONTENT_TYPE_H
 
 void RegisterHttpHeadersContentType(void);
 
-#endif /* __DETECT_HTTP_CONTENT_TYPE_H__ */
+#endif /* SURICATA_DETECT_HTTP_CONTENT_TYPE_H */
index a9c830e2a2356647159600a3efbc39b69f40e31e..4677407943f0089d7276b4f62dd68269bb0e25f4 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_HTTP_HEADER_COMMON_H__
-#define __DETECT_HTTP_HEADER_COMMON_H__
+#ifndef SURICATA_DETECT_HTTP_HEADER_COMMON_H
+#define SURICATA_DETECT_HTTP_HEADER_COMMON_H
 
 typedef struct HttpHeaderBuffer_ {
     uint8_t *buffer;
@@ -48,4 +48,4 @@ HttpHeaderBuffer *HttpHeaderGetBufferSpace(DetectEngineThreadCtx *det_ctx, Flow
 int HttpHeaderExpandBuffer(HttpHeaderThreadData *td,
         HttpHeaderBuffer *buf, uint32_t size);
 
-#endif /* __DETECT_HTTP_HEADER_COMMON_H__ */
+#endif /* SURICATA_DETECT_HTTP_HEADER_COMMON_H */
index f45a0ae00a6076922b537337f40148edf74a057b..21fc50a8cfb0d6f3025e5fb43abaa22f1e2d6412 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_HTTP_HEADER_NAMES_H__
-#define __DETECT_HTTP_HEADER_NAMES_H__
+#ifndef SURICATA_DETECT_HTTP_HEADER_NAMES_H
+#define SURICATA_DETECT_HTTP_HEADER_NAMES_H
 
 void DetectHttpHeaderNamesRegister(void);
 
-#endif /* __DETECT_HTTP_HEADER_NAMES_H__ */
+#endif /* SURICATA_DETECT_HTTP_HEADER_NAMES_H */
index 369386f400a778177389e308e16a2f37505c932c..187b827364309a1294e569871a34c90a789b7388 100644 (file)
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_HTTP_HEADER_H__
-#define __DETECT_HTTP_HEADER_H__
+#ifndef SURICATA_DETECT_HTTP_HEADER_H
+#define SURICATA_DETECT_HTTP_HEADER_H
 
 void DetectHttpHeaderRegister(void);
 void DetectHttpRawHeaderRegister(void);
 void DetectHttpRequestHeaderRegister(void);
 void DetectHttpResponseHeaderRegister(void);
 
-#endif /* __DETECT_HTTP_HEADER_H__ */
+#endif /* SURICATA_DETECT_HTTP_HEADER_H */
index 30b9bc59d0cce684ad36bf4989bdd28103a78856..095a01c2741a6412c322f5583fa0e874828fcc4a 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_HEADERS_H__
-#define __DETECT_HTTP_HEADERS_H__
+#ifndef SURICATA_DETECT_HTTP_HEADERS_H
+#define SURICATA_DETECT_HTTP_HEADERS_H
 
 void DetectHttpHeadersRegister(void);
 
-#endif /* __DETECT_HTTP_HEADERS_H__ */
+#endif /* SURICATA_DETECT_HTTP_HEADERS_H */
index bb6fd3dac5ac5dbb92ec0e6b2047d18b7c95a2ab..5481be11f3adbc08eb59321bf6438acb14c71d6b 100644 (file)
@@ -21,9 +21,9 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_HTTP_HH_H__
-#define __DETECT_HTTP_HH_H__
+#ifndef SURICATA_DETECT_HTTP_HH_H
+#define SURICATA_DETECT_HTTP_HH_H
 
 void DetectHttpHHRegister(void);
 
-#endif /* __DETECT_HTTP_HH_H__ */
+#endif /* SURICATA_DETECT_HTTP_HH_H */
index de55a705c82f26b02fbd91f43ad61e6952147a23..310e714b126f5459f52a3c9ea00717b51c9b20d1 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_LOCATION_H__
-#define __DETECT_HTTP_LOCATION_H__
+#ifndef SURICATA_DETECT_HTTP_LOCATION_H
+#define SURICATA_DETECT_HTTP_LOCATION_H
 
 void RegisterHttpHeadersLocation(void);
 
-#endif /* __DETECT_HTTP_LOCATION_H__ */
+#endif /* SURICATA_DETECT_HTTP_LOCATION_H */
index 871177b58749087c194f1e6e25ac8b5bf8eb4cca..2cf019a7bd6c046534e28356ccc87f48876f412d 100644 (file)
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#ifndef __DETECT_HTTP_METHOD_H__
-#define __DETECT_HTTP_METHOD_H__
+#ifndef SURICATA_DETECT_HTTP_METHOD_H
+#define SURICATA_DETECT_HTTP_METHOD_H
 
 /* prototypes */
 void DetectHttpMethodRegister(void);
 
-#endif /* __DETECT_HTTP_METHOD_H__ */
-
+#endif /* SURICATA_DETECT_HTTP_METHOD_H */
index 88dde2f8c764450964e7d981892e0b1477558fe2..f225877ffe5b7176e16d1f1a35a6df68ce6b5d1f 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_HTTP_PROTOCOL_H__
-#define __DETECT_HTTP_PROTOCOL_H__
+#ifndef SURICATA_DETECT_HTTP_PROTOCOL_H
+#define SURICATA_DETECT_HTTP_PROTOCOL_H
 
 void DetectHttpProtocolRegister(void);
 
-#endif /* __DETECT_HTTP_PROTOCOL_H__ */
+#endif /* SURICATA_DETECT_HTTP_PROTOCOL_H */
index f6b480b2b9f7b3ecdb61d308763fc3e927955e14..7b2729bffb6ee9138a0f1b986380a5ed50cc8587 100644 (file)
@@ -21,9 +21,9 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_HTTP_RAW_HEADER_H__
-#define __DETECT_HTTP_RAW_HEADER_H__
+#ifndef SURICATA_DETECT_HTTP_RAW_HEADER_H
+#define SURICATA_DETECT_HTTP_RAW_HEADER_H
 
 void DetectHttpRawHeaderRegister(void);
 
-#endif /* __DETECT_HTTP_RAW_HEADER_H__ */
+#endif /* SURICATA_DETECT_HTTP_RAW_HEADER_H */
index ae265890a0011b1a46fee9094f2685a4ba2afeaf..779d7bf907f7c0455fe637b8805a1f1a85b61a02 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_REFERER_H__
-#define __DETECT_HTTP_REFERER_H__
+#ifndef SURICATA_DETECT_HTTP_REFERER_H
+#define SURICATA_DETECT_HTTP_REFERER_H
 
 void RegisterHttpHeadersReferer(void);
 
-#endif /* __DETECT_HTTP_REFERER_H__ */
+#endif /* SURICATA_DETECT_HTTP_REFERER_H */
index 64751b7ee32eb16e191e67cf53ab1fdd36a98648..2bc06b1e07193ff8cd5ed6cc6e26e7f253a3276f 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_HTTP_REQUEST_LINE_H__
-#define __DETECT_HTTP_REQUEST_LINE_H__
+#ifndef SURICATA_DETECT_HTTP_REQUEST_LINE_H
+#define SURICATA_DETECT_HTTP_REQUEST_LINE_H
 
 void DetectHttpRequestLineRegister(void);
 
-#endif /* __DETECT_HTTP_REQUEST_LINE_H__ */
+#endif /* SURICATA_DETECT_HTTP_REQUEST_LINE_H */
index 0563feaf60b1d791fb4b59f8b4e19fad8e79dcb5..545289796188bfc78a51ef90558a5abfed39ff55 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_HTTP_RESPONSE_LINE_H__
-#define __DETECT_HTTP_RESPONSE_LINE_H__
+#ifndef SURICATA_DETECT_HTTP_RESPONSE_LINE_H
+#define SURICATA_DETECT_HTTP_RESPONSE_LINE_H
 
 void DetectHttpResponseLineRegister(void);
 
-#endif /* __DETECT_HTTP_RESPONSE_LINE_H__ */
+#endif /* SURICATA_DETECT_HTTP_RESPONSE_LINE_H */
index 7f20dc54a64faf319a5c09a9e0c568cb1e28c44b..5ced18ef5ae30abe1279c25a2ec7f931cea4d70d 100644 (file)
@@ -21,9 +21,9 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_HTTP_SERVER_BODY_H__
-#define __DETECT_HTTP_SERVER_BODY_H__
+#ifndef SURICATA_DETECT_HTTP_SERVER_BODY_H
+#define SURICATA_DETECT_HTTP_SERVER_BODY_H
 
 void DetectHttpServerBodyRegister(void);
 
-#endif /* __DETECT_HTTP_SERVER_BODY_H__ */
+#endif /* SURICATA_DETECT_HTTP_SERVER_BODY_H */
index c74137264c154f8d53155259b7a3ac96d6ad882a..1ba1073d5a6965021d190f76a58be61694eb25c3 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_HTTP_SERVER_H__
-#define __DETECT_HTTP_SERVER_H__
+#ifndef SURICATA_DETECT_HTTP_SERVER_H
+#define SURICATA_DETECT_HTTP_SERVER_H
 
 void RegisterHttpHeadersServer(void);
 
-#endif /* __DETECT_HTTP_SERVER_H__ */
+#endif /* SURICATA_DETECT_HTTP_SERVER_H */
index 52cada1c860a4bd2a1aa991935496d5e552c048c..85558e293d167d7a736a837490362d3d8a6bae51 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_HTTP_START_H__
-#define __DETECT_HTTP_START_H__
+#ifndef SURICATA_DETECT_HTTP_START_H
+#define SURICATA_DETECT_HTTP_START_H
 
 void DetectHttpStartRegister(void);
 
-#endif /* __DETECT_HTTP_START_H__ */
+#endif /* SURICATA_DETECT_HTTP_START_H */
index 2b04245e73a9365b8c7648b5f65791d210cf645e..4c58c8b79fcd09075f9e0bc143f7b9d7b663920b 100644 (file)
@@ -21,9 +21,9 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_HTTP_UA_H__
-#define __DETECT_HTTP_UA_H__
+#ifndef SURICATA_DETECT_HTTP_UA_H
+#define SURICATA_DETECT_HTTP_UA_H
 
 void DetectHttpUARegister(void);
 
-#endif /* __DETECT_HTTP_UA_H__ */
+#endif /* SURICATA_DETECT_HTTP_UA_H */
index b952249b6e5ce4f5ca3a8d792f701a529aafb603..9afc1611cffed11750daeb25a07a50e4cb564a3b 100644 (file)
@@ -21,8 +21,8 @@
  * \author Gerardo Iglesias Galvan <iglesiasg@gmail.com>
  */
 
-#ifndef __DETECT_ICMP_ID_H__
-#define __DETECT_ICMP_ID_H__
+#ifndef SURICATA_DETECT_ICMP_ID_H
+#define SURICATA_DETECT_ICMP_ID_H
 
 typedef struct DetectIcmpIdData_ {
     uint16_t id; /**< id in network byte error */
@@ -31,4 +31,4 @@ typedef struct DetectIcmpIdData_ {
 /* prototypes */
 void DetectIcmpIdRegister(void);
 
-#endif /* __DETECT_ICMP_ID_H__ */
+#endif /* SURICATA_DETECT_ICMP_ID_H */
index e148177b8dadb8b75c17f349a63877dc6d1325b9..3c40f3a707f0cb4b9eae5b2c64c243c87829972c 100644 (file)
@@ -21,8 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_ICMP_SEQ_H__
-#define __DETECT_ICMP_SEQ_H__
+#ifndef SURICATA_DETECT_ICMP_SEQ_H
+#define SURICATA_DETECT_ICMP_SEQ_H
 
 typedef struct DetectIcmpSeqData_ {
     uint16_t seq; /**< sequence value in network byte order */
@@ -31,4 +31,4 @@ typedef struct DetectIcmpSeqData_ {
 /* prototypes */
 void DetectIcmpSeqRegister(void);
 
-#endif /* __DETECT_ICMP_SEQ_H__ */
+#endif /* SURICATA_DETECT_ICMP_SEQ_H */
index 9d0a179c2f5eeebc727255bbe4e5215d9bce275d..1f08ec4a9bddac1bf30a848e30b309598a21ddcd 100644 (file)
  * \author Gerardo Iglesias <iglesiasg@gmail.com>
  */
 
-#ifndef __DETECT_ICODE_H__
-#define __DETECT_ICODE_H__
+#ifndef SURICATA_DETECT_ICODE_H
+#define SURICATA_DETECT_ICODE_H
 
 /* prototypes */
 void DetectICodeRegister(void);
 
-#endif /* __DETECT_ICODE_H__ */
+#endif /* SURICATA_DETECT_ICODE_H */
index 3198c9c31e0d2003483267356d5a01b43014006d..9fb91566709be46802ec8c4bdb64a351e7dccaa5 100644 (file)
@@ -21,9 +21,8 @@
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_ID_H__
-#define __DETECT_ID_H__
-
+#ifndef SURICATA_DETECT_ID_H
+#define SURICATA_DETECT_ID_H
 
 #define DETECT_IPID_MIN 0
 #define DETECT_IPID_MAX 65536
@@ -35,5 +34,4 @@ typedef struct DetectIdData_ {
 /* prototypes */
 void DetectIdRegister (void);
 
-#endif /* __DETECT_ID_H__ */
-
+#endif /* SURICATA_DETECT_ID_H */
index efbd5fe4c22162444cc39507cd356b2189c0e272..d5e107d22f6d8a0e4d647b1e73e1a014d79fb1a1 100644 (file)
@@ -21,9 +21,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_CHOSEN_SA_H__
-#define __DETECT_IKE_CHOSEN_SA_H__
+#ifndef SURICATA_DETECT_IKE_CHOSEN_SA_H
+#define SURICATA_DETECT_IKE_CHOSEN_SA_H
 
 void DetectIkeChosenSaRegister(void);
 
-#endif /* __DETECT_IKE_CHOSEN_SA_H__ */
+#endif /* SURICATA_DETECT_IKE_CHOSEN_SA_H */
index f7360eb21cef1d93b2fb688c2a1cebcb9f26044b..ca2c8246804c0a766bafbbe02ac26939f5b67804 100644 (file)
@@ -21,9 +21,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_EXCH_TYPE_H__
-#define __DETECT_IKE_EXCH_TYPE_H__
+#ifndef SURICATA_DETECT_IKE_EXCH_TYPE_H
+#define SURICATA_DETECT_IKE_EXCH_TYPE_H
 
 void DetectIkeExchTypeRegister(void);
 
-#endif /* __DETECT_IKE_EXCH_TYPE_H__ */
+#endif /* SURICATA_DETECT_IKE_EXCH_TYPE_H */
index 7d76e558b91c3a68d9dd8ab03d101227340d3fda..46671586338a4e0dd174e2ef3ee246373209fdcf 100644 (file)
@@ -20,9 +20,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_KEY_EXCHANGE_PAYLOAD_LENGTH_H__
-#define __DETECT_IKE_KEY_EXCHANGE_PAYLOAD_LENGTH_H__
+#ifndef SURICATA_DETECT_IKE_KEY_EXCHANGE_PAYLOAD_LENGTH_H
+#define SURICATA_DETECT_IKE_KEY_EXCHANGE_PAYLOAD_LENGTH_H
 
 void DetectIkeKeyExchangePayloadLengthRegister(void);
 
-#endif /* __DETECT_IKE_KEY_EXCHANGE_PAYLOAD_LENGTH_H__ */
+#endif /* SURICATA_DETECT_IKE_KEY_EXCHANGE_PAYLOAD_LENGTH_H */
index 55a914b5c369885084a525dc0391258d92d7e8cd..0732a8f600da8043acb55f6911fef50c24efbef9 100644 (file)
@@ -20,9 +20,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_KEY_EXCHANGE_PAYLOAD_H__
-#define __DETECT_IKE_KEY_EXCHANGE_PAYLOAD_H__
+#ifndef SURICATA_DETECT_IKE_KEY_EXCHANGE_PAYLOAD_H
+#define SURICATA_DETECT_IKE_KEY_EXCHANGE_PAYLOAD_H
 
 void DetectIkeKeyExchangeRegister(void);
 
-#endif /* __DETECT_IKE_KEY_EXCHANGE_PAYLOAD_H__ */
+#endif /* SURICATA_DETECT_IKE_KEY_EXCHANGE_PAYLOAD_H */
index 8a17f5530a8560fa172845ded1db9db113dbff0f..dd11cc1388ed06475cf673598029a84854ba90d7 100644 (file)
@@ -20,9 +20,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_NONCE_PAYLOAD_LENGTH_H__
-#define __DETECT_IKE_NONCE_PAYLOAD_LENGTH_H__
+#ifndef SURICATA_DETECT_IKE_NONCE_PAYLOAD_LENGTH_H
+#define SURICATA_DETECT_IKE_NONCE_PAYLOAD_LENGTH_H
 
 void DetectIkeNoncePayloadLengthRegister(void);
 
-#endif /* __DETECT_IKE_NONCE_PAYLOAD_LENGTH_H__ */
+#endif /* SURICATA_DETECT_IKE_NONCE_PAYLOAD_LENGTH_H */
index f0923d877672709bca5effbee9ef3deec38e650f..f705c42395c9e9ef331f92ed50dbdb36f38e19e4 100644 (file)
@@ -20,9 +20,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_NONCE_PAYLOAD_H__
-#define __DETECT_IKE_NONCE_PAYLOAD_H__
+#ifndef SURICATA_DETECT_IKE_NONCE_PAYLOAD_H
+#define SURICATA_DETECT_IKE_NONCE_PAYLOAD_H
 
 void DetectIkeNonceRegister(void);
 
-#endif /* __DETECT_IKE_NONCE_PAYLOAD_H__ */
+#endif /* SURICATA_DETECT_IKE_NONCE_PAYLOAD_H */
index e4ae75d542eb185d7622ed21bae95e8eee01555d..11baf8d62f442480f1f830e7021609c698132999 100644 (file)
@@ -20,9 +20,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_SPI_H__
-#define __DETECT_IKE_SPI_H__
+#ifndef SURICATA_DETECT_IKE_SPI_H
+#define SURICATA_DETECT_IKE_SPI_H
 
 void DetectIkeSpiRegister(void);
 
-#endif /* __DETECT_IKE_SPI_H__ */
+#endif /* SURICATA_DETECT_IKE_SPI_H */
index 2570f91752cac4fadeee03de1ee17a4da88b205b..8b551c3ad87ebd1c2f1c9319950a424a61678037 100644 (file)
@@ -21,9 +21,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __DETECT_IKE_VENDOR_H__
-#define __DETECT_IKE_VENDOR_H__
+#ifndef SURICATA_DETECT_IKE_VENDOR_H
+#define SURICATA_DETECT_IKE_VENDOR_H
 
 void DetectIkeVendorRegister(void);
 
-#endif /* __DETECT_IKE_VENDOR_H__ */
+#endif /* SURICATA_DETECT_IKE_VENDOR_H */
index d9eba7a55e620b96badf4f44d1c217e47e130781..9fd7efd3e1f48ae3663b621f428732b23980ff27 100644 (file)
@@ -21,9 +21,9 @@
  * \author Eric Leblond <el@stamus-networks.com>
  */
 
-#ifndef __DETECT_IPADDR_BUFFER_H__
-#define __DETECT_IPADDR_BUFFER_H__
+#ifndef SURICATA_DETECT_IPADDR_BUFFER_H
+#define SURICATA_DETECT_IPADDR_BUFFER_H
 
 void DetectIPAddrBufferRegister(void);
 
-#endif /* __DETECT_IPADDR_BUFFER_H__ */
+#endif /* SURICATA_DETECT_IPADDR_BUFFER_H */
index a4009252d0b5a9fc04745c9a816c4850ca8872f0..0008a03b03831b14b3a5f57af536efd11f9fa8bf 100644 (file)
@@ -21,9 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_IPOPTS_H__
-#define __DETECT_IPOPTS_H__
-
+#ifndef SURICATA_DETECT_IPOPTS_H
+#define SURICATA_DETECT_IPOPTS_H
 
 /**
  * \struct DetectIpOptsData_
@@ -47,5 +46,4 @@ void DetectIpOptsRegister (void);
 
 const char *IpOptsFlagToString(uint16_t flag);
 
-#endif /*__DETECT_IPOPTS_H__ */
-
+#endif /*SURICATA_DETECT_IPOPTS_H */
index eeac35a5c14b1a936ff9e912ac70dc9b52c81782..0c6affb3ebd1f502a72beadb79e6478711fe74fd 100644 (file)
@@ -21,8 +21,8 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#ifndef __DETECT_IPPROTO_H__
-#define __DETECT_IPPROTO_H__
+#ifndef SURICATA_DETECT_IPPROTO_H
+#define SURICATA_DETECT_IPPROTO_H
 
 /** IPProto Operators */
 #define DETECT_IPPROTO_OP_EQ     '=' /**< "equals" operator (default) */
@@ -44,5 +44,4 @@ typedef struct DetectIPProtoData_ {
 void DetectIPProtoRegister (void);
 void DetectIPProtoRemoveAllSMs(DetectEngineCtx *, Signature *);
 
-#endif /* __DETECT_IPPROTO_H__ */
-
+#endif /* SURICATA_DETECT_IPPROTO_H */
index 07cd5c7f606fbebcdec746fc5575822d2bc26944..35b2ea4b1cfa48a9aeb7d24a73660cdc05c7ed6d 100644 (file)
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_IPREP_H__
-#define __DETECT_IPREP_H__
+#ifndef SURICATA_DETECT_IPREP_H
+#define SURICATA_DETECT_IPREP_H
 
 /* prototypes */
 void DetectIPRepRegister (void);
 
-#endif /* __DETECT_IPREP_H__ */
+#endif /* SURICATA_DETECT_IPREP_H */
index 60b138822921ba584c6edf1c136bcb17e7b4277b..01ea2e304f42172f57cdcf4a1454669c12748643 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_ISDATAAT_H__
-#define __DETECT_ISDATAAT_H__
+#ifndef SURICATA_DETECT_ISDATAAT_H
+#define SURICATA_DETECT_ISDATAAT_H
 
 #define ISDATAAT_RELATIVE   0x01
 #define ISDATAAT_RAWBYTES   0x02
@@ -37,5 +37,4 @@ typedef struct DetectIsdataatData_ {
 /* prototypes */
 void DetectIsdataatRegister (void);
 
-#endif /* __DETECT_ISDATAAT_H__ */
-
+#endif /* SURICATA_DETECT_ISDATAAT_H */
index c8d1092e6bfc93c5951b00d7a009cdfee6433499..9eef3d679675984c5394b9a655fa5176729befae 100644 (file)
  * \author Gerardo Iglesias <iglesiasg@gmail.com>
  */
 
-#ifndef __DETECT_ITYPE_H__
-#define __DETECT_ITYPE_H__
+#ifndef SURICATA_DETECT_ITYPE_H
+#define SURICATA_DETECT_ITYPE_H
 
 /* prototypes */
 void DetectITypeRegister(void);
 
-#endif /* __DETECT_ITYPE_H__ */
+#endif /* SURICATA_DETECT_ITYPE_H */
index 0358c8e1c07e5065e65b7b979977fd92647c7305..2c87e5990f844c57ab32ff219f1507c4c1429f1e 100644 (file)
@@ -21,9 +21,9 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __DETECT_KRB5_CNAME_H__
-#define __DETECT_KRB5_CNAME_H__
+#ifndef SURICATA_DETECT_KRB5_CNAME_H
+#define SURICATA_DETECT_KRB5_CNAME_H
 
 void DetectKrb5CNameRegister(void);
 
-#endif /* __DETECT_KRB5_CNAME_H__ */
+#endif /* SURICATA_DETECT_KRB5_CNAME_H */
index b803e9fb56d2e7bc82f88ff165e87448d8bf3488..4373d706a8182b9e0271471add81e23e6a724765 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __DETECT_KRB5_ERRCODE_H__
-#define __DETECT_KRB5_ERRCODE_H__
+#ifndef SURICATA_DETECT_KRB5_ERRCODE_H
+#define SURICATA_DETECT_KRB5_ERRCODE_H
 
 typedef struct DetectKrb5ErrCodeData_ {
     int32_t err_code;
@@ -30,4 +30,4 @@ typedef struct DetectKrb5ErrCodeData_ {
 
 void DetectKrb5ErrCodeRegister(void);
 
-#endif /* __DETECT_KRB5_ERRCODE_H__ */
+#endif /* SURICATA_DETECT_KRB5_ERRCODE_H */
index 76e8235a11a38f054318dd43c04106a6e5950b45..2be0a579c4520ad1288573216a89fdc172f32780 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __DETECT_KRB5_MSGTYPE_H__
-#define __DETECT_KRB5_MSGTYPE_H__
+#ifndef SURICATA_DETECT_KRB5_MSGTYPE_H
+#define SURICATA_DETECT_KRB5_MSGTYPE_H
 
 typedef struct DetectKrb5MsgTypeData_ {
     uint8_t msg_type;
@@ -30,4 +30,4 @@ typedef struct DetectKrb5MsgTypeData_ {
 
 void DetectKrb5MsgTypeRegister(void);
 
-#endif /* __DETECT_KRB5_MSGTYPE_H__ */
+#endif /* SURICATA_DETECT_KRB5_MSGTYPE_H */
index 4eb52ff01689f9f212fb0b3fbfd24162ab8fde15..75c47f716d2d23e44c3c570b499113e0040f4360 100644 (file)
@@ -21,9 +21,9 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __DETECT_KRB5_SNAME_H__
-#define __DETECT_KRB5_SNAME_H__
+#ifndef SURICATA_DETECT_KRB5_SNAME_H
+#define SURICATA_DETECT_KRB5_SNAME_H
 
 void DetectKrb5SNameRegister(void);
 
-#endif /* __DETECT_KRB5_SNAME_H__ */
+#endif /* SURICATA_DETECT_KRB5_SNAME_H */
index bae81b30ad55bb5e79007a8b5c440008278984b6..57dabd5e5703073f94b121ed3fab6edf7bc797e6 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_KRB5_TICKET_ENCRYPTION_H__
-#define __DETECT_KRB5_TICKET_ENCRYPTION_H__
+#ifndef SURICATA_DETECT_KRB5_TICKET_ENCRYPTION_H
+#define SURICATA_DETECT_KRB5_TICKET_ENCRYPTION_H
 
 void DetectKrb5TicketEncryptionRegister(void);
 
-#endif /* __DETECT_KRB5_TICKET_ENCRYPTION_H__ */
+#endif /* SURICATA_DETECT_KRB5_TICKET_ENCRYPTION_H */
index 447cd95d09256cd4c17e3625f6f68f20d80b65d9..a57dcc45ee7d7e365c963ca6da2c116ae53ea7cf 100644 (file)
  *
  */
 
-#ifndef __DETECT_L3PROTO_H__
-#define __DETECT_L3PROTO_H__
+#ifndef SURICATA_DETECT_L3PROTO_H
+#define SURICATA_DETECT_L3PROTO_H
 
 /**
  * \brief Registration function for ip_proto keyword.
  */
 void DetectL3ProtoRegister (void);
 
-#endif /* __DETECT_L3PROTO_H__ */
+#endif /* SURICATA_DETECT_L3PROTO_H */
index efd9416f1b3e732a8243e04007d18fe2023a684e..24b0e8657edebd61dbb042ac5d7086a515473ba7 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_LUA_EXT_H__
-#define __DETECT_LUA_EXT_H__
+#ifndef SURICATA_DETECT_LUA_EXT_H
+#define SURICATA_DETECT_LUA_EXT_H
 
 #ifdef HAVE_LUA
 int LuaRegisterExtensions(lua_State *);
index dcf99b6c3f43fa726ae355c5b1ab830496c531cf..ae38b026ca1e6aa99cc24e8f51fde82ec71a17b8 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_LUA_H__
-#define __DETECT_LUA_H__
+#ifndef SURICATA_DETECT_LUA_H
+#define SURICATA_DETECT_LUA_H
 
 #ifdef HAVE_LUA
 
@@ -67,4 +67,4 @@ int DetectLuaMatchBuffer(DetectEngineThreadCtx *det_ctx,
 
 void DetectLuaPostSetup(Signature *s);
 
-#endif /* __DETECT_LUA_H__ */
+#endif /* SURICATA_DETECT_LUA_H */
index b8de378fd20d20ee607941f1349097abd8c2c086..05dfd0db0f8b644bdd938bb7093951ba328baac4 100644 (file)
@@ -25,9 +25,8 @@
  * Implements the nfq_set_mark keyword
  */
 
-#ifndef __DETECT_MARK_H__
-#define __DETECT_MARK_H__
-
+#ifndef SURICATA_DETECT_MARK_H
+#define SURICATA_DETECT_MARK_H
 
 /**
  * \struct DetectMarkData_
@@ -50,4 +49,4 @@ typedef struct DetectMarkData_ {
 
 void DetectMarkRegister (void);
 
-#endif /*__DETECT_MARK_H__ */
+#endif /*SURICATA_DETECT_MARK_H */
index fafa63f5ae80ebadd3e417e9904e1979f1d1a247..7a847cc7059187166a426d5fcb6c3b4fe129e1d8 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_METADATA_H__
-#define __DETECT_METADATA_H__
+#ifndef SURICATA_DETECT_METADATA_H
+#define SURICATA_DETECT_METADATA_H
 
 /**
  * \brief Signature metadata list.
@@ -46,5 +46,4 @@ void DetectMetadataRegister (void);
 
 void DetectMetadataFree(DetectMetadata *mdata);
 
-#endif /* __DETECT_METADATA_H__ */
-
+#endif /* SURICATA_DETECT_METADATA_H */
index 9c96ddeef8383f2b16e3cec89a5c118e1e44d6d5..5d0f46609863b11e5d7ad43c9085fb0c2cfa2cb8 100644 (file)
  * \author David DIALLO <diallo@et.esiea.fr>
  */
 
-#ifndef __DETECT_MODBUS_H__
-#define __DETECT_MODBUS_H__
+#ifndef SURICATA_DETECT_MODBUS_H
+#define SURICATA_DETECT_MODBUS_H
 
 /* prototypes */
 void DetectModbusRegister(void);
 
-#endif /* __DETECT_MODBUS_H__ */
+#endif /* SURICATA_DETECT_MODBUS_H */
index 10e0a693222acd2f7e6556a750ef3ad92c821afc..42a7887b27f7f9295d571e9a8d4b33cd4a08e8f4 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNACK_SESSIONPRESENT_H__
-#define __DETECT_MQTT_CONNACK_SESSIONPRESENT_H__
+#ifndef SURICATA_DETECT_MQTT_CONNACK_SESSIONPRESENT_H
+#define SURICATA_DETECT_MQTT_CONNACK_SESSIONPRESENT_H
 
 void DetectMQTTConnackSessionPresentRegister(void);
 
-#endif /* __DETECT_MQTT_CONNACK_SESSIONPRESENT_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNACK_SESSIONPRESENT_H */
index e1a9b966a68e9e5c300edc4cf7ad7e3b8a09a684..691573c8d21ab0f37c2118e2ead46d9fa935953c 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNECT_CLIENTID_H__
-#define __DETECT_MQTT_CONNECT_CLIENTID_H__
+#ifndef SURICATA_DETECT_MQTT_CONNECT_CLIENTID_H
+#define SURICATA_DETECT_MQTT_CONNECT_CLIENTID_H
 
 void DetectMQTTConnectClientIDRegister(void);
 
-#endif /* __DETECT_MQTT_CONNECT_CLIENTID_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNECT_CLIENTID_H */
index 261dbb015ac9a7f6de670b09ef3394b90ce8c74b..2c5588060412ca37b367bcdbf6ccb9a4f3482d80 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNECT_FLAGS_H__
-#define __DETECT_MQTT_CONNECT_FLAGS_H__
+#ifndef SURICATA_DETECT_MQTT_CONNECT_FLAGS_H
+#define SURICATA_DETECT_MQTT_CONNECT_FLAGS_H
 
 void DetectMQTTConnectFlagsRegister(void);
 
-#endif /* __DETECT_MQTT_CONNECT_FLAGS_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNECT_FLAGS_H */
index 6f7ca3517997ce572d6a38d10aa159eb6f182a79..c4b12d94625579ca2db151c3be540616008eb708 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNECT_PASSWORD_H__
-#define __DETECT_MQTT_CONNECT_PASSWORD_H__
+#ifndef SURICATA_DETECT_MQTT_CONNECT_PASSWORD_H
+#define SURICATA_DETECT_MQTT_CONNECT_PASSWORD_H
 
 void DetectMQTTConnectPasswordRegister(void);
 
-#endif /* __DETECT_MQTT_CONNECT_PASSWORD_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNECT_PASSWORD_H */
index 3bbb21ab10d41883947502bbd28c26884b1e098e..0ab324db583f8893817c54ce6d3fad607f1e7365 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNECT_PROTOCOLSTRING_H__
-#define __DETECT_MQTT_CONNECT_PROTOCOLSTRING_H__
+#ifndef SURICATA_DETECT_MQTT_CONNECT_PROTOCOLSTRING_H
+#define SURICATA_DETECT_MQTT_CONNECT_PROTOCOLSTRING_H
 
 void DetectMQTTConnectProtocolStringRegister(void);
 
-#endif /* __DETECT_MQTT_CONNECT_PROTOCOLSTRING_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNECT_PROTOCOLSTRING_H */
index 6dad2ee903de8a38f56184e61bd107994f3ec110..9ae55277d718f00e5c0fed08ea9504f363bd55de 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNECT_USERNAME_H__
-#define __DETECT_MQTT_CONNECT_USERNAME_H__
+#ifndef SURICATA_DETECT_MQTT_CONNECT_USERNAME_H
+#define SURICATA_DETECT_MQTT_CONNECT_USERNAME_H
 
 void DetectMQTTConnectUsernameRegister(void);
 
-#endif /* __DETECT_MQTT_CONNECT_USERNAME_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNECT_USERNAME_H */
index 0b490cc64a465324b515ec7c4fe21af20eccf964..4f62f33712bf66b9cc4b283dafc7c53cc1ce2149 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNECT_WILLMESSAGE_H__
-#define __DETECT_MQTT_CONNECT_WILLMESSAGE_H__
+#ifndef SURICATA_DETECT_MQTT_CONNECT_WILLMESSAGE_H
+#define SURICATA_DETECT_MQTT_CONNECT_WILLMESSAGE_H
 
 void DetectMQTTConnectWillMessageRegister(void);
 
-#endif /* __DETECT_MQTT_CONNECT_WILLMESSAGE_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNECT_WILLMESSAGE_H */
index d018342a6277ffded0a04059521752252006a36a..fa571c1a1c484a8cc177c75a292d4f490a744c46 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_CONNECT_WILLTOPIC_H__
-#define __DETECT_MQTT_CONNECT_WILLTOPIC_H__
+#ifndef SURICATA_DETECT_MQTT_CONNECT_WILLTOPIC_H
+#define SURICATA_DETECT_MQTT_CONNECT_WILLTOPIC_H
 
 void DetectMQTTConnectWillTopicRegister(void);
 
-#endif /* __DETECT_MQTT_CONNECT_WILLTOPIC_H__ */
+#endif /* SURICATA_DETECT_MQTT_CONNECT_WILLTOPIC_H */
index 1486dcf2b66809807521549c50dc58d6c3fecff1..1f792b36e98f0da2a198c4d2bba8824866a436c6 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_FLAGS_H__
-#define __DETECT_MQTT_FLAGS_H__
+#ifndef SURICATA_DETECT_MQTT_FLAGS_H
+#define SURICATA_DETECT_MQTT_FLAGS_H
 
 void DetectMQTTFlagsRegister(void);
 
-#endif /* __DETECT_MQTT_FLAGS_H__ */
+#endif /* SURICATA_DETECT_MQTT_FLAGS_H */
index a069e42a4518902d18809d148da4de361b186634..7f8cac28835869ba3dc6c074f609aa1c7fc2f370 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_PROTOCOL_VERSION_H__
-#define __DETECT_MQTT_PROTOCOL_VERSION_H__
+#ifndef SURICATA_DETECT_MQTT_PROTOCOL_VERSION_H
+#define SURICATA_DETECT_MQTT_PROTOCOL_VERSION_H
 
 void DetectMQTTProtocolVersionRegister(void);
 
-#endif /* __DETECT_MQTT_PROTOCOL_VERSION_H__ */
+#endif /* SURICATA_DETECT_MQTT_PROTOCOL_VERSION_H */
index eea362fdc8644536531437f2f4e6e72c45713d6e..e5b5f0db3554b0aa447ae15780dce4eedcfaf8a8 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_PUBLISH_MESSAGE_H__
-#define __DETECT_MQTT_PUBLISH_MESSAGE_H__
+#ifndef SURICATA_DETECT_MQTT_PUBLISH_MESSAGE_H
+#define SURICATA_DETECT_MQTT_PUBLISH_MESSAGE_H
 
 void DetectMQTTPublishMessageRegister(void);
 
-#endif /* __DETECT_MQTT_PUBLISH_MESSAGE_H__ */
+#endif /* SURICATA_DETECT_MQTT_PUBLISH_MESSAGE_H */
index 674ca8955ca475596570b6b9877733b018cf5e36..aa8225c92233248d46523abd669f51554e8f5028 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_PUBLISH_TOPIC_H__
-#define __DETECT_MQTT_PUBLISH_TOPIC_H__
+#ifndef SURICATA_DETECT_MQTT_PUBLISH_TOPIC_H
+#define SURICATA_DETECT_MQTT_PUBLISH_TOPIC_H
 
 void DetectMQTTPublishTopicRegister(void);
 
-#endif /* __DETECT_MQTT_PUBLISH_TOPIC_H__ */
+#endif /* SURICATA_DETECT_MQTT_PUBLISH_TOPIC_H */
index fda801ab128b211e100a1e335069fc310f46dd65..b96f630ebbdffa0ebe6ac442a77515069a484403 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_QOS_H__
-#define __DETECT_MQTT_QOS_H__
+#ifndef SURICATA_DETECT_MQTT_QOS_H
+#define SURICATA_DETECT_MQTT_QOS_H
 
 void DetectMQTTQosRegister(void);
 
-#endif /* __DETECT_MQTT_QOS_H__ */
+#endif /* SURICATA_DETECT_MQTT_QOS_H */
index c8819ad526ad50e0d2e3b037ebc9dd74b18694a3..ba7f0146bdb18d65238529f8ec353c26c5b2a6a3 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_REASON_CODE_H__
-#define __DETECT_MQTT_REASON_CODE_H__
+#ifndef SURICATA_DETECT_MQTT_REASON_CODE_H
+#define SURICATA_DETECT_MQTT_REASON_CODE_H
 
 void DetectMQTTReasonCodeRegister(void);
 
-#endif /* __DETECT_MQTT_REASON_CODE_H__ */
+#endif /* SURICATA_DETECT_MQTT_REASON_CODE_H */
index 1bb3aa5c5fd5cd60e64e29ba1ddf67b7e21616a6..868188af47169f278c5a8dfc4de7d7259ba84b4f 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_SUBSCRIBE_TOPIC_H__
-#define __DETECT_MQTT_SUBSCRIBE_TOPIC_H__
+#ifndef SURICATA_DETECT_MQTT_SUBSCRIBE_TOPIC_H
+#define SURICATA_DETECT_MQTT_SUBSCRIBE_TOPIC_H
 
 void DetectMQTTSubscribeTopicRegister(void);
 
-#endif /* __DETECT_MQTT_SUBSCRIBE_TOPIC_H__ */
+#endif /* SURICATA_DETECT_MQTT_SUBSCRIBE_TOPIC_H */
index be7b971e341ec7bb07a0ae2fe95f2521fed54626..7139e183debafe59ed3ccb43029a76745d12de5b 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_TYPE_H__
-#define __DETECT_MQTT_TYPE_H__
+#ifndef SURICATA_DETECT_MQTT_TYPE_H
+#define SURICATA_DETECT_MQTT_TYPE_H
 
 void DetectMQTTTypeRegister(void);
 
-#endif /* __DETECT_MQTT_TYPE_H__ */
+#endif /* SURICATA_DETECT_MQTT_TYPE_H */
index d9b5993e825ff7abde07c0819edc53a6c191f630..18e51c33c435c44ef5cbc19a8e95b9926cbf6e74 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __DETECT_MQTT_UNSUBSCRIBE_TOPIC_H__
-#define __DETECT_MQTT_UNSUBSCRIBE_TOPIC_H__
+#ifndef SURICATA_DETECT_MQTT_UNSUBSCRIBE_TOPIC_H
+#define SURICATA_DETECT_MQTT_UNSUBSCRIBE_TOPIC_H
 
 void DetectMQTTUnsubscribeTopicRegister(void);
 
-#endif /* __DETECT_MQTT_UNSUBSCRIBE_TOPIC_H__ */
+#endif /* SURICATA_DETECT_MQTT_UNSUBSCRIBE_TOPIC_H */
index a21d51103524cab9c63c5ed01869835c9c170819..822c2a35505ad9e7654612c6be6b2c20e0c806dc 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_MSG_H__
-#define __DETECT_MSG_H__
+#ifndef SURICATA_DETECT_MSG_H
+#define SURICATA_DETECT_MSG_H
 
 /* prototypes */
 void DetectMsgRegister (void);
 
-#endif /* __DETECT_MSG_H__ */
-
+#endif /* SURICATA_DETECT_MSG_H */
index e7b2256778998e0f8612d5be1531460f82a98e47..a823e1d1aed01f707a9fe98af2224d71c2326cb7 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_NFS_PROCEDURE_H__
-#define __DETECT_NFS_PROCEDURE_H__
+#ifndef SURICATA_DETECT_NFS_PROCEDURE_H
+#define SURICATA_DETECT_NFS_PROCEDURE_H
 
 /* prototypes */
 void DetectNfsProcedureRegister (void);
 
-#endif /* __DETECT_NFS_PROCEDURE_H__ */
+#endif /* SURICATA_DETECT_NFS_PROCEDURE_H */
index 84eda946119bc92d1de6865b91e515b8305f9a04..4b4daa5753449472190a27bc528b67287751deae 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_NFS_VERSION_H__
-#define __DETECT_NFS_VERSION_H__
+#ifndef SURICATA_DETECT_NFS_VERSION_H
+#define SURICATA_DETECT_NFS_VERSION_H
 
 /* prototypes */
 void DetectNfsVersionRegister (void);
 
-#endif /* __DETECT_NFS_VERSION_H__ */
+#endif /* SURICATA_DETECT_NFS_VERSION_H */
index abe39efcb9b982931f64c8e23a8232e3236b02cb..2af04c82330e042f3b158d06eaa06a9d7dd57b42 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_NOALERT_H__
-#define __DETECT_NOALERT_H__
+#ifndef SURICATA_DETECT_NOALERT_H
+#define SURICATA_DETECT_NOALERT_H
 
 /* prototypes */
 void DetectNoalertRegister (void);
 
-#endif /* __DETECT_NOALERT_H__ */
-
+#endif /* SURICATA_DETECT_NOALERT_H */
index 4ba6723eb7f204d5ab94b90e3c6b41df24a47da2..06fffcfb23ee2bb0885c946bf954d5896a12bedd 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_NOCASE_H__
-#define __DETECT_NOCASE_H__
+#ifndef SURICATA_DETECT_NOCASE_H
+#define SURICATA_DETECT_NOCASE_H
 
 /* prototypes */
 void DetectNocaseRegister (void);
 
-#endif /* __DETECT_NOCASE_H__ */
-
+#endif /* SURICATA_DETECT_NOCASE_H */
index 76befe17de3aaa2da562f50d37b355ece5f204a6..a3f3e0012e70dd3447b581a60eacf8514f50ebea 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_OFFSET_H__
-#define __DETECT_OFFSET_H__
+#ifndef SURICATA_DETECT_OFFSET_H
+#define SURICATA_DETECT_OFFSET_H
 
 /* prototypes */
 void DetectOffsetRegister (void);
 
-#endif /* __DETECT_OFFSET_H__ */
-
+#endif /* SURICATA_DETECT_OFFSET_H */
index 900771a3a9e6a3e372ac24e495f32465697d12be..0a993a794f841542ffca9e534f174ddf2548b43b 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_PARSE_H__
-#define __DETECT_PARSE_H__
+#ifndef SURICATA_DETECT_PARSE_H
+#define SURICATA_DETECT_PARSE_H
 
 #include "detect.h"
 #include "detect-engine-mpm.h"
@@ -120,4 +120,4 @@ int SC_Pcre2SubstringCopy(
 int SC_Pcre2SubstringGet(pcre2_match_data *match_data, uint32_t number, PCRE2_UCHAR **bufferptr,
         PCRE2_SIZE *bufflen);
 
-#endif /* __DETECT_PARSE_H__ */
+#endif /* SURICATA_DETECT_PARSE_H */
index 9ac14ab90aa4998d60385c462829d372da81736a..74131ba7db9a2e0718040fbca10ba0c0af49c693 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_PCRE_H__
-#define __DETECT_PCRE_H__
+#ifndef SURICATA_DETECT_PCRE_H
+#define SURICATA_DETECT_PCRE_H
 
 #include "detect-parse.h"
 
@@ -57,5 +57,4 @@ int DetectPcrePayloadMatch(DetectEngineThreadCtx *,
 
 void DetectPcreRegister (void);
 
-#endif /* __DETECT_PCRE_H__ */
-
+#endif /* SURICATA_DETECT_PCRE_H */
index fbaf8b98e6a302e5b05d7a7c3eb9087c56cb2b2e..5c7e5f70e264c14a2a314080883cdc92449165cc 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_PKTDATA_H__
-#define __DETECT_PKTDATA_H__
+#ifndef SURICATA_DETECT_PKTDATA_H
+#define SURICATA_DETECT_PKTDATA_H
 
 /* prototypes */
 void DetectPktDataRegister (void);
 
-#endif /* __DETECT_PKTDATA_H__ */
+#endif /* SURICATA_DETECT_PKTDATA_H */
index ecd0243904a70433ba934d4f98547ea40b6af856..b40b6cdd5223febe8cefc6016fd60382f6b5e7c1 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_PKTVAR_H__
-#define __DETECT_PKTVAR_H__
+#ifndef SURICATA_DETECT_PKTVAR_H
+#define SURICATA_DETECT_PKTVAR_H
 
 typedef struct DetectPktvarData_ {
     uint32_t id;
@@ -34,5 +34,4 @@ typedef struct DetectPktvarData_ {
 /* prototypes */
 void DetectPktvarRegister (void);
 
-#endif /* __DETECT_PKTVAR_H__ */
-
+#endif /* SURICATA_DETECT_PKTVAR_H */
index afc64db43f8f3ffa4cfb4219530460c89a3e2bf0..01cca2e0b0146ae8203612f46d3c9a06ddd123d7 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_PREFILTER_H__
-#define __DETECT_PREFILTER_H__
+#ifndef SURICATA_DETECT_PREFILTER_H
+#define SURICATA_DETECT_PREFILTER_H
 
 /* prototypes */
 void DetectPrefilterRegister (void);
 
-#endif /* __DETECT_PREFILTER_H__ */
+#endif /* SURICATA_DETECT_PREFILTER_H */
index 0ec877e521b8efc241ae48d8e8a9faa2ae0e1a33..96e52b6a73daacece611851fc846500f0ae1d5e0 100644 (file)
  * Implements the priority keyword
  */
 
-#ifndef __DETECT_PRIORITY_H__
-#define __DETECT_PRIORITY_H__
+#ifndef SURICATA_DETECT_PRIORITY_H
+#define SURICATA_DETECT_PRIORITY_H
 
 /* prototypes */
 void DetectPriorityRegister (void);
 
-#endif /* __DETECT_PRIORITY_H__ */
-
+#endif /* SURICATA_DETECT_PRIORITY_H */
index 579f1ca92d9a53bc2add8eddac05729c03828315..c98739e49ab67fb80b447352b2e8c7e5a47bc47f 100644 (file)
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef __DETECT_QUIC_CYU_HASH_H__
-#define __DETECT_QUIC_CYU_HASH_H__
+#ifndef SURICATA_DETECT_QUIC_CYU_HASH_H
+#define SURICATA_DETECT_QUIC_CYU_HASH_H
 
 void DetectQuicCyuHashRegister(void);
 
-#endif /* __DETECT_QUIC_CYU_HASH_H__ */
+#endif /* SURICATA_DETECT_QUIC_CYU_HASH_H */
index b521d4faba1aeed775135f1556f5c2ac6c8e6d0c..33e1439be7a951cb04267b1b82d866daa45c1d53 100644 (file)
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef __DETECT_QUIC_CYU_STRING_H__
-#define __DETECT_QUIC_CYU_STRING_H__
+#ifndef SURICATA_DETECT_QUIC_CYU_STRING_H
+#define SURICATA_DETECT_QUIC_CYU_STRING_H
 
 void DetectQuicCyuStringRegister(void);
 
-#endif /* __DETECT_QUIC_CYU_STRING_H__ */
+#endif /* SURICATA_DETECT_QUIC_CYU_STRING_H */
index 13e590d2c72c35c1eb6dbd09c78ca691982bed7c..7fcccc6d0849c7669cae3b7c3a93f609c34da43f 100644 (file)
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef __DETECT_QUIC_SNI_H__
-#define __DETECT_QUIC_SNI_H__
+#ifndef SURICATA_DETECT_QUIC_SNI_H
+#define SURICATA_DETECT_QUIC_SNI_H
 
 void DetectQuicSniRegister(void);
 
-#endif /* __DETECT_QUIC_SNI_H__ */
+#endif /* SURICATA_DETECT_QUIC_SNI_H */
index bf6e063ac4d82b43d1a58a6dd7a747fb11ace468..40614dbf12bdc29cff9c7c26318f9065af824d03 100644 (file)
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef __DETECT_QUIC_UA_H__
-#define __DETECT_QUIC_UA_H__
+#ifndef SURICATA_DETECT_QUIC_UA_H
+#define SURICATA_DETECT_QUIC_UA_H
 
 void DetectQuicUaRegister(void);
 
-#endif /* __DETECT_QUIC_UA_H__ */
+#endif /* SURICATA_DETECT_QUIC_UA_H */
index c9e3e19c896085f2b0bdb534fae0fbc827e54151..61467d7e085288a1295fed6ce187092dc7143ce9 100644 (file)
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef __DETECT_QUIC_VERSION_H__
-#define __DETECT_QUIC_VERSION_H__
+#ifndef SURICATA_DETECT_QUIC_VERSION_H
+#define SURICATA_DETECT_QUIC_VERSION_H
 
 void DetectQuicVersionRegister(void);
 
-#endif /* __DETECT_QUIC_VERSION_H__ */
+#endif /* SURICATA_DETECT_QUIC_VERSION_H */
index 8716e56a31f096f60ed016695706a6cb5a41f854..243e3fea89bc348d50015c032d35f52ab4b12dc6 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_RAWBYTES_H__
-#define __DETECT_RAWBYTES_H__
+#ifndef SURICATA_DETECT_RAWBYTES_H
+#define SURICATA_DETECT_RAWBYTES_H
 
 /* prototypes */
 void DetectRawbytesRegister (void);
 
-#endif /* __DETECT_RAWBYTES_H__ */
-
+#endif /* SURICATA_DETECT_RAWBYTES_H */
index ddf9233987cbd51b21cb0394955d7947d16c6cee..c2c68f768bfb4b37b1f5b47ac6d5ba3ebd798bdf 100644 (file)
@@ -21,9 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_REFERENCE_H__
-#define __DETECT_REFERENCE_H__
-
+#ifndef SURICATA_DETECT_REFERENCE_H
+#define SURICATA_DETECT_REFERENCE_H
 
 /**
  * \brief Signature reference list.
@@ -47,4 +46,4 @@ void DetectReferenceRegister(void);
  */
 void DetectReferenceFree(DetectReference *);
 
-#endif /*__DETECT_REFERENCE_H__ */
+#endif /*SURICATA_DETECT_REFERENCE_H */
index 4944420527e873587c85e1f6d89e0a99a2e2de4d..b30fb523ff6f2d2ca4c870e799018aef6dd49b72 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __DETECT_REPLACE_H__
-#define __DETECT_REPLACE_H__
+#ifndef SURICATA_DETECT_REPLACE_H
+#define SURICATA_DETECT_REPLACE_H
 
 #include "detect-content.h"
 
index 70f1dc43b814c8d175d5d154a9b58c2eeb50462f..cf625ab32e21562358cfc7f74897adee3743ef54 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_REQUIRES_H__
-#define __DETECT_REQUIRES_H__
+#ifndef SURICATA_DETECT_REQUIRES_H
+#define SURICATA_DETECT_REQUIRES_H
 
 void DetectRequiresRegister(void);
 
-#endif /* __DETECT_REQUIRES_H__ */
+#endif /* SURICATA_DETECT_REQUIRES_H */
index 24ae202f127488d8a144535f6020eb55f4b219cf..50e0c3a3b9486c0c6ad3f8162e04d55681f05806 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_REV_H__
-#define __DETECT_REV_H__
+#ifndef SURICATA_DETECT_REV_H
+#define SURICATA_DETECT_REV_H
 
 /* prototypes */
 void DetectRevRegister (void);
 
-#endif /* __DETECT_REV_H__ */
-
+#endif /* SURICATA_DETECT_REV_H */
index 0627eeda226bc8fd05d1dea397e47c58b7776676..70a8a60b91d8935eeb5a3cd54fb55a9139779f11 100644 (file)
@@ -21,9 +21,9 @@
  * \author Frank Honza
  */
 
-#ifndef __DETECT_RFB_NAME_H__
-#define __DETECT_RFB_NAME_H__
+#ifndef SURICATA_DETECT_RFB_NAME_H
+#define SURICATA_DETECT_RFB_NAME_H
 
 void DetectRfbNameRegister(void);
 
-#endif /* __DETECT_RFB_NAME_H__ */
+#endif /* SURICATA_DETECT_RFB_NAME_H */
index d3e296d8e4aaa2d95956271f0f0b1d5f5e4585c7..74c70c748eedad0b085d038597a386a4b86ab067 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha.steinbiss@dcso.de>
  */
 
-#ifndef __DETECT_RFB_SECRESULT_H__
-#define __DETECT_RFB_SECRESULT_H__
+#ifndef SURICATA_DETECT_RFB_SECRESULT_H
+#define SURICATA_DETECT_RFB_SECRESULT_H
 
 void DetectRfbSecresultRegister(void);
 
-#endif /*__DETECT_RFB_SECRESULT_H__ */
+#endif /*SURICATA_DETECT_RFB_SECRESULT_H */
index 15a1f801de10e747ff6d3aa1b2ec66d55c25f84e..e2860a355828de3eacdbf6a6133b5def457bdc51 100644 (file)
@@ -21,9 +21,9 @@
  * \author Sascha Steinbiss <sascha.steinbiss@dcso.de>
  */
 
-#ifndef __DETECT_RFB_SECTYPE_H__
-#define __DETECT_RFB_SECTYPE_H__
+#ifndef SURICATA_DETECT_RFB_SECTYPE_H
+#define SURICATA_DETECT_RFB_SECTYPE_H
 
 void DetectRfbSectypeRegister(void);
 
-#endif /* __DETECT_RFB_SECTYPE_H__ */
+#endif /* SURICATA_DETECT_RFB_SECTYPE_H */
index 4b4e60b1603dbf69d9005b98c121badce5484463..851c757a7cd06fa6b1851b220ab232e69a35713b 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_RPC_H__
-#define __DETECT_RPC_H__
+#ifndef SURICATA_DETECT_RPC_H
+#define SURICATA_DETECT_RPC_H
 
 /* At least we check the program, the version is optional,
  * and the procedure is optional if we are checking the version.
@@ -51,5 +51,4 @@ typedef struct DetectRpcData_ {
 /* prototypes */
 void DetectRpcRegister (void);
 
-#endif /* __DETECT_RPC_H__ */
-
+#endif /* SURICATA_DETECT_RPC_H */
index ef6b54b605639bcfa086b6ca7ed8458ac0635c45..0dfee45d427e1d9205964e0b789d8733a9d47e59 100644 (file)
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#ifndef __DETECT_SAMEIP_H__
-#define __DETECT_SAMEIP_H__
+#ifndef SURICATA_DETECT_SAMEIP_H
+#define SURICATA_DETECT_SAMEIP_H
 
 /* prototypes */
 void DetectSameipRegister(void);
 
-#endif /* __DETECT_SAMEIP_H__ */
+#endif /* SURICATA_DETECT_SAMEIP_H */
index f7389d105ded83f3c44abf1f197c386425690e6c..076ec35245ed34cc9471345b4de426dd520af685 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_SID_H__
-#define __DETECT_SID_H__
+#ifndef SURICATA_DETECT_SID_H
+#define SURICATA_DETECT_SID_H
 
 /* prototypes */
 void DetectSidRegister (void);
 
-#endif /* __DETECT_SID_H__ */
-
+#endif /* SURICATA_DETECT_SID_H */
index 512c752acf4db956abf06b794dc329beceeac7c2..acc7d85200e56787d1cc27acbd0c766f3b53e30b 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __DETECT_SIP_METHOD_H__
-#define __DETECT_SIP_METHOD_H__
+#ifndef SURICATA_DETECT_SIP_METHOD_H
+#define SURICATA_DETECT_SIP_METHOD_H
 
 void DetectSipMethodRegister(void);
 
-#endif /* __DETECT_SIP_METHOD_H__ */
+#endif /* SURICATA_DETECT_SIP_METHOD_H */
index ca8f228d35024c0a1c01ee9ccfaaa4452e3dbe2f..e4ac75be80fe1f32378aa4d148178d726ca655c2 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __DETECT_SIP_PROTOCOL_H__
-#define __DETECT_SIP_PROTOCOL_H__
+#ifndef SURICATA_DETECT_SIP_PROTOCOL_H
+#define SURICATA_DETECT_SIP_PROTOCOL_H
 
 void DetectSipProtocolRegister(void);
 
-#endif /* __DETECT_SIP_PROTOCOL_H__ */
+#endif /* SURICATA_DETECT_SIP_PROTOCOL_H */
index 88efffa28cf344ca869f0d64fd8da0b80a707582..01e2438520919a568b1b8091b324c1477bb6c078 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __DETECT_SIP_REQUEST_LINE_H__
-#define __DETECT_SIP_REQUEST_LINE_H__
+#ifndef SURICATA_DETECT_SIP_REQUEST_LINE_H
+#define SURICATA_DETECT_SIP_REQUEST_LINE_H
 
 void DetectSipRequestLineRegister(void);
 
-#endif /* __DETECT_SIP_REQUEST_LINE_H__ */
+#endif /* SURICATA_DETECT_SIP_REQUEST_LINE_H */
index b9dcc9a8f456dcb62ccc23e5feb8c2ed20d94b67..8541140021f5c62e555515dec536cd898d3306ae 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __DETECT_SIP_RESPONSE_LINE_H__
-#define __DETECT_SIP_RESPONSE_LINE_H__
+#ifndef SURICATA_DETECT_SIP_RESPONSE_LINE_H
+#define SURICATA_DETECT_SIP_RESPONSE_LINE_H
 
 void DetectSipResponseLineRegister(void);
 
-#endif /* __DETECT_SIP_RESPONSE_LINE_H__ */
+#endif /* SURICATA_DETECT_SIP_RESPONSE_LINE_H */
index 21a49575f24c355936a5c66b37b1d8fea2151330..31cacdaa7a7ebe24108424e5b92a730edb625693 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __DETECT_SIP_STAT_CODE_H__
-#define __DETECT_SIP_STAT_CODE_H__
+#ifndef SURICATA_DETECT_SIP_STAT_CODE_H
+#define SURICATA_DETECT_SIP_STAT_CODE_H
 
 void DetectSipStatCodeRegister(void);
 
-#endif /* __DETECT_SIP_STAT_CODE_H__ */
+#endif /* SURICATA_DETECT_SIP_STAT_CODE_H */
index 29b2e21515ec097cafeae9323b510ba718858c18..9d35fb37336e895e829760a33b070d083aad1d64 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __DETECT_SIP_STAT_MSG_H__
-#define __DETECT_SIP_STAT_MSG_H__
+#ifndef SURICATA_DETECT_SIP_STAT_MSG_H
+#define SURICATA_DETECT_SIP_STAT_MSG_H
 
 void DetectSipStatMsgRegister(void);
 
-#endif /* __DETECT_SIP_STAT_MSG_H__ */
+#endif /* SURICATA_DETECT_SIP_STAT_MSG_H */
index 1614205fe3592ec86fe1babb9a3ec4576644c81e..4e9f3eee81a32d1b14176ca952d2bfae86e58731 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __DETECT_SIP_URI_H__
-#define __DETECT_SIP_URI_H__
+#ifndef SURICATA_DETECT_SIP_URI_H
+#define SURICATA_DETECT_SIP_URI_H
 
 void DetectSipUriRegister(void);
 
-#endif /* __DETECT_SIP_URI_H__ */
+#endif /* SURICATA_DETECT_SIP_URI_H */
index a3eaf212a940994a31fb514710ced0c2a5532fec..46342d59759333fc2a2f06161827a25e9f1d62f1 100644 (file)
  * \author Eric Leblond <el@stamus-networks.com>
  */
 
-#ifndef __DETECT_SMB_NTLMSSP_H__
-#define __DETECT_SMB_NTLMSSP_H__
+#ifndef SURICATA_DETECT_SMB_NTLMSSP_H
+#define SURICATA_DETECT_SMB_NTLMSSP_H
 
 void DetectSmbNtlmsspUserRegister(void);
 void DetectSmbNtlmsspDomainRegister(void);
 
-#endif /* __DETECT_SMB_NTLMSSP_H__ */
+#endif /* SURICATA_DETECT_SMB_NTLMSSP_H */
index a5e5be93c9ab857e735cf8c6cd7423aea35d861c..a80df8d39c5329ad6b813e1734e12f7f63fb698b 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_SMB_NAMED_PIPE_H__
-#define __DETECT_SMB_NAMED_PIPE_H__
+#ifndef SURICATA_DETECT_SMB_NAMED_PIPE_H
+#define SURICATA_DETECT_SMB_NAMED_PIPE_H
 
 void DetectSmbNamedPipeRegister(void);
 void DetectSmbShareRegister(void);
 
-#endif /* __DETECT_SMB_NAMED_PIPE_H__ */
+#endif /* SURICATA_DETECT_SMB_NAMED_PIPE_H */
index 11bdb1feae2680ba3c4facbddbd543db6548a46a..4d4e12b737392a800858e93a49a92bb6732c0ff6 100644 (file)
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_SMB_VERSION_H__
-#define __DETECT_SMB_VERSION_H__
+#ifndef SURICATA_DETECT_SMB_VERSION_H
+#define SURICATA_DETECT_SMB_VERSION_H
 
 /** \brief registers the keyword into the engine. Called from
  *         detect.c::SigTableSetup() */
 void DetectSmbVersionRegister(void);
 
-#endif /* __DETECT_SMB_VERSION_H__ */
\ No newline at end of file
+#endif /* SURICATA_DETECT_SMB_VERSION_H */
\ No newline at end of file
index 11de2abbf99ab9ad19bea883155bacdc59751ac1..082d9c1970f64719bdf5feb6b48fa1121fcd8f7a 100644 (file)
  * \author FirstName LastName <yourname@domain>
  */
 
-#ifndef __DETECT_SNMP_COMMUNITY_H__
-#define __DETECT_SNMP_COMMUNITY_H__
-
+#ifndef SURICATA_DETECT_SNMP_COMMUNITY_H
+#define SURICATA_DETECT_SNMP_COMMUNITY_H
 
 void DetectSNMPCommunityRegister(void);
 
-#endif /* __DETECT_SNMP_COMMUNITY_H__ */
+#endif /* SURICATA_DETECT_SNMP_COMMUNITY_H */
index 5197885a588b5daa74e059cf4a9eae23e321e18a..a01dc98d458008dfaa2854e9eb547463263e32b9 100644 (file)
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __DETECT_SNMP_PDU_TYPE_H__
-#define __DETECT_SNMP_PDU_TYPE_H__
-
+#ifndef SURICATA_DETECT_SNMP_PDU_TYPE_H
+#define SURICATA_DETECT_SNMP_PDU_TYPE_H
 
 void DetectSNMPPduTypeRegister(void);
 
-#endif /* __DETECT_SNMP_PDU_TYPE_H__ */
+#endif /* SURICATA_DETECT_SNMP_PDU_TYPE_H */
index 9f202e13d2a2ee654aebb01f2e59442483e5cf4e..9c86dad807b7b38081a3f31395078d36def95a99 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_SNMP_USM_H__
-#define __DETECT_SNMP_USM_H__
+#ifndef SURICATA_DETECT_SNMP_USM_H
+#define SURICATA_DETECT_SNMP_USM_H
 
 void DetectSNMPUsmRegister(void);
 
-#endif /* __DETECT_SNMP_USM_H__ */
+#endif /* SURICATA_DETECT_SNMP_USM_H */
index 3c8d5915d82eb8dc21b11ac00f60f09af455c3e7..cd71b59a245ccf3f8ed359149e7d8b9a6b7c7daf 100644 (file)
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __DETECT_SNMP_VERSION_H__
-#define __DETECT_SNMP_VERSION_H__
-
+#ifndef SURICATA_DETECT_SNMP_VERSION_H
+#define SURICATA_DETECT_SNMP_VERSION_H
 
 void DetectSNMPVersionRegister(void);
 
-#endif /* __DETECT_SNMP_VERSION_H__ */
+#endif /* SURICATA_DETECT_SNMP_VERSION_H */
index 4c2adbb097de61952a748e15991c1afe1886c069..925582a4a2f33cd21076d5e900be8153e4a14d52 100644 (file)
  * \author Malakhatko Vadym <v.malakhatko@sirinsoftware.com>
  */
 
-#ifndef __DETECT_SSH_HASSH_SERVER_STRING_H__
-#define __DETECT_SSH_HASSH_SERVER_STRING_H__
+#ifndef SURICATA_DETECT_SSH_HASSH_SERVER_STRING_H
+#define SURICATA_DETECT_SSH_HASSH_SERVER_STRING_H
 
 /* prototypes */
 void DetectSshHasshServerStringRegister (void);
 
-#endif /* __DETECT_SSH_HASSH_SERVER_STRING_H__ */
+#endif /* SURICATA_DETECT_SSH_HASSH_SERVER_STRING_H */
index 6be1055ae1599c0a3dd2f2283b6507c31b47c3a3..12bd96d7a0c74823b130680f07e0e5c58f3b937c 100644 (file)
  * \author Malakhatko Vadym <v.malakhatko@sirinsoftware.com>
  */
 
-#ifndef __DETECT_SSH_HASSH_SERVER_H__
-#define  __DETECT_SSH_HASSH_SERVER_H__
+#ifndef SURICATA_DETECT_SSH_HASSH_SERVER_H
+#define SURICATA_DETECT_SSH_HASSH_SERVER_H
 
 /* prototypes */
 void DetectSshHasshServerRegister (void);
 
-#endif /*  __DETECT_SSH_HASSH_SERVER_H__ */
-
+#endif /*  SURICATA_DETECT_SSH_HASSH_SERVER_H */
index b3cebcd709c77a01f9d5ecb88ee34b2dcd53617d..b72a8acf80f95949020f026f65e5fc004181714e 100644 (file)
  * \author Vadym Malakhatko <v.malakhatko@sirinsoftware.com>
  */
 
-#ifndef __DETECT_SSH_HASSH_STRING_H__
-#define __DETECT_SSH_HASSH_STRING_H__
+#ifndef SURICATA_DETECT_SSH_HASSH_STRING_H
+#define SURICATA_DETECT_SSH_HASSH_STRING_H
 
 /* prototypes */
 void DetectSshHasshStringRegister (void);
 
-#endif /* __DETECT_SSH_HASSH_STRING_H__ */
+#endif /* SURICATA_DETECT_SSH_HASSH_STRING_H */
index 07eb091258c0e88cae8e2d3a8723f5570e602e1b..fdf314400b093a774644a6b5ecfea27ce49a13a3 100644 (file)
  * \author Malakhatko Vadym <v.malakhatko@sirinsoftware.com>
  */
 
-#ifndef __DETECT_SSH_HASSH_H__
-#define __DETECT_SSH_HASSH_H__
+#ifndef SURICATA_DETECT_SSH_HASSH_H
+#define SURICATA_DETECT_SSH_HASSH_H
 
 /* prototypes */
 void DetectSshHasshRegister (void);
 
-#endif /* __DETECT_SSH_HASSH_H__ */
+#endif /* SURICATA_DETECT_SSH_HASSH_H */
index a4c8eddbbe348c799e08940e4d3236237f3e452a..eade10a716eb35723b9914675e1a374ea6687bcf 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_SSH_VERSION_H__
-#define __DETECT_SSH_VERSION_H__
+#ifndef SURICATA_DETECT_SSH_VERSION_H
+#define SURICATA_DETECT_SSH_VERSION_H
 
 /** proto version 1.99 is considered proto version 2 */
 #define SSH_FLAG_PROTOVERSION_2_COMPAT 0x01
@@ -36,5 +36,4 @@ typedef struct DetectSshVersionData_ {
 /* prototypes */
 void DetectSshVersionRegister (void);
 
-#endif /* __DETECT_SSH_VERSION_H__ */
-
+#endif /* SURICATA_DETECT_SSH_VERSION_H */
index b04476e3c874235f87fa0b91c511bde29aad4124..e97b80eb29a675a613817251540a4d1b21dce0b8 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_SSH_PROTOCOL_H__
-#define __DETECT_SSH_PROTOCOL_H__
+#ifndef SURICATA_DETECT_SSH_PROTOCOL_H
+#define SURICATA_DETECT_SSH_PROTOCOL_H
 
 void DetectSshProtocolRegister(void);
 
-#endif /* __DETECT_SSH_PROTOCOL_H__ */
+#endif /* SURICATA_DETECT_SSH_PROTOCOL_H */
index 7cf31116773153b641c08374b7c08a6842ae3f80..6ed97e6f22519b2bbe7ba92ca36ff7330509b3d7 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __DETECT_SSH_SOFTWARE_VERSION_H__
-#define __DETECT_SSH_SOFTWARE_VERSION_H__
+#ifndef SURICATA_DETECT_SSH_SOFTWARE_VERSION_H
+#define SURICATA_DETECT_SSH_SOFTWARE_VERSION_H
 
 typedef struct DetectSshSoftwareVersionData_ {
     uint8_t *software_ver; /** ssh version to match */
@@ -32,5 +32,4 @@ typedef struct DetectSshSoftwareVersionData_ {
 /* prototypes */
 void DetectSshSoftwareVersionRegister(void);
 
-#endif /* __DETECT_SSH_SOFTWARE_VERSION_H__ */
-
+#endif /* SURICATA_DETECT_SSH_SOFTWARE_VERSION_H */
index a741b87316a31eff3cb2fca7f0bd2dddabdf233b..79e77cca4866d19ab68ed6dcb1d5b758898a5f3f 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_SSH_SOFTWARE_H__
-#define __DETECT_SSH_SOFTWARE_H__
+#ifndef SURICATA_DETECT_SSH_SOFTWARE_H
+#define SURICATA_DETECT_SSH_SOFTWARE_H
 
 void DetectSshSoftwareRegister(void);
 
-#endif /* __DETECT_SSH_SOFTWARE_H__ */
+#endif /* SURICATA_DETECT_SSH_SOFTWARE_H */
index 0a03584b610ca9866dc7e35c5567728e8971f90f..fa0c3aa4aa52db78661ad6b752a2b03b52942bb5 100644 (file)
@@ -22,8 +22,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_TAG_H__
-#define __DETECT_TAG_H__
+#ifndef SURICATA_DETECT_TAG_H
+#define SURICATA_DETECT_TAG_H
 
 #include "suricata-common.h"
 
@@ -98,5 +98,4 @@ void DetectTagRegister(void);
 void DetectTagDataFree(struct DetectEngineCtx_ *, void *ptr);
 void DetectTagDataListFree(void *ptr);
 
-#endif /* __DETECT_TAG_H__ */
-
+#endif /* SURICATA_DETECT_TAG_H */
index 8c4e5c215ee0e7cffbec9556f5190afeb54e63b9..486dd2e713e128c858a557643eb88625f60dc609 100644 (file)
@@ -21,9 +21,9 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __DETECT_TARGET_H__
-#define __DETECT_TARGET_H__
+#ifndef SURICATA_DETECT_TARGET_H
+#define SURICATA_DETECT_TARGET_H
 
 void DetectTargetRegister(void);
 
-#endif /* __DETECT_TARGET_H__ */
+#endif /* SURICATA_DETECT_TARGET_H */
index e1bb7c710c77f125e345f4239877a55962422349..396f0369fe7251255416dab15d4b7cf618785efb 100644 (file)
@@ -21,8 +21,8 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#ifndef __DETECT_ACK_H__
-#define __DETECT_ACK_H__
+#ifndef SURICATA_DETECT_ACK_H
+#define SURICATA_DETECT_ACK_H
 
 /**
  * \brief ack data
@@ -36,4 +36,4 @@ typedef struct DetectAckData_ {
  */
 void DetectAckRegister(void);
 
-#endif /* __DETECT_ACK_H__ */
+#endif /* SURICATA_DETECT_ACK_H */
index e5920b9c55557fc85d87fcfe12a67b74b9c6f4c7..6fb7e6b0b772b295cb410c470fd4e2743a386165 100644 (file)
@@ -21,9 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_FLAGS_H__
-#define __DETECT_FLAGS_H__
-
+#ifndef SURICATA_DETECT_FLAGS_H
+#define SURICATA_DETECT_FLAGS_H
 
 /**
  * \struct DetectFlagsData_
@@ -50,4 +49,4 @@ void DetectFlagsRegister (void);
 int DetectFlagsSignatureNeedsSynPackets(const Signature *s);
 int DetectFlagsSignatureNeedsSynOnlyPackets(const Signature *s);
 
-#endif /*__DETECT_FLAGS_H__ */
+#endif /*SURICATA_DETECT_FLAGS_H */
index 688b6c2c39da832c91898a623620f66e158ce191..a6e88d724292f931e23923ecf5a11e75a7fa640e 100644 (file)
@@ -21,8 +21,8 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#ifndef __DETECT_SEQ_H__
-#define __DETECT_SEQ_H__
+#ifndef SURICATA_DETECT_SEQ_H
+#define SURICATA_DETECT_SEQ_H
 
 /**
  * \brief seq data
@@ -36,4 +36,4 @@ typedef struct DetectSeqData_ {
  */
 void DetectSeqRegister(void);
 
-#endif /* __DETECT_SEQ_H__ */
+#endif /* SURICATA_DETECT_SEQ_H */
index 51f85398dbe51559807bd99fd2b10723708c105a..7178f5ea7936857c0a50d0c734b8cb3c74ac0cf7 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_WINDOW_H__
-#define __DETECT_WINDOW_H__
+#ifndef SURICATA_DETECT_WINDOW_H
+#define SURICATA_DETECT_WINDOW_H
 
 typedef struct DetectWindowData_ {
     uint8_t negated;   /** negated? 1=True : 0=False */
@@ -26,4 +26,4 @@ typedef struct DetectWindowData_ {
 /* prototypes */
 void DetectWindowRegister (void);
 
-#endif /* __DETECT_WINDOW_H__ */
+#endif /* SURICATA_DETECT_WINDOW_H */
index 5e24a97f19dc3ac586d0d8603dedb2f4d23d0a29..3713ac4c4c716681a5bda7ea30dac579cc314a8c 100644 (file)
@@ -21,9 +21,9 @@
  * \author FirstName LastName <yourname@domain>
  */
 
-#ifndef __DETECT_TEMPLATE_RUST_BUFFER_H__
-#define __DETECT_TEMPLATE_RUST_BUFFER_H__
+#ifndef SURICATA_DETECT_TEMPLATE_RUST_BUFFER_H
+#define SURICATA_DETECT_TEMPLATE_RUST_BUFFER_H
 
 void DetectTemplateRustBufferRegister(void);
 
-#endif /* __DETECT_TEMPLATE_RUST_BUFFER_H__ */
+#endif /* SURICATA_DETECT_TEMPLATE_RUST_BUFFER_H */
index 2d72c84aab6e2e8c446af2ea5cb78e313edb736d..9d510804a361af1fa8c2e3b7b3384a01be7f4040 100644 (file)
@@ -21,8 +21,8 @@
  * \author XXX Yourname <youremail@yourdomain>
  */
 
-#ifndef __DETECT_TEMPLATE_H__
-#define __DETECT_TEMPLATE_H__
+#ifndef SURICATA_DETECT_TEMPLATE_H
+#define SURICATA_DETECT_TEMPLATE_H
 
 /** Per keyword data. This is set up by the DetectTemplateSetup() function.
  *  Each signature will have an instance of DetectTemplateData per occurrence
@@ -38,4 +38,4 @@ typedef struct DetectTemplateData_ {
  *         detect.c::SigTableSetup() */
 void DetectTemplateRegister(void);
 
-#endif /* __DETECT_TEMPLATE_H__ */
+#endif /* SURICATA_DETECT_TEMPLATE_H */
index 751c0e1ac7626c43b7f20a87c5df1b73a5824a7f..2648feb0e4ce20bf57e0d8fa36e823f57ffb5bd0 100644 (file)
@@ -21,9 +21,8 @@
  * \author Breno Silva <breno.silva@gmail.com>
  */
 
-#ifndef __DETECT_THRESHOLD_H__
-#define __DETECT_THRESHOLD_H__
-
+#ifndef SURICATA_DETECT_THRESHOLD_H
+#define SURICATA_DETECT_THRESHOLD_H
 
 #define TYPE_LIMIT     1
 #define TYPE_BOTH      2
@@ -84,4 +83,4 @@ typedef struct DetectThresholdEntry_ {
 void DetectThresholdRegister(void);
 DetectThresholdData *DetectThresholdDataCopy(DetectThresholdData *);
 
-#endif /*__DETECT_THRESHOLD_H__ */
+#endif /*SURICATA_DETECT_THRESHOLD_H */
index 9e39e0706bb511e9d8a95ab589e2b37d4ace26e1..077ea3e657c02573b731d48e573ae5cc1ff15891 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_CERT_FINGERPRINT_H__
-#define __DETECT_TLS_CERT_FINGERPRINT_H__
+#ifndef SURICATA_DETECT_TLS_CERT_FINGERPRINT_H
+#define SURICATA_DETECT_TLS_CERT_FINGERPRINT_H
 
 /* prototypes */
 void DetectTlsFingerprintRegister(void);
 
-#endif /* __DETECT_TLS_CERT_FINGERPRINT_H__ */
+#endif /* SURICATA_DETECT_TLS_CERT_FINGERPRINT_H */
index fdfda510da260ce4879627796d5bd6ab6ddbc7e7..6414c88add531ab82375df50cee9f3f0c0ae47dd 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_ISSUER_H__
-#define __DETECT_TLS_ISSUER_H__
-
+#ifndef SURICATA_DETECT_TLS_ISSUER_H
+#define SURICATA_DETECT_TLS_ISSUER_H
 
 void DetectTlsIssuerRegister(void);
 
-#endif /* __DETECT_TLS_ISSUER_H__ */
+#endif /* SURICATA_DETECT_TLS_ISSUER_H */
index 9fe018e9087269cd0d1389b77a260247fa5f9794..d3fe355cbd8d2615448fcec2857b499af56f62d4 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_CERT_SERIAL_H__
-#define __DETECT_TLS_CERT_SERIAL_H__
+#ifndef SURICATA_DETECT_TLS_CERT_SERIAL_H
+#define SURICATA_DETECT_TLS_CERT_SERIAL_H
 
 /* prototypes */
 void DetectTlsSerialRegister (void);
 
-#endif /* __DETECT_TLS_CERT_SERIAL_H__ */
+#endif /* SURICATA_DETECT_TLS_CERT_SERIAL_H */
index 23f3e77859c78f8312afb9b9c23f065c75efe86d..ba16e11bf288fbc3bab7434eac4c61e7c5c7aaf2 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_SUBJECT_H__
-#define __DETECT_TLS_SUBJECT_H__
-
+#ifndef SURICATA_DETECT_TLS_SUBJECT_H
+#define SURICATA_DETECT_TLS_SUBJECT_H
 
 void DetectTlsSubjectRegister(void);
 
-#endif /* __DETECT_TLS_SUBJECT_H__ */
+#endif /* SURICATA_DETECT_TLS_SUBJECT_H */
index 256be6b4b2b53797f858f4507afe7bd794f26485..f0e6d7efe7ab089bd61a166426ff2fd9e439aa21 100644 (file)
@@ -21,8 +21,8 @@
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_VALIDITY_H__
-#define __DETECT_TLS_VALIDITY_H__
+#ifndef SURICATA_DETECT_TLS_VALIDITY_H
+#define SURICATA_DETECT_TLS_VALIDITY_H
 
 #define DETECT_TLS_VALIDITY_EQ (1)    /* equal */
 #define DETECT_TLS_VALIDITY_LT (1<<1) /* less than */
@@ -48,4 +48,4 @@ typedef struct DetectTlsValidityData_ {
 /* prototypes */
 void DetectTlsValidityRegister (void);
 
-#endif /* __DETECT_TLS_VALIDITY_H__ */
+#endif /* SURICATA_DETECT_TLS_VALIDITY_H */
index 1dde64ddd727a69463fc07017d18e5f85bc1a875..08fd7d8582671c52c1a23c6f2591aa47cc5a1b91 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_CERTS_H__
-#define __DETECT_TLS_CERTS_H__
+#ifndef SURICATA_DETECT_TLS_CERTS_H
+#define SURICATA_DETECT_TLS_CERTS_H
 
 void DetectTlsCertsRegister(void);
 void DetectTlsCertChainLenRegister(void);
 
-#endif /* __DETECT_TLS_CERTS_H__ */
+#endif /* SURICATA_DETECT_TLS_CERTS_H */
index 556896d4b41bec26a2058e425db236f2e85fe26b..b9f62f159e28983cd19505c1722144067d8b3f86 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_JA3_HASH_H__
-#define __DETECT_TLS_JA3_HASH_H__
+#ifndef SURICATA_DETECT_TLS_JA3_HASH_H
+#define SURICATA_DETECT_TLS_JA3_HASH_H
 
 /* Prototypes */
 void DetectTlsJa3HashRegister(void);
 
-#endif /* __DETECT_TLS_JA3_HASH_H__ */
+#endif /* SURICATA_DETECT_TLS_JA3_HASH_H */
index b4a4d5e0acf2f5cdf108da7e758b97f15a1cd5e0..0d8ffdc4a09f60290a57c07b52070633b155ccf8 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_JA3_STRING_H__
-#define __DETECT_TLS_JA3_STRING_H__
+#ifndef SURICATA_DETECT_TLS_JA3_STRING_H
+#define SURICATA_DETECT_TLS_JA3_STRING_H
 
 /* Prototypes */
 void DetectTlsJa3StringRegister(void);
 
-#endif /* __DETECT_TLS_JA3_STRING_H__ */
+#endif /* SURICATA_DETECT_TLS_JA3_STRING_H */
index 21854630085d0d1454c989a8d764cd86503a0d74..407ffd2c68c7d6268c7baf7e9e93c04c3394f92f 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_JA3S_HASH_H__
-#define __DETECT_TLS_JA3S_HASH_H__
+#ifndef SURICATA_DETECT_TLS_JA3S_HASH_H
+#define SURICATA_DETECT_TLS_JA3S_HASH_H
 
 /* Prototypes */
 void DetectTlsJa3SHashRegister(void);
 
-#endif /* __DETECT_TLS_JA3S_HASH_H__ */
+#endif /* SURICATA_DETECT_TLS_JA3S_HASH_H */
index 25a57aabdad9de5a86cc05e4c0c8851ce56f6fd8..76badcf75add874f70424986990a51b88370924f 100644 (file)
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_JA3S_STRING_H__
-#define __DETECT_TLS_JA3S_STRING_H__
+#ifndef SURICATA_DETECT_TLS_JA3S_STRING_H
+#define SURICATA_DETECT_TLS_JA3S_STRING_H
 
 /* Prototypes */
 void DetectTlsJa3SStringRegister(void);
 
-#endif /* __DETECT_TLS_JA3S_STRING_H__ */
+#endif /* SURICATA_DETECT_TLS_JA3S_STRING_H */
index 4460a05749cf9fb3d00f1e56336b0780065a0d5f..41787a4423413234c7d2e8547e7ff5fd959d7aeb 100644 (file)
  * 02110-1301, USA.
  */
 
-#ifndef __DETECT_TLS_RANDOM_H__
-#define __DETECT_TLS_RANDOM_H__
+#ifndef SURICATA_DETECT_TLS_RANDOM_H
+#define SURICATA_DETECT_TLS_RANDOM_H
 
 void DetectTlsRandomTimeRegister(void);
 void DetectTlsRandomBytesRegister(void);
 void DetectTlsRandomRegister(void);
 
-#endif /* __DETECT_TLS_RANDOM_H__ */
+#endif /* SURICATA_DETECT_TLS_RANDOM_H */
index 0ecf1024e9992492f6e583b4119c5e72f5938403..7da1be860f73d6f41074624b628c389fbc4b749a 100644 (file)
@@ -21,9 +21,9 @@
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __DETECT_TLS_SNI_H__
-#define __DETECT_TLS_SNI_H__
+#ifndef SURICATA_DETECT_TLS_SNI_H
+#define SURICATA_DETECT_TLS_SNI_H
 
 void DetectTlsSniRegister(void);
 
-#endif /* __DETECT_TLS_SNI_H__ */
+#endif /* SURICATA_DETECT_TLS_SNI_H */
index fa808f39409d807a67914f09c67c741b9ce8d8ae..eabb6b57aeb5e80e92288ebe1e5a5441868f3195 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_TLS_VERSION_H__
-#define __DETECT_TLS_VERSION_H__
+#ifndef SURICATA_DETECT_TLS_VERSION_H
+#define SURICATA_DETECT_TLS_VERSION_H
 
 #define DETECT_TLS_VERSION_FLAG_RAW  BIT_U8(0)
 
@@ -34,5 +34,4 @@ typedef struct DetectTlsVersionData_ {
 /* prototypes */
 void DetectTlsVersionRegister (void);
 
-#endif /* __DETECT_TLS_VERSION_H__ */
-
+#endif /* SURICATA_DETECT_TLS_VERSION_H */
index 70d58d56c1de6a9424738e653f392dfb36ffeef0..b47e2a1e0916a478d2c3cf929c0359a3b1dffa31 100644 (file)
@@ -31,8 +31,8 @@
  * \author Pierre Chifflier <pierre.chifflier@ssi.gouv.fr>
  */
 
-#ifndef __DETECT_TLS_H__
-#define __DETECT_TLS_H__
+#ifndef SURICATA_DETECT_TLS_H
+#define SURICATA_DETECT_TLS_H
 
 typedef struct DetectTlsData_ {
     uint16_t ver; /** tls version to match */
@@ -44,4 +44,4 @@ typedef struct DetectTlsData_ {
 /* prototypes */
 void DetectTlsRegister (void);
 
-#endif /* __DETECT_TLS_H__ */
+#endif /* SURICATA_DETECT_TLS_H */
index ef6fea690c752a6c48a57c9282441ab5f481dd17..3aa99495d1d2f7c0dae8260c216c81b4d1c2ec6d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DETECT_TOS_H__
-#define __DETECT_TOS_H__
+#ifndef SURICATA_DETECT_TOS_H
+#define SURICATA_DETECT_TOS_H
 
 typedef struct DetectTosData_ {
     uint8_t negated;
@@ -31,4 +31,4 @@ typedef struct DetectTosData_ {
 
 void DetectTosRegister(void);
 
-#endif /* __DETECT_TOS_H__ */
+#endif /* SURICATA_DETECT_TOS_H */
index db6275b915f7e38512701bd346bb4ed53adf2e2d..383786ac2f06365696e539e731720fbe6aecac91 100644 (file)
  * \author Jeff Lucovsky <jlucovsky@oisf.net>
  */
 
-#ifndef __DETECT_TRANSFORM_CASECHANGE_H
-#define __DETECT_TRANSFORM_CASECHANGE_H
+#ifndef SURICATA_DETECT_TRANSFORM_CASECHANGE_H
+#define SURICATA_DETECT_TRANSFORM_CASECHANGE_H
 
 /* prototypes */
 void DetectTransformToLowerRegister(void);
 void DetectTransformToUpperRegister(void);
 
-#endif /* __DETECT_TRANSFORM_CASECHANGE_H */
+#endif /* SURICATA_DETECT_TRANSFORM_CASECHANGE_H */
index 800d9a7272c1fbf21da742eecf646f961a21129b..f7824bde439992223f34a67f06d4524f7afda10b 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_TRANSFORM_COMPRESS_WHITESPACE_H__
-#define __DETECT_TRANSFORM_COMPRESS_WHITESPACE_H__
+#ifndef SURICATA_DETECT_TRANSFORM_COMPRESS_WHITESPACE_H
+#define SURICATA_DETECT_TRANSFORM_COMPRESS_WHITESPACE_H
 
 /* prototypes */
 void DetectTransformCompressWhitespaceRegister (void);
 
-#endif /* __DETECT_TRANSFORM_COMPRESS_WHITESPACE_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_COMPRESS_WHITESPACE_H */
index 3512689b644e58678ac9af38b9db17d38f0ca75c..2062055d8d0fbb8034c16b97a078b78b10cbd2ee 100644 (file)
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#ifndef __DETECT_TRANSFORM_DOTPREFIX_H__
-#define __DETECT_TRANSFORM_DOTPREFIX_H__
+#ifndef SURICATA_DETECT_TRANSFORM_DOTPREFIX_H
+#define SURICATA_DETECT_TRANSFORM_DOTPREFIX_H
 
 /* prototypes */
 void DetectTransformDotPrefixRegister (void);
 
-#endif /* __DETECT_TRANSFORM_DOTPREFIX_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_DOTPREFIX_H */
index aca7f874a4998e94c6456364d7e4ddbeb99de271..55f194a86bd6ab9a64e4ae30858d8dcbc0697347 100644 (file)
  * \author Philippe Antoine <contact@catenacyber.fr>
  */
 
-#ifndef __DETECT_TRANSFORM_HEADER_LOWERCASE_H__
-#define __DETECT_TRANSFORM_HEADER_LOWERCASE_H__
+#ifndef SURICATA_DETECT_TRANSFORM_HEADER_LOWERCASE_H
+#define SURICATA_DETECT_TRANSFORM_HEADER_LOWERCASE_H
 
 /* prototypes */
 void DetectTransformHeaderLowercaseRegister(void);
 
-#endif /* __DETECT_TRANSFORM_HEADER_LOWERCASE_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_HEADER_LOWERCASE_H */
index a65bb387f233812ad31b3ed6b9162b1fb9b48486..284c66ac630f1e761a7f2edac2a17e302fc9d566 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_TRANSFORM_MD5_H__
-#define __DETECT_TRANSFORM_MD5_H__
+#ifndef SURICATA_DETECT_TRANSFORM_MD5_H
+#define SURICATA_DETECT_TRANSFORM_MD5_H
 
 /* prototypes */
 void DetectTransformMd5Register (void);
 
-#endif /* __DETECT_TRANSFORM_MD5_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_MD5_H */
index 0a807d751b8df10a37cda93ab49ceb8f5eee3229..2735cd32791fdc918594d2c2ed9a00054bb18bb0 100644 (file)
  * \author Jeff Lucovsky <jeff@lucovsky.org
  */
 
-#ifndef __DETECT_TRANSFORM_PCREXFORM_H__
-#define __DETECT_TRANSFORM_PCREXFORM_H__
+#ifndef SURICATA_DETECT_TRANSFORM_PCREXFORM_H
+#define SURICATA_DETECT_TRANSFORM_PCREXFORM_H
 
 /* prototypes */
 void DetectTransformPcrexformRegister (void);
 
-#endif /* __DETECT_TRANSFORM_PCREXFORM_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_PCREXFORM_H */
index 4d53caedf9119763a75e2414276f3065133f19dd..c0b40bac2163893351da304bf3affea483d157cf 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_TRANSFORM_SHA1_H__
-#define __DETECT_TRANSFORM_SHA1_H__
+#ifndef SURICATA_DETECT_TRANSFORM_SHA1_H
+#define SURICATA_DETECT_TRANSFORM_SHA1_H
 
 /* prototypes */
 void DetectTransformSha1Register (void);
 
-#endif /* __DETECT_TRANSFORM_SHA1_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_SHA1_H */
index e8b4f0b3b027a03f4ee4aca5088b882fe7edca9c..536b896bbb4c0c9f414bf3c02f73e603b7bee570 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_TRANSFORM_SHA256_H__
-#define __DETECT_TRANSFORM_SHA256_H__
+#ifndef SURICATA_DETECT_TRANSFORM_SHA256_H
+#define SURICATA_DETECT_TRANSFORM_SHA256_H
 
 /* prototypes */
 void DetectTransformSha256Register (void);
 
-#endif /* __DETECT_TRANSFORM_SHA256_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_SHA256_H */
index c2016d438f044cfb4b2ad69f8fea29c3f15769eb..a0f9ebae313d88a23e60313f8336944c67969cea 100644 (file)
  * \author Philippe Antoine <contact@catenacyber.fr>
  */
 
-#ifndef __DETECT_TRANSFORM_STRIP_PSEUDOHEADERS_H__
-#define __DETECT_TRANSFORM_STRIP_PSEUDOHEADERS_H__
+#ifndef SURICATA_DETECT_TRANSFORM_STRIP_PSEUDOHEADERS_H
+#define SURICATA_DETECT_TRANSFORM_STRIP_PSEUDOHEADERS_H
 
 /* prototypes */
 void DetectTransformStripPseudoHeadersRegister(void);
 
-#endif /* __DETECT_TRANSFORM_STRIP_PSEUDOHEADERS_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_STRIP_PSEUDOHEADERS_H */
index 274f24100ccc4dd88213207eb847954dfab9c403..53b2922e8dbdfb3ebe7078a80d318dc380d4c621 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_TRANSFORM_STRIPWHITESPACE_H__
-#define __DETECT_TRANSFORM_STRIPWHITESPACE_H__
+#ifndef SURICATA_DETECT_TRANSFORM_STRIPWHITESPACE_H
+#define SURICATA_DETECT_TRANSFORM_STRIPWHITESPACE_H
 
 /* prototypes */
 void DetectTransformStripWhitespaceRegister (void);
 
-#endif /* __DETECT_TRANSFORM_STRIPWHITESPACE_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_STRIPWHITESPACE_H */
index 79f886f94da747ced0ea1c95eb258fa737959d2d..cd7267485effe5485183cc545f4c07449f8f442f 100644 (file)
  * \author Philippe Antoine <p.antoine@catenacyber.fr>
  */
 
-#ifndef __DETECT_TRANSFORM_URLDECODE_H__
-#define __DETECT_TRANSFORM_URLDECODE_H__
+#ifndef SURICATA_DETECT_TRANSFORM_URLDECODE_H
+#define SURICATA_DETECT_TRANSFORM_URLDECODE_H
 
 /* prototypes */
 void DetectTransformUrlDecodeRegister (void);
 
-#endif /* __DETECT_TRANSFORM_URLDECODE_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_URLDECODE_H */
index 0c585167f9da4cee6494a9ae3dbb7be4f4e1f22b..3ac2e344df353efb7060ad4e3f8ccc89a8d73c12 100644 (file)
  * \author Philippe Antoine <contact@catenacyber.fr>
  */
 
-#ifndef __DETECT_TRANSFORM_XOR_H__
-#define __DETECT_TRANSFORM_XOR_H__
+#ifndef SURICATA_DETECT_TRANSFORM_XOR_H
+#define SURICATA_DETECT_TRANSFORM_XOR_H
 
 /* prototypes */
 void DetectTransformXorRegister(void);
 
-#endif /* __DETECT_TRANSFORM_XOR_H__ */
+#endif /* SURICATA_DETECT_TRANSFORM_XOR_H */
index 289afff33a4f2be32464373cf7ff2fce47ac9680..869e4e5b17203df01a3b5d3f97700589859a5ea0 100644 (file)
  * \author Gurvinder Singh <gurvindersinghdahiya@gmail.com>
  */
 
-#ifndef __DETECT_URICONTENT_H__
-#define __DETECT_URICONTENT_H__
+#ifndef SURICATA_DETECT_URICONTENT_H
+#define SURICATA_DETECT_URICONTENT_H
 
 /* prototypes */
 void DetectUricontentRegister (void);
 
-#endif /* __DETECT_URICONTENT_H__ */
+#endif /* SURICATA_DETECT_URICONTENT_H */
index 7ccaf2648ae32add5944cd863eddd2cd84c8e25b..4df9737a65d585e5621ba8da02c7d34e857eab0d 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_WITHIN_H__
-#define __DETECT_WITHIN_H__
+#ifndef SURICATA_DETECT_WITHIN_H
+#define SURICATA_DETECT_WITHIN_H
 
 /* prototypes */
 void DetectWithinRegister (void);
 
-#endif /* __DETECT_WITHIN_H__ */
-
+#endif /* SURICATA_DETECT_WITHIN_H */
index 516bfdcfd1bc104c880d926e04ab85107a1750b1..07d662ea51d117e677ce93bae51420cdae942072 100644 (file)
@@ -21,8 +21,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_XBITS_H__
-#define __DETECT_XBITS_H__
+#ifndef SURICATA_DETECT_XBITS_H
+#define SURICATA_DETECT_XBITS_H
 
 #define DETECT_XBITS_CMD_SET      0
 #define DETECT_XBITS_CMD_TOGGLE   1
@@ -49,4 +49,4 @@ typedef struct DetectXbitsData_ {
 /* prototypes */
 void DetectXbitsRegister (void);
 
-#endif /* __DETECT_XBITS_H__ */
+#endif /* SURICATA_DETECT_XBITS_H */
index 2027affa39e6b8f33d4c64bce41bdc5a5d102d98..886fe1db2ef4176f3c7699ce0af4ef732cae4c3d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __DETECT_H__
-#define __DETECT_H__
+#ifndef SURICATA_DETECT_H
+#define SURICATA_DETECT_H
 
 #include "suricata-common.h"
 #include "flow.h"
@@ -1594,6 +1594,4 @@ AppLayerDecoderEvents *DetectEngineGetEvents(DetectEngineThreadCtx *det_ctx);
 
 void DumpPatterns(DetectEngineCtx *de_ctx);
 
-
-#endif /* __DETECT_H__ */
-
+#endif /* SURICATA_DETECT_H */
index 441b92b82e7de47b138ec19528595671be90a381..31339b09edb7de0ff2dc3e57aa3b9754fe1dfda3 100644 (file)
@@ -23,8 +23,8 @@
  * LiveDevice wrapper around storage api
  */
 
-#ifndef __DEVICE_STORAGE_H__
-#define __DEVICE_STORAGE_H__
+#ifndef SURICATA_DEVICE_STORAGE_H
+#define SURICATA_DEVICE_STORAGE_H
 
 #include "util-device.h"
 
@@ -44,4 +44,4 @@ void LiveDevFreeStorage(LiveDevice *d);
 LiveDevStorageId LiveDevStorageRegister(const char *name, const unsigned int size,
         void *(*Alloc)(unsigned int), void (*Free)(void *));
 
-#endif /* __DEVICE_STORAGE_H__ */
+#endif /* SURICATA_DEVICE_STORAGE_H */
index 6549c5bbeab5fc7155468e4098ba17aca00a6e12..035fb3997bb81dd53e53b5a5af192a56efe0233b 100644 (file)
@@ -21,8 +21,8 @@
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#ifndef __FEATURE_H__
-#define __FEATURE_H__
+#ifndef SURICATA_FEATURE_H
+#define SURICATA_FEATURE_H
 
 /* Provided feature names */
 #define FEATURE_OUTPUT_FILESTORE    "output::file-store"
@@ -35,4 +35,4 @@ void FeatureDump(void);
 void FeatureTrackingRelease(void);
 void FeatureTrackingRegister(void);
 
-#endif /* __FEATURE_H__ */
+#endif /* SURICATA_FEATURE_H */
index 2362d5180795e881786d6d9ecd65ffd40b343630..e10c58dafde07f5b6558ae127394bfe32a6c54dc 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __FLOW_BIT_H__
-#define __FLOW_BIT_H__
+#ifndef SURICATA_FLOW_BIT_H
+#define SURICATA_FLOW_BIT_H
 
 #include "flow.h"
 #include "util-var.h"
@@ -44,5 +44,4 @@ void FlowBitUnset(Flow *, uint32_t);
 void FlowBitToggle(Flow *, uint32_t);
 int FlowBitIsset(Flow *, uint32_t);
 int FlowBitIsnotset(Flow *, uint32_t);
-#endif /* __FLOW_BIT_H__ */
-
+#endif /* SURICATA_FLOW_BIT_H */
index 58ca76663655e770d7229fd8ad1b0f9d3089f5a2..1a700dd23dca8e1c3d26008a432d251809480cb7 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eleblond@stamus-networks.com>
  */
 
-#ifndef __FLOW_BYPASS_H__
-#define __FLOW_BYPASS_H__
+#ifndef SURICATA_FLOW_BYPASS_H
+#define SURICATA_FLOW_BYPASS_H
 
 #include "flow.h"
 
index 201eb641454324a45f6dea220ab49f7d3d34e9b1..0f1d9bf1138f70dae50ed1be555d6ebcd26216ce 100644 (file)
@@ -21,8 +21,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __FLOW_HASH_H__
-#define __FLOW_HASH_H__
+#ifndef SURICATA_FLOW_HASH_H
+#define SURICATA_FLOW_HASH_H
 
 #include "flow.h"
 
@@ -102,5 +102,4 @@ static inline void RemoveFromHash(Flow *f, Flow *prev_f)
     f->fb = NULL;
 }
 
-#endif /* __FLOW_HASH_H__ */
-
+#endif /* SURICATA_FLOW_HASH_H */
index 7cdd017000aa9b953392ec5ee77bd702207fac7e..23e4ced6cd67c3bb50dc5dedd8ab662e0591a642 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __FLOW_MANAGER_H__
-#define __FLOW_MANAGER_H__
+#ifndef SURICATA_FLOW_MANAGER_H
+#define SURICATA_FLOW_MANAGER_H
 
 void FlowWakeupFlowManagerThread(void);
 void FlowWakeupFlowRecyclerThread(void);
@@ -37,4 +37,4 @@ void FlowDisableFlowRecyclerThread(void);
 void TmModuleFlowManagerRegister (void);
 void TmModuleFlowRecyclerRegister (void);
 
-#endif /* __FLOW_MANAGER_H__ */
+#endif /* SURICATA_FLOW_MANAGER_H */
index d3899f6dfbc08889587c06ddba2723f9a6978221..bd7aac73644e06d6c816de5de761189326dedbef 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __FLOW_PRIVATE_H__
-#define __FLOW_PRIVATE_H__
+#ifndef SURICATA_FLOW_PRIVATE_H
+#define SURICATA_FLOW_PRIVATE_H
 
 #include "flow-hash.h"
 #include "flow-queue.h"
@@ -178,4 +178,4 @@ static inline uint32_t FlowGetTimeoutPolicy(const Flow *f)
     }
     return timeout;
 }
-#endif /* __FLOW_PRIVATE_H__ */
+#endif /* SURICATA_FLOW_PRIVATE_H */
index 0523546ce8a9c73e99e8b7eb3b2660d14bc5b233..2d26869d65f67936d8d85aab8d7640b9b52cd649 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __FLOW_QUEUE_H__
-#define __FLOW_QUEUE_H__
+#ifndef SURICATA_FLOW_QUEUE_H
+#define SURICATA_FLOW_QUEUE_H
 
 #include "suricata-common.h"
 #include "flow.h"
@@ -94,5 +94,4 @@ void FlowQueuePrivateAppendPrivate(FlowQueuePrivate *dest, FlowQueuePrivate *src
 FlowQueuePrivate FlowQueueExtractPrivate(FlowQueue *fq);
 Flow *FlowQueuePrivateGetFromTop(FlowQueuePrivate *fqp);
 
-#endif /* __FLOW_QUEUE_H__ */
-
+#endif /* SURICATA_FLOW_QUEUE_H */
index cf9a4bdd55fe7e88378a01a0a2153657727b4311..0fdf723ac37ba90e7b6c3dd7efdb2de4a52ceea3 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __FLOW_SPARE_POOL_H__
-#define __FLOW_SPARE_POOL_H__
+#ifndef SURICATA_FLOW_SPARE_POOL_H
+#define SURICATA_FLOW_SPARE_POOL_H
 
 #include "suricata-common.h"
 #include "flow.h"
@@ -38,4 +38,4 @@ FlowQueuePrivate FlowSpareGetFromPool(void);
 void FlowSparePoolReturnFlow(Flow *f);
 void FlowSparePoolReturnFlows(FlowQueuePrivate *fqp);
 
-#endif /* __FLOW_SPARE_POOL_H__ */
+#endif /* SURICATA_FLOW_SPARE_POOL_H */
index 6fd8beef32a9dc6ba62beba2856813061a61f7c7..6788c06c9651a8dd7d90a2d60b022198939639ad 100644 (file)
@@ -23,8 +23,8 @@
  * Flow wrapper around storage api
  */
 
-#ifndef __FLOW_STORAGE_H__
-#define __FLOW_STORAGE_H__
+#ifndef SURICATA_FLOW_STORAGE_H
+#define SURICATA_FLOW_STORAGE_H
 
 #include "flow.h"
 
@@ -46,4 +46,4 @@ void RegisterFlowStorageTests(void);
 FlowStorageId FlowStorageRegister(const char *name, const unsigned int size,
         void *(*Alloc)(unsigned int), void (*Free)(void *));
 
-#endif /* __FLOW_STORAGE_H__ */
+#endif /* SURICATA_FLOW_STORAGE_H */
index 882f4e63b201beaf5075e00c192fa4dbbce969b6..7ca895e72821eac12cde29f38283b50228c2c357 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __FLOW_TIMEOUT_H__
-#define __FLOW_TIMEOUT_H__
+#ifndef SURICATA_FLOW_TIMEOUT_H
+#define SURICATA_FLOW_TIMEOUT_H
 
 #include "stream-tcp-private.h"
 
@@ -31,4 +31,4 @@ int FlowForceReassemblyNeedReassembly(Flow *f);
 void FlowForceReassembly(void);
 Packet *FlowForceReassemblyPseudoPacketGet(int direction, Flow *f, const TcpSession *ssn);
 
-#endif /* __FLOW_TIMEOUT_H__ */
+#endif /* SURICATA_FLOW_TIMEOUT_H */
index 3d0d978b5a76bffcf9973e755cb1e1ac502812c3..2d813bd9ee4dedf7477efec0d6e72acad2be5278 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __FLOW_UTIL_H__
-#define __FLOW_UTIL_H__
+#ifndef SURICATA_FLOW_UTIL_H
+#define SURICATA_FLOW_UTIL_H
 
 #include "flow.h"
 #include "stream-tcp-private.h"
@@ -165,4 +165,4 @@ static inline void FlowEndCountersUpdate(ThreadVars *tv, FlowEndCounters *fec, F
 
 void FlowEndCountersRegister(ThreadVars *t, FlowEndCounters *fec);
 
-#endif /* __FLOW_UTIL_H__ */
+#endif /* SURICATA_FLOW_UTIL_H */
index f0bcf3c0c3f61ee45385c2267ad66c2aeca5ef94..4768490e68c65739da02e96ff721a0dee2d06376 100644 (file)
@@ -22,8 +22,8 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __FLOW_VAR_H__
-#define __FLOW_VAR_H__
+#ifndef SURICATA_FLOW_VAR_H
+#define SURICATA_FLOW_VAR_H
 
 #include "flow.h"
 #include "util-var.h"
@@ -72,5 +72,4 @@ FlowVar *FlowVarGetByKey(Flow *f, const uint8_t *key, uint16_t keylen);
 void FlowVarFree(FlowVar *);
 void FlowVarPrint(GenericVar *);
 
-#endif /* __FLOW_VAR_H__ */
-
+#endif /* SURICATA_FLOW_VAR_H */
index 9187602dec2c7d663d4493a290435100c0206049..951878eb062e7b7c6f612e060cf678a0f1f1ed2d 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __FLOW_WORKER_H__
-#define __FLOW_WORKER_H__
+#ifndef SURICATA_FLOW_WORKER_H
+#define SURICATA_FLOW_WORKER_H
 
 enum ProfileFlowWorkerId {
     PROFILE_FLOWWORKER_FLOW = 0,
@@ -35,4 +35,4 @@ void *FlowWorkerGetDetectCtxPtr(void *flow_worker);
 
 void TmModuleFlowWorkerRegister (void);
 
-#endif /* __FLOW_WORKER_H__ */
+#endif /* SURICATA_FLOW_WORKER_H */
index 418becfc296383289166591a608e02be5a3e8887..7066965c5196d4e14c07225b621e8b8982c8a214 100644 (file)
@@ -21,8 +21,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __FLOW_H__
-#define __FLOW_H__
+#ifndef SURICATA_FLOW_H
+#define SURICATA_FLOW_H
 
 /* forward declaration for macset include */
 typedef struct FlowStorageId FlowStorageId;
@@ -700,4 +700,4 @@ uint8_t FlowGetDisruptionFlags(const Flow *f, uint8_t flags);
 
 void FlowHandlePacketUpdate(Flow *f, Packet *p, ThreadVars *tv, DecodeThreadVars *dtv);
 
-#endif /* __FLOW_H__ */
+#endif /* SURICATA_FLOW_H */
index bcd9c2d3dbcd44a62535eee2a5d7310457407ca2..2c57660d509c1d91cd4750b8b1165c3d05861cbc 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __HOST_BIT_H__
-#define __HOST_BIT_H__
+#ifndef SURICATA_HOST_BIT_H
+#define SURICATA_HOST_BIT_H
 
 #include "host.h"
 #include "util-var.h"
@@ -40,4 +40,4 @@ int HostBitIsset(Host *, uint32_t, uint32_t);
 int HostBitIsnotset(Host *, uint32_t, uint32_t);
 int HostBitList(Host *, XBit **);
 
-#endif /* __HOST_BIT_H__ */
+#endif /* SURICATA_HOST_BIT_H */
index 2edd169d22f2a0aeff66d0756d9dab9fd5a5d582..bd6ed8f880d7af99caace6f112d240615b2e7b8b 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __HOST_QUEUE_H__
-#define __HOST_QUEUE_H__
+#ifndef SURICATA_HOST_QUEUE_H
+#define SURICATA_HOST_QUEUE_H
 
 #include "suricata-common.h"
 #include "host.h"
@@ -80,5 +80,4 @@ void HostEnqueue (HostQueue *, Host *);
 Host *HostDequeue (HostQueue *);
 uint32_t HostQueueLen(HostQueue *);
 
-#endif /* __HOST_QUEUE_H__ */
-
+#endif /* SURICATA_HOST_QUEUE_H */
index e315b33f63e8b00e0b3f0107593a8c4005fac98c..64356e4313e79ff46daf97fd621e8b91ec342c04 100644 (file)
@@ -23,8 +23,8 @@
  * Host wrapper around storage api
  */
 
-#ifndef __HOST_STORAGE_H__
-#define __HOST_STORAGE_H__
+#ifndef SURICATA_HOST_STORAGE_H
+#define SURICATA_HOST_STORAGE_H
 
 #include "host.h"
 
@@ -46,4 +46,4 @@ void RegisterHostStorageTests(void);
 HostStorageId HostStorageRegister(const char *name, const unsigned int size,
         void *(*Alloc)(unsigned int), void (*Free)(void *));
 
-#endif /* __HOST_STORAGE_H__ */
+#endif /* SURICATA_HOST_STORAGE_H */
index 044c44d970bb8b807459e51e31f098e8e3dfd424..545d65fb31667312b39172e8d69c400eb96e9165 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __HOST_TIMEOUT_H__
-#define __HOST_TIMEOUT_H__
+#ifndef SURICATA_HOST_TIMEOUT_H
+#define SURICATA_HOST_TIMEOUT_H
 
 uint32_t HostTimeoutHash(SCTime_t ts);
 
index f4f248b5eec657b2024b9b6c74cb963f52555443..ac83474fb9dbeedacb2858a220ff2b160f03bd8c 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __HOST_H__
-#define __HOST_H__
+#ifndef SURICATA_HOST_H
+#define SURICATA_HOST_H
 
 #include "decode.h"
 #include "util-storage.h"
@@ -157,5 +157,4 @@ int HostSetMemcap(uint64_t);
 uint64_t HostGetMemcap(void);
 uint64_t HostGetMemuse(void);
 
-#endif /* __HOST_H__ */
-
+#endif /* SURICATA_HOST_H */
index 478bc11a63a121c1f5bed23b1866b2498a6eedee..4f363eecadb2158bac5b4a6d78a6002222520c87 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __IPPAIR_BIT_H__
-#define __IPPAIR_BIT_H__
+#ifndef SURICATA_IPPAIR_BIT_H
+#define SURICATA_IPPAIR_BIT_H
 
 #include "ippair.h"
 
@@ -38,4 +38,4 @@ void IPPairBitToggle(IPPair *, uint32_t, uint32_t);
 int IPPairBitIsset(IPPair *, uint32_t, uint32_t);
 int IPPairBitIsnotset(IPPair *, uint32_t, uint32_t);
 
-#endif /* __IPPAIR_BIT_H__ */
+#endif /* SURICATA_IPPAIR_BIT_H */
index cc3814b34f440af4e8bf1ee0af6d55465c863e00..59a23f8859ab2b0a051ffe7e99b7a528ee8cb2c0 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __IPPAIR_QUEUE_H__
-#define __IPPAIR_QUEUE_H__
+#ifndef SURICATA_IPPAIR_QUEUE_H
+#define SURICATA_IPPAIR_QUEUE_H
 
 #include "suricata-common.h"
 #include "ippair.h"
@@ -80,4 +80,4 @@ void IPPairEnqueue (IPPairQueue *, IPPair *);
 IPPair *IPPairDequeue (IPPairQueue *);
 uint32_t IPPairQueueLen(IPPairQueue *);
 
-#endif /* __IPPAIR_QUEUE_H__ */
+#endif /* SURICATA_IPPAIR_QUEUE_H */
index 1d5ba7d2ea240c492bdabc51a08d5b806b91fb4e..e8d686d11313e092bc98970de1f4ea2847c16b3b 100644 (file)
@@ -23,8 +23,8 @@
  * IPPair wrapper around storage api
  */
 
-#ifndef __IPPAIR_STORAGE_H__
-#define __IPPAIR_STORAGE_H__
+#ifndef SURICATA_IPPAIR_STORAGE_H
+#define SURICATA_IPPAIR_STORAGE_H
 
 #include "ippair.h"
 
@@ -46,4 +46,4 @@ void RegisterIPPairStorageTests(void);
 IPPairStorageId IPPairStorageRegister(const char *name, const unsigned int size,
         void *(*Alloc)(unsigned int), void (*Free)(void *));
 
-#endif /* __IPPAIR_STORAGE_H__ */
+#endif /* SURICATA_IPPAIR_STORAGE_H */
index 0a127f9143a3c05eb1431fd4e186d5a69a87ff46..9370ef3d17ec8aaafb7bcf8d81e12f76db27c870 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __IPPAIR_TIMEOUT_H__
-#define __IPPAIR_TIMEOUT_H__
+#ifndef SURICATA_IPPAIR_TIMEOUT_H
+#define SURICATA_IPPAIR_TIMEOUT_H
 
 uint32_t IPPairTimeoutHash(SCTime_t ts);
 
index 3eef45ad8fccb85ffbaf9ddac4bd63e0e1ea9dd1..e12b0656ca72dae0af0a9f64ef36fbb574f01755 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __IPPAIR_H__
-#define __IPPAIR_H__
+#ifndef SURICATA_IPPAIR_H
+#define SURICATA_IPPAIR_H
 
 #include "decode.h"
 #include "util-storage.h"
@@ -140,4 +140,4 @@ int IPPairSetMemcap(uint64_t size);
 uint64_t IPPairGetMemcap(void);
 uint64_t IPPairGetMemuse(void);
 
-#endif /* __IPPAIR_H__ */
+#endif /* SURICATA_IPPAIR_H */
index 61d2d55af874cdbb44bcb7f86d0829e6e3ed779e..078a5064e95ffcb56615e7b940c225652626bab3 100644 (file)
@@ -25,8 +25,8 @@
  * Common custom logging format
  */
 
-#ifndef __LOG_CF_COMMON_H__
-#define __LOG_CF_COMMON_H__
+#ifndef SURICATA_LOG_CF_COMMON_H
+#define SURICATA_LOG_CF_COMMON_H
 
 #define LOG_MAXN_NODES 64
 #define LOG_NODE_STRLEN 256
@@ -85,4 +85,4 @@ int LogCustomFormatParse(LogCustomFormat *cf, const char *format);
 void LogCustomFormatWriteTimestamp(MemBuffer *buffer, const char *fmt, const SCTime_t ts);
 void LogCustomFormatRegister(void);
 
-#endif /* __LOG_CF_COMMON_H__ */
+#endif /* SURICATA_LOG_CF_COMMON_H */
index 580191fb99c49f525f9aa707bbe81927f6c59322..9423358efccc39fc3c7e2bc6b74701fe094dc6eb 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __LOG_HTTPLOG_H__
-#define __LOG_HTTPLOG_H__
+#ifndef SURICATA_LOG_HTTPLOG_H
+#define SURICATA_LOG_HTTPLOG_H
 
 void LogHttpLogRegister(void);
 OutputInitResult LogHttpLogInitCtx(ConfNode *);
 
-#endif /* __LOG_HTTPLOG_H__ */
-
+#endif /* SURICATA_LOG_HTTPLOG_H */
index 731a365b854c731ecbcde3e09f93674544c1c5ee..d72848d8f8643a201b8e822185a7704849fa92d2 100644 (file)
@@ -25,8 +25,8 @@
  * Pcap packet logging module.
  */
 
-#ifndef __LOG_PCAP_H__
-#define __LOG_PCAP_H__
+#ifndef SURICATA_LOG_PCAP_H
+#define SURICATA_LOG_PCAP_H
 
 #define PCAP_OUTPUT_BUFFER_SIZE 65535
 
@@ -34,4 +34,4 @@ void PcapLogRegister(void);
 void PcapLogProfileSetup(void);
 char *PcapLogGetFilename(void);
 
-#endif /* __LOG_PCAP_H__ */
+#endif /* SURICATA_LOG_PCAP_H */
index f7f536c6ddb04e0d57b5f45bbb50912f1d6fa529..84f7b021683e11d9d83d6dba11dece52af50855b 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __LOG_STATS_H__
-#define __LOG_STATS_H__
+#ifndef SURICATA_LOG_STATS_H
+#define SURICATA_LOG_STATS_H
 
 void LogStatsLogRegister(void);
 
index 608dbef3090a0faf428aa084c99037c0fa3c4022..6c4371793e1a2a7c77c2659b657d1d3bf067a175 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __LOG_TCPDATALOG_H__
-#define __LOG_TCPDATALOG_H__
+#ifndef SURICATA_LOG_TCPDATALOG_H
+#define SURICATA_LOG_TCPDATALOG_H
 
 #include "conf.h"
 #include "output.h"
@@ -30,4 +30,4 @@
 void LogTcpDataLogRegister(void);
 OutputInitResult LogTcpDataLogInitCtx(ConfNode *);
 
-#endif /* __LOG_TCPDATALOG_H__ */
+#endif /* SURICATA_LOG_TCPDATALOG_H */
index 87c2fbcf5db762663e066bf582d31bbcd91e6bbd..fb01562842d4415addb000048090ae26081bc830 100644 (file)
@@ -22,8 +22,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __LOG_TLSLOG_H__
-#define __LOG_TLSLOG_H__
+#ifndef SURICATA_LOG_TLSLOG_H
+#define SURICATA_LOG_TLSLOG_H
 
 void LogTlsLogRegister(void);
 
@@ -31,5 +31,4 @@ int TLSGetIPInformations(const Packet *p, char* srcip, size_t srcip_len,
                              Port* sp, char* dstip, size_t dstip_len,
                              Port* dp, int ipproto);
 
-#endif /* __LOG_TLSLOG_H__ */
-
+#endif /* SURICATA_LOG_TLSLOG_H */
index c80975bee132bd205cd5177a9041ac6b1864baba..46d052ed969c90bd1eb3875fbc373a3dbd2d3408 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __LOG_TLSSTORE_H__
-#define __LOG_TLSSTORE_H__
+#ifndef SURICATA_LOG_TLSSTORE_H
+#define SURICATA_LOG_TLSSTORE_H
 
 void LogTlsStoreRegister(void);
 
-#endif /* __LOG_TLSSTORE_H__ */
+#endif /* SURICATA_LOG_TLSSTORE_H */
index a2808b87348b64554550ea2d907c682833d16c72..02de059d2552511965f9e9f266c3fc5b73236240 100644 (file)
@@ -19,8 +19,8 @@
  * \file
  */
 
-#ifndef __OUTPUT_EVE_STREAM_H__
-#define __OUTPUT_EVE_STREAM_H__
+#ifndef SURICATA_OUTPUT_EVE_STREAM_H
+#define SURICATA_OUTPUT_EVE_STREAM_H
 
 #include "stream-tcp.h"
 
@@ -28,4 +28,4 @@ void EveStreamLogRegister(void);
 void EveAddFlowTcpStreamFlags(const TcpStream *stream, const char *name, JsonBuilder *jb);
 void EveAddFlowTcpFlags(const TcpSession *ssn, const char *name, JsonBuilder *jb);
 
-#endif /* __OUTPUT_EVE_STREAM_H__ */
+#endif /* SURICATA_OUTPUT_EVE_STREAM_H */
index 03d5f3ed80c6a9b302d790ed2e60f6350c05df9a..59529f65b269be1c3dd311e048e17b60cd0ae412 100644 (file)
@@ -21,9 +21,9 @@
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#ifndef __OUTPUT_EVE_SYSLOG_H__
-#define __OUTPUT_EVE_SYSLOG_H__
+#ifndef SURICATA_OUTPUT_EVE_SYSLOG_H
+#define SURICATA_OUTPUT_EVE_SYSLOG_H
 
 void SyslogInitialize(void);
 
-#endif /* __OUTPUT_EVE_SYSLOG_H__ */
+#endif /* SURICATA_OUTPUT_EVE_SYSLOG_H */
index 13735b282de0f6572d80b4c66806401147e87d15..d59d8318b4b3eb67080166068800bda5992d5999 100644 (file)
@@ -23,8 +23,8 @@
  * AppLayer File Logger Output registration functions
  */
 
-#ifndef __OUTPUT_FILE_H__
-#define __OUTPUT_FILE_H__
+#ifndef SURICATA_OUTPUT_FILE_H
+#define SURICATA_OUTPUT_FILE_H
 
 #include "rust.h"
 
@@ -56,4 +56,4 @@ void OutputFileLoggerRegister(void);
 
 void OutputFileShutdown(void);
 
-#endif /* __OUTPUT_FILE_H__ */
+#endif /* SURICATA_OUTPUT_FILE_H */
index 58764aa81e0379008970edad9b3a28a8aea397b3..316d998dd778fe293a01958986b6b1873cd1d435 100644 (file)
@@ -23,8 +23,8 @@
  * AppLayer Filedata Logger Output registration functions
  */
 
-#ifndef __OUTPUT_FILEDATA_H__
-#define __OUTPUT_FILEDATA_H__
+#ifndef SURICATA_OUTPUT_FILEDATA_H
+#define SURICATA_OUTPUT_FILEDATA_H
 
 #define OUTPUT_FILEDATA_FLAG_OPEN  0x01
 #define OUTPUT_FILEDATA_FLAG_CLOSE 0x02
@@ -58,4 +58,4 @@ void OutputFiledataLoggerRegister(void);
 
 void OutputFiledataShutdown(void);
 
-#endif /* __OUTPUT_FILEDATA_H__ */
+#endif /* SURICATA_OUTPUT_FILEDATA_H */
index ed3b3d80d68639ee88471b14c36685e8a8f25d63..10ae7c833bdad12201264998c5851e89a4a27330 100644 (file)
  * 02110-1301, USA.
  */
 
-#ifndef __OUTPUT_FILESTORE_H__
-#define __OUTPUT_FILESTORE_H__
+#ifndef SURICATA_OUTPUT_FILESTORE_H
+#define SURICATA_OUTPUT_FILESTORE_H
 
 void OutputFilestoreRegister(void);
 void OutputFilestoreRegisterGlobalCounters(void);
 
-#endif /* __OUTPUT_FILESTORE_H__ */
+#endif /* SURICATA_OUTPUT_FILESTORE_H */
index 2fa26660fee7ac2f0990068e991688d595d6429a..da9ecf98e9f2bd3938c2feac19693f4b5ea7e51a 100644 (file)
@@ -23,8 +23,8 @@
  * Flow Logger Output registration functions
  */
 
-#ifndef __OUTPUT_FLOW_H__
-#define __OUTPUT_FLOW_H__
+#ifndef SURICATA_OUTPUT_FLOW_H
+#define SURICATA_OUTPUT_FLOW_H
 
 #include "tm-modules.h"
 
@@ -42,4 +42,4 @@ TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void *initdata, void **data);
 TmEcode OutputFlowLogThreadDeinit(ThreadVars *tv, void *thread_data);
 void OutputFlowLogExitPrintStats(ThreadVars *tv, void *thread_data);
 
-#endif /* __OUTPUT_FLOW_H__ */
+#endif /* SURICATA_OUTPUT_FLOW_H */
index 6a65cc3d2730317ac1442eb0d41fc8e2ff5835c5..c963eda09f5eb09cc07e73244fcc2eb8c5259df9 100644 (file)
  *
  */
 
-#ifndef __OUTPUT_JSON_ALERT_H__
-#define __OUTPUT_JSON_ALERT_H__
+#ifndef SURICATA_OUTPUT_JSON_ALERT_H
+#define SURICATA_OUTPUT_JSON_ALERT_H
 
 void JsonAlertLogRegister(void);
 void AlertJsonHeader(void *ctx, const Packet *p, const PacketAlert *pa, JsonBuilder *js,
         uint16_t flags, JsonAddrInfo *addr, char *xff_buffer);
 void EveAddVerdict(JsonBuilder *jb, const Packet *p);
 
-#endif /* __OUTPUT_JSON_ALERT_H__ */
-
+#endif /* SURICATA_OUTPUT_JSON_ALERT_H */
index 4ca32b21ec59470d049775fe65b3ebd02fa21f84..2d88bce3d843f7d8df59deecd0dd6b8139b0f3b3 100644 (file)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef __OUTPUT_JSON_ANOMALY_H__
-#define __OUTPUT_JSON_ANOMALY_H__
+#ifndef SURICATA_OUTPUT_JSON_ANOMALY_H
+#define SURICATA_OUTPUT_JSON_ANOMALY_H
 
 void JsonAnomalyLogRegister(void);
 
index 8927f4d159965841f43136c83e1cbf11149f3b1a..9396f5a5e8bb64a0c9c26c451f3f546ddb2f06a0 100644 (file)
@@ -19,9 +19,9 @@
  * \file
  */
 
-#ifndef __OUTPUT_JSON_BITTORRENT_DHT_H__
-#define __OUTPUT_JSON_BITTORRENT_DHT_H__
+#ifndef SURICATA_OUTPUT_JSON_BITTORRENT_DHT_H
+#define SURICATA_OUTPUT_JSON_BITTORRENT_DHT_H
 
 void JsonBitTorrentDHTLogRegister(void);
 
-#endif /* __OUTPUT_JSON_BITTORRENT_DHT_H__ */
+#endif /* SURICATA_OUTPUT_JSON_BITTORRENT_DHT_H */
index c139ed066c337251d2abe82ccd4eb1d41b0f908a..9e1a152915f2443b1153fd2b77fd114cb695907a 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __OUTPUT_JSON_DCERPC_H__
-#define __OUTPUT_JSON_DCERPC_H__
+#ifndef SURICATA_OUTPUT_JSON_DCERPC_H
+#define SURICATA_OUTPUT_JSON_DCERPC_H
 
 void JsonDCERPCLogRegister(void);
 
-#endif /* __OUTPUT_JSON_DCERPC_H__ */
+#endif /* SURICATA_OUTPUT_JSON_DCERPC_H */
index 682347c71304cfb49353d04a3d35c793922d36ab..a889b1f25e379fc0a3bbe56080ba4cc23c5536d7 100644 (file)
@@ -21,9 +21,9 @@
  * \author Jason Ish <jason.ish@oisf.net>
  */
 
-#ifndef __OUTPUT_JSON_DHCP_H__
-#define __OUTPUT_JSON_DHCP_H__
+#ifndef SURICATA_OUTPUT_JSON_DHCP_H
+#define SURICATA_OUTPUT_JSON_DHCP_H
 
 void JsonDHCPLogRegister(void);
 
-#endif /* __OUTPUT_JSON_DHCP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_DHCP_H */
index debe115689abb345b4855a0f05e7c017f4a44d00..fd668d350463937f1f997510ea43344d47e36e62 100644 (file)
  * 02110-1301, USA.
  */
 
-#ifndef __OUTPUT_JSON_DNP3_OBJECTS_H__
-#define __OUTPUT_JSON_DNP3_OBJECTS_H__
+#ifndef SURICATA_OUTPUT_JSON_DNP3_OBJECTS_H
+#define SURICATA_OUTPUT_JSON_DNP3_OBJECTS_H
 
 #include "rust-bindings.h"
 
 void OutputJsonDNP3SetItem(JsonBuilder *js, DNP3Object *object,
     DNP3Point *item);
 
-#endif /* __OUTPUT_JSON_DNP3_OBJECTS_H__ */
+#endif /* SURICATA_OUTPUT_JSON_DNP3_OBJECTS_H */
index 6f81026780d905798335bbb102556120f7c6e229..064421a0b1d11aacfe1181e61661c00aeaf24fbf 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __OUTPUT_JSON_DNP3_H__
-#define __OUTPUT_JSON_DNP3_H__
+#ifndef SURICATA_OUTPUT_JSON_DNP3_H
+#define SURICATA_OUTPUT_JSON_DNP3_H
 
 #include "app-layer-dnp3.h"
 
@@ -26,4 +26,4 @@ void JsonDNP3LogResponse(JsonBuilder *js, DNP3Transaction *);
 void JsonDNP3LogRegister(void);
 bool AlertJsonDnp3(void *vtx, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_DNP3_H__ */
+#endif /* SURICATA_OUTPUT_JSON_DNP3_H */
index f46cad0110893097c9613bcba4babb62ccf4f60b..1fe11427b3046b5ac37ca04f7fcec55a43206629 100644 (file)
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_DNS_H__
-#define __OUTPUT_JSON_DNS_H__
+#ifndef SURICATA_OUTPUT_JSON_DNS_H
+#define SURICATA_OUTPUT_JSON_DNS_H
 
 void JsonDnsLogRegister(void);
 
 bool AlertJsonDns(void *vtx, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_DNS_H__ */
+#endif /* SURICATA_OUTPUT_JSON_DNS_H */
index 6415e523f7a4ffc8f169a1ec1c7ac7c92d02f37a..a40527af01bcc44467a98898236c291c6dc7b831 100644 (file)
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef __OUTPUT_JSON_DROP_H__
-#define __OUTPUT_JSON_DROP_H__
+#ifndef SURICATA_OUTPUT_JSON_DROP_H
+#define SURICATA_OUTPUT_JSON_DROP_H
 
 void JsonDropLogRegister(void);
 
-#endif /* __OUTPUT_JSON_DROP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_DROP_H */
index e225f28822f6b51069088802e7a00694862565ab..8331782189ba7543a2c66b5c7bc6f6867a722a50 100644 (file)
@@ -21,8 +21,8 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_EMAIL_COMMON_H__
-#define __OUTPUT_JSON_EMAIL_COMMON_H__
+#ifndef SURICATA_OUTPUT_JSON_EMAIL_COMMON_H
+#define SURICATA_OUTPUT_JSON_EMAIL_COMMON_H
 
 typedef struct OutputJsonEmailCtx_ {
     uint32_t flags; /** Store mode */
@@ -40,4 +40,4 @@ bool EveEmailAddMetadata(const Flow *f, uint32_t tx_id, JsonBuilder *js);
 
 void OutputEmailInitConf(ConfNode *conf, OutputJsonEmailCtx *email_ctx);
 
-#endif /* __OUTPUT_JSON_EMAIL_COMMON_H__ */
+#endif /* SURICATA_OUTPUT_JSON_EMAIL_COMMON_H */
index bdd6a86ba96c11e8bcc16a959deaa444aabfb862..e2eeeccb2ffcd08124123df41c4733a613638df3 100644 (file)
@@ -21,8 +21,8 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_FILE_H__
-#define __OUTPUT_JSON_FILE_H__
+#ifndef SURICATA_OUTPUT_JSON_FILE_H
+#define SURICATA_OUTPUT_JSON_FILE_H
 
 #include "app-layer-htp-xff.h"
 
@@ -33,4 +33,4 @@ JsonBuilder *JsonBuildFileInfoRecord(const Packet *p, const File *ff, void *tx,
         const uint64_t tx_id, const bool stored, uint8_t dir, HttpXFFCfg *xff_cfg,
         OutputJsonCtx *eve_ctx);
 
-#endif /* __OUTPUT_JSON_FILE_H__ */
+#endif /* SURICATA_OUTPUT_JSON_FILE_H */
index 871968ac5e017c41cdf709c04554432b81672faa..e334315e56fc12c562c068b10fa80f44f7510684 100644 (file)
  * Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __OUTPUT_JSON_FLOW_H__
-#define __OUTPUT_JSON_FLOW_H__
+#ifndef SURICATA_OUTPUT_JSON_FLOW_H
+#define SURICATA_OUTPUT_JSON_FLOW_H
 
 void JsonFlowLogRegister(void);
 void EveAddFlow(Flow *f, JsonBuilder *js);
 void EveAddAppProto(Flow *f, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_FLOW_H__ */
+#endif /* SURICATA_OUTPUT_JSON_FLOW_H */
index 009e7b6426bb17743a438d7b8eea2e5f412c7f66..c6883f26269b0788e2a33fd4437fe40b1ebf1183 100644 (file)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef __OUTPUT_JSON_FRAME_H__
-#define __OUTPUT_JSON_FRAME_H__
+#ifndef SURICATA_OUTPUT_JSON_FRAME_H
+#define SURICATA_OUTPUT_JSON_FRAME_H
 
 #include "app-layer-frames.h"
 #include "stream-tcp-private.h"
@@ -34,4 +34,4 @@ void FrameJsonLogOneFrame(const uint8_t ipproto, const Frame *frame, const Flow
         const TcpStream *stream, const Packet *p, JsonBuilder *jb);
 void JsonFrameLogRegister(void);
 
-#endif /* __OUTPUT_JSON_FRAME_H__ */
+#endif /* SURICATA_OUTPUT_JSON_FRAME_H */
index 704defd9585c4fb2f2c0b5fd6986b6750fd02335..b87eebe2cc3f9f7b84f296f33c4e1d3a3d819917 100644 (file)
  * \author Jeff Lucovsky <jeff@lucovsky.org>
  */
 
-#ifndef __OUTPUT_JSON_FTP_H__
-#define __OUTPUT_JSON_FTP_H__
+#ifndef SURICATA_OUTPUT_JSON_FTP_H
+#define SURICATA_OUTPUT_JSON_FTP_H
 
 void JsonFTPLogRegister(void);
 bool EveFTPLogCommand(void *vtx, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_FTP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_FTP_H */
index cb358a4b314fce4b5fde335f1bdc53d70d94ad41..eb077d1756540700318c7cff3f1896d16ea482e4 100644 (file)
@@ -21,8 +21,8 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_HTTP_H__
-#define __OUTPUT_JSON_HTTP_H__
+#ifndef SURICATA_OUTPUT_JSON_HTTP_H
+#define SURICATA_OUTPUT_JSON_HTTP_H
 
 void JsonHttpLogRegister(void);
 
@@ -30,5 +30,4 @@ bool EveHttpAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *js);
 void EveHttpLogJSONBodyPrintable(JsonBuilder *js, Flow *f, uint64_t tx_id);
 void EveHttpLogJSONBodyBase64(JsonBuilder *js, Flow *f, uint64_t tx_id);
 
-#endif /* __OUTPUT_JSON_HTTP_H__ */
-
+#endif /* SURICATA_OUTPUT_JSON_HTTP_H */
index 88ba420ab2dff1d9f8ab945c4c1e26f1a70e4881..2b30fd7901f8e4ff0466332762b37a3b8aa1f8ee 100644 (file)
@@ -21,9 +21,9 @@
  * \author Philippe Antoine <p.antoine@catenacyber.fr>
  */
 
-#ifndef __OUTPUT_JSON_HTTP2_H__
-#define __OUTPUT_JSON_HTTP2_H__
+#ifndef SURICATA_OUTPUT_JSON_HTTP2_H
+#define SURICATA_OUTPUT_JSON_HTTP2_H
 
 void JsonHttp2LogRegister(void);
 
-#endif /* __OUTPUT_JSON_HTTP2_H__ */
+#endif /* SURICATA_OUTPUT_JSON_HTTP2_H */
index af5188b19eaec313c71de9eb8a8f7612f97022ce..b4cbb602e4ed600c2deeeff70e64f5302f0f6742 100644 (file)
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __OUTPUT_JSON_IKE_H__
-#define __OUTPUT_JSON_IKE_H__
+#ifndef SURICATA_OUTPUT_JSON_IKE_H
+#define SURICATA_OUTPUT_JSON_IKE_H
 
 void JsonIKELogRegister(void);
 
 bool EveIKEAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_IKE_H__ */
+#endif /* SURICATA_OUTPUT_JSON_IKE_H */
index 87f5b79136cbc442c5e6bb805f13e703ab5fa689..33c7f956773bf7832cff83590f42c7bc1bcbf34d 100644 (file)
@@ -21,9 +21,9 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __OUTPUT_JSON_KRB5_H__
-#define __OUTPUT_JSON_KRB5_H__
+#ifndef SURICATA_OUTPUT_JSON_KRB5_H
+#define SURICATA_OUTPUT_JSON_KRB5_H
 
 void JsonKRB5LogRegister(void);
 
-#endif /* __OUTPUT_JSON_KRB5_H__ */
+#endif /* SURICATA_OUTPUT_JSON_KRB5_H */
index 5db22cf5079079b0b4834c8dfc881b4ecc9f46cb..a1aeb2525e42ac0dd5efa8486f33cee4c27520fa 100644 (file)
@@ -24,9 +24,9 @@
  *
  */
 
-#ifndef __OUTPUT_JSON_METADATA_H__
-#define __OUTPUT_JSON_METADATA_H__
+#ifndef SURICATA_OUTPUT_JSON_METADATA_H
+#define SURICATA_OUTPUT_JSON_METADATA_H
 
 void JsonMetadataLogRegister(void);
 
-#endif /* __OUTPUT_JSON_METADATA_H__ */
+#endif /* SURICATA_OUTPUT_JSON_METADATA_H */
index 2b07e4eb2d5c4722abf7ee02f9e043c8bbd178d4..4c104964a2852cf70bca800053f596343a17a5d7 100644 (file)
@@ -15,9 +15,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef __OUTPUT_JSON_MODBUS_H__
-#define __OUTPUT_JSON_MODBUS_H__
+#ifndef SURICATA_OUTPUT_JSON_MODBUS_H
+#define SURICATA_OUTPUT_JSON_MODBUS_H
 
 void JsonModbusLogRegister(void);
 
-#endif /* __OUTPUT_JSON_MODBUS_H__ */
+#endif /* SURICATA_OUTPUT_JSON_MODBUS_H */
index 42d66f48680d0bf8f85e99ac2efd5c8eb2f8491b..31dfab4c7d6bfcb38a7917f75f4a4e655d2bdc15 100644 (file)
  * \author Sascha Steinbiss <sascha@steinbiss.name>
  */
 
-#ifndef __OUTPUT_JSON_MQTT_H__
-#define __OUTPUT_JSON_MQTT_H__
+#ifndef SURICATA_OUTPUT_JSON_MQTT_H
+#define SURICATA_OUTPUT_JSON_MQTT_H
 
 void JsonMQTTLogRegister(void);
 bool JsonMQTTAddMetadata(void *vtx, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_MQTT_H__ */
+#endif /* SURICATA_OUTPUT_JSON_MQTT_H */
index 738c497fd8305447665eb2a23845d013302d0328..c3fbefa9cd9fd555acf9cb69836daa791bbee58a 100644 (file)
@@ -21,8 +21,8 @@
  * Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __OUTPUT_JSON_NETFLOW_H__
-#define __OUTPUT_JSON_NETFLOW_H__
+#ifndef SURICATA_OUTPUT_JSON_NETFLOW_H
+#define SURICATA_OUTPUT_JSON_NETFLOW_H
 
 void JsonNetFlowLogRegister(void);
 
index b2022ea5332496c7d68f78faba32f13440687c5c..5d8903e1f3bf368bbe32dac19e243a26030ac6c9 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __OUTPUT_JSON_NFS_H__
-#define __OUTPUT_JSON_NFS_H__
+#ifndef SURICATA_OUTPUT_JSON_NFS_H
+#define SURICATA_OUTPUT_JSON_NFS_H
 
 void JsonNFSLogRegister(void);
 
 bool EveNFSAddMetadataRPC(const Flow *f, uint64_t tx_id, JsonBuilder *jb);
 bool EveNFSAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *jb);
 
-#endif /* __OUTPUT_JSON_NFS_H__ */
+#endif /* SURICATA_OUTPUT_JSON_NFS_H */
index 7d2e8261350d6728883d07cdd7ae4bf0949aaa67..78eca152d6fe3617321e8ff9c3c75bd17c6de8ce 100644 (file)
@@ -21,9 +21,9 @@
  * \author Juliana Fajardini <jufajardini@oisf.net>
  */
 
-#ifndef __OUTPUT_JSON_PGSQL_H__
-#define __OUTPUT_JSON_PGSQL_H__
+#ifndef SURICATA_OUTPUT_JSON_PGSQL_H
+#define SURICATA_OUTPUT_JSON_PGSQL_H
 
 void JsonPgsqlLogRegister(void);
 
-#endif /* __OUTPUT_JSON_PGSQL_H__ */
+#endif /* SURICATA_OUTPUT_JSON_PGSQL_H */
index 48e38185f2bd20dffaa2ee562b7b928284fcdc76..a93a4dff029f146d75195a175b52943280ae6577 100644 (file)
@@ -19,9 +19,9 @@
  * \file
  */
 
-#ifndef __OUTPUT_JSON_QUIC_H__
-#define __OUTPUT_JSON_QUIC_H__
+#ifndef SURICATA_OUTPUT_JSON_QUIC_H
+#define SURICATA_OUTPUT_JSON_QUIC_H
 
 void JsonQuicLogRegister(void);
 
-#endif /* __OUTPUT_JSON_QUIC_H__ */
+#endif /* SURICATA_OUTPUT_JSON_QUIC_H */
index 5dc9237691ea948ff7a7aa0f1219c2a2e0f078cd..9a400c9a2d0325795f7625c70d33b402be0aed12 100644 (file)
@@ -21,9 +21,9 @@
  * \author Zach Kelly <zach.kelly@lmco.com>
  */
 
-#ifndef __OUTPUT_JSON_RDP_H__
-#define __OUTPUT_JSON_RDP_H__
+#ifndef SURICATA_OUTPUT_JSON_RDP_H
+#define SURICATA_OUTPUT_JSON_RDP_H
 
 void JsonRdpLogRegister(void);
 
-#endif /* __OUTPUT_JSON_RDP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_RDP_H */
index 7e4e48ebd4c885a805ece892cb15c692666ec756..4411963b9bed74c2265e6fb2a0f5db5db7284a68 100644 (file)
@@ -21,9 +21,9 @@
  * \author Frank Honza <frank.honza@dcso.de>
  */
 
-#ifndef __OUTPUT_JSON_RFB_H__
-#define __OUTPUT_JSON_RFB_H__
+#ifndef SURICATA_OUTPUT_JSON_RFB_H
+#define SURICATA_OUTPUT_JSON_RFB_H
 
 void JsonRFBLogRegister(void);
 
-#endif /* __OUTPUT_JSON_RFB_H__ */
+#endif /* SURICATA_OUTPUT_JSON_RFB_H */
index 0d2c53fa50dfc5f8cce7199112f5ad07a646170b..1d47e5ada22323e8c0e6c217715acf1f530f3bf8 100644 (file)
@@ -21,9 +21,9 @@
  * \author Giuseppe Longo <giuseppe@glongo.it>
  */
 
-#ifndef __OUTPUT_JSON_SIP_H__
-#define __OUTPUT_JSON_SIP_H__
+#ifndef SURICATA_OUTPUT_JSON_SIP_H
+#define SURICATA_OUTPUT_JSON_SIP_H
 
 void JsonSIPLogRegister(void);
 
-#endif /* __OUTPUT_JSON_SIP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_SIP_H */
index da15e813f802bf8d207d1162bcbba4d838b85441..bfb1f0ff167f7de22e506e92a569691e04338668 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __OUTPUT_JSON_SMB_H__
-#define __OUTPUT_JSON_SMB_H__
+#ifndef SURICATA_OUTPUT_JSON_SMB_H
+#define SURICATA_OUTPUT_JSON_SMB_H
 
 void JsonSMBLogRegister(void);
 bool EveSMBAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *jb);
 
-#endif /* __OUTPUT_JSON_SMB_H__ */
+#endif /* SURICATA_OUTPUT_JSON_SMB_H */
index 9c95f616b3a6c72cb0ad0a46d725773170619dd5..51fca1ef1eda45cf2f815311f06b0085f02c743a 100644 (file)
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_SMTP_H__
-#define __OUTPUT_JSON_SMTP_H__
+#ifndef SURICATA_OUTPUT_JSON_SMTP_H
+#define SURICATA_OUTPUT_JSON_SMTP_H
 
 void JsonSmtpLogRegister(void);
 bool EveSMTPAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_SMTP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_SMTP_H */
index 4c88db32317d78f27c55c969a1e75d97695681ce..fa40b0c2f0d31af2596061a74d5f6aac38d77c5e 100644 (file)
@@ -21,9 +21,9 @@
  * \author Pierre Chifflier <chifflier@wzdftpd.net>
  */
 
-#ifndef __OUTPUT_JSON_SNMP_H__
-#define __OUTPUT_JSON_SNMP_H__
+#ifndef SURICATA_OUTPUT_JSON_SNMP_H
+#define SURICATA_OUTPUT_JSON_SNMP_H
 
 void JsonSNMPLogRegister(void);
 
-#endif /* __OUTPUT_JSON_SNMP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_SNMP_H */
index d0f9d3fc7dde74152e001c7036b66dc69e4db026..74f24b053bd6f590c195876330ac12564d8c0d3c 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __OUTPUT_JSON_SSH_H__
-#define __OUTPUT_JSON_SSH_H__
+#ifndef SURICATA_OUTPUT_JSON_SSH_H
+#define SURICATA_OUTPUT_JSON_SSH_H
 
 void JsonSshLogRegister(void);
 
-#endif /* __OUTPUT_JSON_SSH_H__ */
+#endif /* SURICATA_OUTPUT_JSON_SSH_H */
index b569e30b6429631b0351677bb59d479d45af06e4..9647f729168b4e8039ef7d739f820e39b991c715 100644 (file)
@@ -21,8 +21,8 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_COUNTERS_H__
-#define __OUTPUT_JSON_COUNTERS_H__
+#ifndef SURICATA_OUTPUT_JSON_COUNTERS_H
+#define SURICATA_OUTPUT_JSON_COUNTERS_H
 
 #include "output-stats.h"
 
@@ -37,4 +37,4 @@ void JsonStatsLogRegister(void);
 
 void OutputJsonStatsRegisterTests(void);
 
-#endif /* __OUTPUT_JSON_COUNTERS_H__ */
+#endif /* SURICATA_OUTPUT_JSON_COUNTERS_H */
index d27b8d7c0e05d23bda9e66d0997d9a5d054ca95f..5a91af5932e19347be48b5b3cfa0570a953ba592 100644 (file)
@@ -21,9 +21,9 @@
  * \author FirstName LastName <name@domain>
  */
 
-#ifndef __OUTPUT_JSON_TEMPLATE_RUST_H__
-#define __OUTPUT_JSON_TEMPLATE_RUST_H__
+#ifndef SURICATA_OUTPUT_JSON_TEMPLATE_RUST_H
+#define SURICATA_OUTPUT_JSON_TEMPLATE_RUST_H
 
 void JsonTemplateLogRegister(void);
 
-#endif /* __OUTPUT_JSON_TEMPLATE_RUST_H__ */
+#endif /* SURICATA_OUTPUT_JSON_TEMPLATE_RUST_H */
index 3db4ba06cd552ad8f1534c9a22fb27049bf11e45..40bbf7c4d4740e2f83e115fa83414b965612c435 100644 (file)
@@ -21,9 +21,9 @@
  * \author Clément Galland <clement.galland@epita.fr>
  */
 
-#ifndef __OUTPUT_JSON_TFTP_H__
-#define __OUTPUT_JSON_TFTP_H__
+#ifndef SURICATA_OUTPUT_JSON_TFTP_H
+#define SURICATA_OUTPUT_JSON_TFTP_H
 
 void JsonTFTPLogRegister(void);
 
-#endif /* __OUTPUT_JSON_TFTP_H__ */
+#endif /* SURICATA_OUTPUT_JSON_TFTP_H */
index 42f706b91d3fd4a0d7cfc475e8559ac598af5b9d..bd73e2fc964bbdb6e1bb0968df1715c01c95c666 100644 (file)
@@ -21,8 +21,8 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_TLS_H__
-#define __OUTPUT_JSON_TLS_H__
+#ifndef SURICATA_OUTPUT_JSON_TLS_H
+#define SURICATA_OUTPUT_JSON_TLS_H
 
 void JsonTlsLogRegister(void);
 
@@ -31,4 +31,4 @@ void JsonTlsLogRegister(void);
 void JsonTlsLogJSONBasic(JsonBuilder *js, SSLState *ssl_state);
 bool JsonTlsLogJSONExtended(void *vtx, JsonBuilder *js);
 
-#endif /* __OUTPUT_JSON_TLS_H__ */
+#endif /* SURICATA_OUTPUT_JSON_TLS_H */
index 6fe6c5898d7409ea81fa3b0b8f705d2583e8698b..961e1204c58be6f865abd8e3fa1447e80a75772e 100644 (file)
@@ -21,8 +21,8 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_JSON_H__
-#define __OUTPUT_JSON_H__
+#ifndef SURICATA_OUTPUT_JSON_H
+#define SURICATA_OUTPUT_JSON_H
 
 #include "suricata-common.h"
 #include "util-buffer.h"
@@ -119,4 +119,4 @@ int OutputJSONMemBufferCallback(const char *str, size_t size, void *data);
 OutputJsonThreadCtx *CreateEveThreadCtx(ThreadVars *t, OutputJsonCtx *ctx);
 void FreeEveThreadCtx(OutputJsonThreadCtx *ctx);
 
-#endif /* __OUTPUT_JSON_H__ */
+#endif /* SURICATA_OUTPUT_JSON_H */
index c8c5ebbf45652ab8fab0faed8daa24ac42624ff1..6ef9165aec43dff4db72188119ac2e6ada63e901 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __OUTPUT_LUA_H__
-#define __OUTPUT_LUA_H__
+#ifndef SURICATA_OUTPUT_LUA_H
+#define SURICATA_OUTPUT_LUA_H
 
 void LuaLogRegister(void);
 
-#endif /* __OUTPUT_LUA_H__ */
+#endif /* SURICATA_OUTPUT_LUA_H */
index 1e468669f13784115be106233f20fcb1c02bd4ff..4e8d2a65fdfd3cd7c20597e79f7a36748ff66fd5 100644 (file)
@@ -23,8 +23,8 @@
  * Packet Logger Output registration functions
  */
 
-#ifndef __OUTPUT_PACKET_H__
-#define __OUTPUT_PACKET_H__
+#ifndef SURICATA_OUTPUT_PACKET_H
+#define SURICATA_OUTPUT_PACKET_H
 
 /** packet logger function pointer type */
 typedef int (*PacketLogger)(ThreadVars *, void *thread_data, const Packet *);
@@ -42,4 +42,4 @@ void OutputPacketLoggerRegister(void);
 
 void OutputPacketShutdown(void);
 
-#endif /* __OUTPUT_PACKET_H__ */
+#endif /* SURICATA_OUTPUT_PACKET_H */
index f6fc6a8b2716d7133e090b5104416e96b666d709..56ad2cb78faf1cde5d2c6e0e5a58b8597719ebfd 100644 (file)
@@ -23,8 +23,8 @@
  * Stats Logger Output registration functions
  */
 
-#ifndef __OUTPUT_STATS_H__
-#define __OUTPUT_STATS_H__
+#ifndef SURICATA_OUTPUT_STATS_H
+#define SURICATA_OUTPUT_STATS_H
 
 #include "tm-modules.h"
 
@@ -59,4 +59,4 @@ int OutputStatsLoggersRegistered(void);
 
 void OutputStatsShutdown(void);
 
-#endif /* __OUTPUT_STATS_H__ */
+#endif /* SURICATA_OUTPUT_STATS_H */
index 07c3722d8e3d07aabde1984aef3c80e32d7ab2fe..91c89f1941430113812a1337a024680d1b7bada6 100644 (file)
@@ -23,9 +23,8 @@
  * Streaming Logger Output registration functions
  */
 
-#ifndef __OUTPUT_STREAMING_H__
-#define __OUTPUT_STREAMING_H__
-
+#ifndef SURICATA_OUTPUT_STREAMING_H
+#define SURICATA_OUTPUT_STREAMING_H
 
 #define OUTPUT_STREAMING_FLAG_OPEN          0x01
 #define OUTPUT_STREAMING_FLAG_CLOSE         0x02
@@ -52,4 +51,4 @@ void OutputStreamingLoggerRegister (void);
 
 void OutputStreamingShutdown(void);
 
-#endif /* __OUTPUT_STREAMING_H__ */
+#endif /* SURICATA_OUTPUT_STREAMING_H */
index 88c12ff25f684df74901437b24063196db5ba6a5..cf7ffe7ff71d3d0c3deea78f725e6ebfcc77df5f 100644 (file)
@@ -23,8 +23,8 @@
  * AppLayer TX Logger Output registration functions
  */
 
-#ifndef __OUTPUT_TX_H__
-#define __OUTPUT_TX_H__
+#ifndef SURICATA_OUTPUT_TX_H
+#define SURICATA_OUTPUT_TX_H
 
 #include "decode.h"
 #include "flow.h"
@@ -49,4 +49,4 @@ void OutputTxLoggerRegister (void);
 
 void OutputTxShutdown(void);
 
-#endif /* __OUTPUT_TX_H__ */
+#endif /* SURICATA_OUTPUT_TX_H */
index 815b2f20ed732087489dfb755f41f6125c8879ea..76b432a92663a1530c8496cbb9189aa11ff0df60 100644 (file)
@@ -21,8 +21,8 @@
  * \author Endace Technology Limited, Jason Ish <jason.ish@endace.com>
  */
 
-#ifndef __OUTPUT_H__
-#define __OUTPUT_H__
+#ifndef SURICATA_OUTPUT_H
+#define SURICATA_OUTPUT_H
 
 #include "decode.h"
 #include "tm-modules.h"
@@ -217,4 +217,4 @@ typedef struct EveJsonSimpleAppLayerLogger {
 
 EveJsonSimpleAppLayerLogger *SCEveJsonSimpleGetLogger(AppProto alproto);
 
-#endif /* ! __OUTPUT_H__ */
+#endif /* ! SURICATA_OUTPUT_H */
index 408987064380b7ba199410340ee17853933c6a31..09cf0ab2dbb1a2f14ff882c29efe5e179610e150 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __PACKET_QUEUE_H__
-#define __PACKET_QUEUE_H__
+#ifndef SURICATA_PACKET_QUEUE_H
+#define SURICATA_PACKET_QUEUE_H
 
 #include "threads.h"
 
@@ -67,5 +67,4 @@ struct Packet_ *PacketDequeue (PacketQueue *);
 PacketQueue *PacketQueueAlloc(void);
 void PacketQueueFree(PacketQueue *);
 
-#endif /* __PACKET_QUEUE_H__ */
-
+#endif /* SURICATA_PACKET_QUEUE_H */
index 0ef2c5d3abce94519ad98750a402ebed58a86f91..0b03a59631925224560f5a362d77ee8cf0d8468f 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __PACKET_H__
-#define __PACKET_H__
+#ifndef SURICATA_PACKET_H
+#define SURICATA_PACKET_H
 
 #include "decode.h"
 
index 0a261c9ffaaf5d53ce63d33e0f5d22d0f2a6c718..6acd4f468d30f35f5742e3ab61e7452ab31bbe00 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __PKT_VAR_H__
-#define __PKT_VAR_H__
+#ifndef SURICATA_PKT_VAR_H
+#define SURICATA_PKT_VAR_H
 
 int WARN_UNUSED PktVarAddKeyValue(Packet *, uint8_t *, uint16_t, uint8_t *, uint16_t);
 int WARN_UNUSED PktVarAdd(Packet *, uint32_t id, uint8_t *, uint16_t);
 PktVar *PktVarGet(Packet *, uint32_t id);
 void PktVarFree(PktVar *);
 
-#endif /* __PKT_VAR_H__ */
-
+#endif /* SURICATA_PKT_VAR_H */
index 3ed94d9851596aca8c8b68cda6d02efd7c3fc6b9..23bc0233387e5fd7af0dff82a8be8cad917a156b 100644 (file)
@@ -23,8 +23,8 @@
  *         Original Idea by Matt Jonkman
  */
 
-#ifndef __REPUTATION_H__
-#define __REPUTATION_H__
+#ifndef SURICATA_REPUTATION_H
+#define SURICATA_REPUTATION_H
 
 #include "host.h"
 #include "util-radix-tree.h"
@@ -57,4 +57,4 @@ int SRepLoadFileFromFD(SRepCIDRTree *cidr_ctx, FILE *fp);
 
 void SCReputationRegisterTests(void);
 
-#endif /* __REPUTATION_H__ */
+#endif /* SURICATA_REPUTATION_H */
index d6d5c2516c87b498457e858ee64a1556e5345497..d0337e41eb1d4fcb088cfe28a7b74c7942fddc27 100644 (file)
@@ -22,8 +22,8 @@
  *  \author William Metcalf <william.metcalf@gmail.com>
  */
 
-#ifndef __RESPOND_REJECT_LIBNET11_H__
-#define __RESPOND_REJECT_LIBNET11_H__
+#ifndef SURICATA_RESPOND_REJECT_LIBNET11_H
+#define SURICATA_RESPOND_REJECT_LIBNET11_H
 
 int RejectSendLibnet11IPv4TCP(ThreadVars *, Packet *, void *, enum RejectDirection);
 int RejectSendLibnet11IPv4ICMP(ThreadVars *, Packet *, void *, enum RejectDirection);
@@ -33,4 +33,4 @@ int RejectSendLibnet11IPv6ICMP(ThreadVars *, Packet *, void *, enum RejectDirect
 
 void FreeCachedCtx(void);
 
-#endif /* __RESPOND_REJECT_LIBNET11_H__ */
+#endif /* SURICATA_RESPOND_REJECT_LIBNET11_H */
index 0df165591cee221d017490d3ef6396b5d6837a0b..4dce7262bf854a426b186b368b1aee60b4013f5f 100644 (file)
@@ -21,9 +21,8 @@
  * \author William Metcalf <william.metcalf@gmail.com>
  */
 
-#ifndef __RESPOND_REJECT_H__
-#define __RESPOND_REJECT_H__
-
+#ifndef SURICATA_RESPOND_REJECT_H
+#define SURICATA_RESPOND_REJECT_H
 
 enum RejectDirection {
     REJECT_DIR_SRC = 0,
@@ -32,4 +31,4 @@ enum RejectDirection {
 
 void TmModuleRespondRejectRegister (void);
 
-#endif /* __RESPOND_REJECT_H__ */
+#endif /* SURICATA_RESPOND_REJECT_H */
index ccaa2c6ae8f0f3c460008a8aa520c1d3c2b712b8..b913c53d7e8e417cc75ed174de9448064d8ec1d3 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __RUNMODE_AF_PACKET_H__
-#define __RUNMODE_AF_PACKET_H__
+#ifndef SURICATA_RUNMODE_AF_PACKET_H
+#define SURICATA_RUNMODE_AF_PACKET_H
 
 int RunModeIdsAFPSingle(void);
 int RunModeIdsAFPAutoFp(void);
@@ -29,4 +29,4 @@ int RunModeIdsAFPWorkers(void);
 void RunModeIdsAFPRegister(void);
 const char *RunModeAFPGetDefaultMode(void);
 
-#endif /* __RUNMODE_AF_PACKET_H__ */
+#endif /* SURICATA_RUNMODE_AF_PACKET_H */
index faa1c7a65d7678a510c7de334981372f96cfe15c..9828e8fb277487ae5b710e7222c731c95cb9b909 100644 (file)
  * \author Richard McConnell <richard_mcconnell@rapid7.com>
  */
 
-#ifndef __RUNMODE_AFXDP_H__
-#define __RUNMODE_AFXDP_H__
+#ifndef SURICATA_RUNMODE_AFXDP_H
+#define SURICATA_RUNMODE_AFXDP_H
 
 int RunModeIdsAFXDPSingle(void);
 int RunModeIdsAFXDPWorkers(void);
 void RunModeIdsAFXDPRegister(void);
 const char *RunModeAFXDPGetDefaultMode(void);
 
-#endif /* __RUNMODE_AFXDP_H__ */
+#endif /* SURICATA_RUNMODE_AFXDP_H */
index 152c1d687893f0b8992fbf453cdc13b285f71666..2f964592835e8ae767a9faad32c8e4d8216d6fa2 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Lukas Sismis <lukas.sismis@gmail.com>
  */
 
-#ifndef __RUNMODE_DPDK_H__
-#define __RUNMODE_DPDK_H__
+#ifndef SURICATA_RUNMODE_DPDK_H
+#define SURICATA_RUNMODE_DPDK_H
 
 typedef struct DPDKIfaceConfigAttributes_ {
     const char *threads;
@@ -44,4 +44,4 @@ int RunModeIdsDpdkWorkers(void);
 void RunModeDpdkRegister(void);
 const char *RunModeDpdkGetDefaultMode(void);
 
-#endif /* __RUNMODE_DPDK_H__ */
+#endif /* SURICATA_RUNMODE_DPDK_H */
index c4b2a59cee5e201de9a053dcb0f700e851dec66f..58f4e144d525a052a3db023d6e8c5e112d1b7d7f 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODE_ERF_DAG_H__
-#define __RUNMODE_ERF_DAG_H__
+#ifndef SURICATA_RUNMODE_ERF_DAG_H
+#define SURICATA_RUNMODE_ERF_DAG_H
 
 int RunModeIdsErfDagAutoFp(void);
 int RunModeIdsErfDagSingle(void);
@@ -29,4 +29,4 @@ int RunModeIdsErfDagWorkers(void);
 void RunModeErfDagRegister(void);
 const char *RunModeErfDagGetDefaultMode(void);
 
-#endif /* __RUNMODE_ERF_DAG_H__ */
+#endif /* SURICATA_RUNMODE_ERF_DAG_H */
index 54a8ba8972fae4835b1a26ed933a3874dbb2f465..c760c745fe2aae92c697f2ef8a969a8ec6214fe5 100644 (file)
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODE_ERF_FILE_H__
-#define __RUNMODE_ERF_FILE_H__
+#ifndef SURICATA_RUNMODE_ERF_FILE_H
+#define SURICATA_RUNMODE_ERF_FILE_H
 
 int RunModeErfFileSingle(void);
 int RunModeErfFileAutoFp(void);
 void RunModeErfFileRegister(void);
 const char *RunModeErfFileGetDefaultMode(void);
 
-#endif /* __RUNMODE_ERF_FILE_H__ */
+#endif /* SURICATA_RUNMODE_ERF_FILE_H */
index 5c8345b17455fc4cb2531814854814176c1a651a..a4d613950fa90e28ff4a8cddbcc76450c9e276ce 100644 (file)
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODE_IPFW_H__
-#define __RUNMODE_IPFW_H__
+#ifndef SURICATA_RUNMODE_IPFW_H
+#define SURICATA_RUNMODE_IPFW_H
 
 int RunModeIpsIPFWAutoFp(void);
 int RunModeIpsIPFWWorker(void);
 void RunModeIpsIPFWRegister(void);
 const char *RunModeIpsIPFWGetDefaultMode(void);
 
-#endif /* __RUNMODE_IPFW_H__ */
+#endif /* SURICATA_RUNMODE_IPFW_H */
index d77133addaa2bda77f7511f9c54c5caa368407b7..5a264429d1bd6df48afe84384ae19bd2064ee22e 100644 (file)
@@ -22,9 +22,8 @@
  *  \author Matt Keeler <mk@npulsetech.com>
  */
 
-
-#ifndef __RUNMODE_NAPATECH_H__
-#define __RUNMODE_NAPATECH_H__
+#ifndef SURICATA_RUNMODE_NAPATECH_H
+#define SURICATA_RUNMODE_NAPATECH_H
 
 #ifdef HAVE_NAPATECH
 #include <nt.h>
@@ -41,5 +40,4 @@ uint16_t NapatechGetNumLastStream(void);
 bool NapatechIsAutoConfigEnabled(void);
 bool NapatechUseHWBypass(void);
 
-
-#endif /* __RUNMODE_NAPATECH_H__ */
+#endif /* SURICATA_RUNMODE_NAPATECH_H */
index 6ba9445b086d04244009380d4dd1d395e485c4c3..16551e2c890ec5c715aa765974b7a10baff13493 100644 (file)
@@ -20,8 +20,8 @@
 *  \author Aleksey Katargin <gureedo@gmail.com>
 */
 
-#ifndef __RUNMODE_NETMAP_H__
-#define __RUNMODE_NETMAP_H__
+#ifndef SURICATA_RUNMODE_NETMAP_H
+#define SURICATA_RUNMODE_NETMAP_H
 
 int RunModeIdsNetmapSingle(void);
 int RunModeIdsNetmapAutoFp(void);
@@ -29,4 +29,4 @@ int RunModeIdsNetmapWorkers(void);
 void RunModeIdsNetmapRegister(void);
 const char *RunModeNetmapGetDefaultMode(void);
 
-#endif /* __RUNMODE_NETMAP_H__ */
+#endif /* SURICATA_RUNMODE_NETMAP_H */
index 034a074cb99690981d6b018b36dc2a3b6004bce9..38598873c915a88a3a41d223a212f6f125993e36 100644 (file)
  *
  * \author Giuseppe Longo <giuseppelng@gmail.com>
  */
-#ifndef __RUNMODE_NFLOG_H__
-#define __RUNMODE_NFLOG_H__
+#ifndef SURICATA_RUNMODE_NFLOG_H
+#define SURICATA_RUNMODE_NFLOG_H
 
 void RunModeIdsNflogRegister(void);
 const char *RunModeIdsNflogGetDefaultMode(void);
 
-#endif /* __RUNMODE_NFLOG_H__ */
+#endif /* SURICATA_RUNMODE_NFLOG_H */
index 6ad880146639c3dc8fc7fba7506487ca8a26bc79..5a7b4349cc4b8f9709b80092b655bd4a67eb0e32 100644 (file)
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODE_NFQ_H__
-#define __RUNMODE_NFQ_H__
+#ifndef SURICATA_RUNMODE_NFQ_H
+#define SURICATA_RUNMODE_NFQ_H
 
 int RunModeIpsNFQAutoFp(void);
 int RunModeIpsNFQWorker(void);
 void RunModeIpsNFQRegister(void);
 const char *RunModeIpsNFQGetDefaultMode(void);
 
-#endif /* __RUNMODE_NFQ_H__ */
+#endif /* SURICATA_RUNMODE_NFQ_H */
index 52cab02228f0628b22035e24ed6479e53171929f..54fbad72a902144a61779e42a326ea1dd940fd09 100644 (file)
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODE_PCAP_FILE_H__
-#define __RUNMODE_PCAP_FILE_H__
+#ifndef SURICATA_RUNMODE_PCAP_FILE_H
+#define SURICATA_RUNMODE_PCAP_FILE_H
 
 int RunModeFilePcapSingle(void);
 int RunModeFilePcapAutoFp(void);
 void RunModeFilePcapRegister(void);
 const char *RunModeFilePcapGetDefaultMode(void);
 
-#endif /* __RUNMODE_PCAP_FILE_H__ */
+#endif /* SURICATA_RUNMODE_PCAP_FILE_H */
index b68c6ddcfc7f91a3106469b5d232bf651c495df3..54a96c5d3f327230846125b70c88e4ccd8500b99 100644 (file)
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODE_PCAP_H__
-#define __RUNMODE_PCAP_H__
+#ifndef SURICATA_RUNMODE_PCAP_H
+#define SURICATA_RUNMODE_PCAP_H
 
 int RunModeIdsPcapSingle(void);
 int RunModeIdsPcapAutoFp(void);
 void RunModeIdsPcapRegister(void);
 const char *RunModeIdsGetDefaultMode(void);
 
-#endif /* __RUNMODE_PCAP_H__ */
+#endif /* SURICATA_RUNMODE_PCAP_H */
index 316c82f74af68f51a987d45c24d2239eb2d6c2dc..dbdc60091f64a9c1ce8555a1ddeccbc788e7c346 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODE_PFRING_H__
-#define __RUNMODE_PFRING_H__
+#ifndef SURICATA_RUNMODE_PFRING_H
+#define SURICATA_RUNMODE_PFRING_H
 
 #include "suricata-common.h"
 
@@ -31,4 +31,4 @@ int RunModeIdsPfringWorkers(void);
 void RunModeIdsPfringRegister(void);
 const char *RunModeIdsPfringGetDefaultMode(void);
 
-#endif /* __RUNMODE_PFRING_H__ */
+#endif /* SURICATA_RUNMODE_PFRING_H */
index 928e22bd5ed63574b49092f82a78e22b049a9365..f1a2dab340efc2ba3ea5a7733f8d5cd71c3edc73 100644 (file)
  *  \author Eric Leblond <eric@regit.org>
  */
 
-
-#ifndef __UTIL_RUNMODE_UNITTESTS_H__
-#define __UTIL_RUNMODE_UNITTESTS_H__
+#ifndef SURICATA_UTIL_RUNMODE_UNITTESTS_H
+#define SURICATA_UTIL_RUNMODE_UNITTESTS_H
 
 __attribute__((noreturn))
 void RunUnittests(int list_unittests, const char *regex_arg);
 
-#endif /* __UTIL_RUNMODE_UNITTESTS_H__ */
+#endif /* SURICATA_UTIL_RUNMODE_UNITTESTS_H */
index af0651f5910b16b3f03e5f0dec14da334edddbe2..8ea432f57dadac25ad90c4c99518cf0d684dc5a3 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __RUNMODE_UNIX_SOCKET_H__
-#define __RUNMODE_UNIX_SOCKET_H__
+#ifndef SURICATA_RUNMODE_UNIX_SOCKET_H
+#define SURICATA_RUNMODE_UNIX_SOCKET_H
 
 void RunModeUnixSocketRegister(void);
 const char *RunModeUnixSocketGetDefaultMode(void);
@@ -53,4 +53,4 @@ TmEcode UnixSocketShowAllMemcap(json_t *cmd, json_t *answer, void *data);
 TmEcode UnixSocketGetFlowStatsById(json_t *cmd, json_t *answer, void *data);
 #endif
 
-#endif /* __RUNMODE_UNIX_SOCKET_H__ */
+#endif /* SURICATA_RUNMODE_UNIX_SOCKET_H */
index 5071fcf7a860bb4e3256c4104038e3f24dce1aca..e98d311ee2dbc00e16eee526d2e1def9d6386af1 100644 (file)
  *
  */
 
-#ifndef __RUNMODE_WINDIVERT_H__
-#define __RUNMODE_WINDIVERT_H__
+#ifndef SURICATA_RUNMODE_WINDIVERT_H
+#define SURICATA_RUNMODE_WINDIVERT_H
 
 int RunModeIpsWinDivertAutoFp(void);
 void RunModeIpsWinDivertRegister(void);
 const char *RunModeIpsWinDivertGetDefaultMode(void);
 
-#endif /* __RUNMODE_WINDIVERT_H__ */
\ No newline at end of file
+#endif /* SURICATA_RUNMODE_WINDIVERT_H */
\ No newline at end of file
index 668896dc17c586fa143c8a92146c497341add4fc..af39fe13766b6ef31df6c7a61eafc0cb5e1753c3 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __RUNMODES_H__
-#define __RUNMODES_H__
+#ifndef SURICATA_RUNMODES_H
+#define SURICATA_RUNMODES_H
 
 /* Run mode */
 enum RunModes {
@@ -106,4 +106,4 @@ extern uint64_t threading_set_stack_size;
 
 extern int debuglog_enabled;
 
-#endif /* __RUNMODES_H__ */
+#endif /* SURICATA_RUNMODES_H */
index ba99ac6b72860d76f2fd4a0e122cad435217588f..bbb0253ec6df83b2a87689c2943af9199282742f 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __RUST_CONTEXT_H__
-#define __RUST_CONTEXT_H__
+#ifndef SURICATA_RUST_CONTEXT_H
+#define SURICATA_RUST_CONTEXT_H
 
 #include "flow.h"
 #include "detect.h"
@@ -74,4 +74,4 @@ typedef struct SuricataFileContext_ {
 
 const SuricataContext *SCGetContext(void);
 
-#endif /* !__RUST_CONTEXT_H__ */
+#endif /* !SURICATA_RUST_CONTEXT_H */
index 8ab174f9ec78f81ef231ee63a93721c34e6cf931..03cff24c8d26ca30d55a634b608293088e05c6e6 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __RUST_H__
-#define __RUST_H__
+#ifndef SURICATA_RUST_H
+#define SURICATA_RUST_H
 
 // hack for include orders cf SCSha256
 typedef struct HttpRangeContainerBlock HttpRangeContainerBlock;
@@ -27,4 +27,4 @@ typedef struct HttpRangeContainerBlock HttpRangeContainerBlock;
 #define JB_SET_TRUE(jb, key) jb_set_formatted((jb), "\"" key "\":true")
 #define JB_SET_FALSE(jb, key) jb_set_formatted((jb), "\"" key "\":false")
 
-#endif /* !__RUST_H__ */
+#endif /* !SURICATA_RUST_H */
index d91d0cb25232c54870c27d67787d855d39629711..6785f2fb52d7ecdf1331bd2a46f661647d62bc9d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __SOURCE_AFP_H__
-#define __SOURCE_AFP_H__
+#ifndef SURICATA_SOURCE_AFP_H
+#define SURICATA_SOURCE_AFP_H
 
 #ifndef HAVE_PACKET_FANOUT /* not defined if linux/if_packet.h trying to force */
 #define HAVE_PACKET_FANOUT 1
@@ -193,4 +193,4 @@ int AFPGetLinkType(const char *ifname);
 
 int AFPIsFanoutSupported(uint16_t cluster_id);
 
-#endif /* __SOURCE_AFP_H__ */
+#endif /* SURICATA_SOURCE_AFP_H */
index 3c78a639bc8a24caccddeb4c178e6b2a72ebee26..70a56a13fa02d82607b5d2520ab5a7f16fb9d646 100644 (file)
@@ -21,8 +21,8 @@
  * \author Richard McConnell <richard_mcconnell@rapid7.com>
  */
 
-#ifndef __SOURCE_AFXDP_H__
-#define __SOURCE_AFXDP_H__
+#ifndef SURICATA_SOURCE_AFXDP_H
+#define SURICATA_SOURCE_AFXDP_H
 
 #define AFXDP_IFACE_NAME_LENGTH 48
 
@@ -66,4 +66,4 @@ void TmModuleDecodeAFXDPRegister(void);
 TmEcode AFXDPQueueProtectionInit(void);
 void AFXDPMutexClean(void);
 
-#endif /* __SOURCE_AFXDP_H__ */
+#endif /* SURICATA_SOURCE_AFXDP_H */
index b962d866d4bdeb6c1f352cb37074746837804a98..3187793e2c8ae731fae8c7397415df926368bafa 100644 (file)
@@ -21,8 +21,8 @@
  * \author Lukas Sismis <lukas.sismis@gmail.com>
  */
 
-#ifndef __SOURCE_DPDK_H__
-#define __SOURCE_DPDK_H__
+#ifndef SURICATA_SOURCE_DPDK_H
+#define SURICATA_SOURCE_DPDK_H
 
 #include "suricata-common.h"
 
@@ -92,4 +92,4 @@ typedef struct DPDKPacketVars_ {
 void TmModuleReceiveDPDKRegister(void);
 void TmModuleDecodeDPDKRegister(void);
 
-#endif /* __SOURCE_DPDK_H__ */
+#endif /* SURICATA_SOURCE_DPDK_H */
index e712798b870191cd2138de562bce2ce9fc507e11..6a169c084ea4a86814b9ec4720c48e4ab54e9e76 100644 (file)
  * \author Jason MacLulich <jason.maclulich@endace.com>
  */
 
-#ifndef __SOURCE_ERF_DAG_H__
-#define __SOURCE_ERF_DAG_H__
+#ifndef SURICATA_SOURCE_ERF_DAG_H
+#define SURICATA_SOURCE_ERF_DAG_H
 
 void TmModuleReceiveErfDagRegister(void);
 void TmModuleDecodeErfDagRegister(void);
 
-#endif /* __SOURCE_ERF_DAG_H__ */
-
+#endif /* SURICATA_SOURCE_ERF_DAG_H */
index fc56f74385d23e779c3ec9fc6151f954148f6eb7..4ea4e12a44003e4c53e388976de69dd29fa3c8b1 100644 (file)
  * \author Endace Technology Limited
  */
 
-#ifndef __SOURCE_ERF_H__
-#define __SOURCE_ERF_H__
+#ifndef SURICATA_SOURCE_ERF_H
+#define SURICATA_SOURCE_ERF_H
 
 void TmModuleReceiveErfFileRegister(void);
 void TmModuleDecodeErfFileRegister(void);
 
-#endif /* __SOURCE_ERF_H__ */
+#endif /* SURICATA_SOURCE_ERF_H */
index 94c560a4ba7f1585c61c50ac2d5324c8567da052..d74b73e52606571c9e6b8716767fa58fa9c32201 100644 (file)
@@ -22,8 +22,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __SOURCE_IPFW_H__
-#define __SOURCE_IPFW_H__
+#ifndef SURICATA_SOURCE_IPFW_H
+#define SURICATA_SOURCE_IPFW_H
 
 #define IPFW_MAX_QUEUE 16
 
@@ -66,5 +66,4 @@ void TmModuleReceiveIPFWRegister (void);
 void TmModuleVerdictIPFWRegister (void);
 void TmModuleDecodeIPFWRegister (void);
 
-
-#endif /* __SOURCE_IPFW_H__ */
+#endif /* SURICATA_SOURCE_IPFW_H */
index c638f89dae64909961bf02adc4f76f22761a3006..4a874ae37bf82fcdb8634df5c9fa102f2876673e 100644 (file)
@@ -21,8 +21,8 @@
  * \author nPulse Technologies, LLC.
  * \author Matt Keeler <mk@npulsetech.com>
  */
-#ifndef __SOURCE_NAPATECH_H__
-#define __SOURCE_NAPATECH_H__
+#ifndef SURICATA_SOURCE_NAPATECH_H
+#define SURICATA_SOURCE_NAPATECH_H
 
 void TmModuleNapatechStreamRegister(void);
 TmEcode NapatechStreamThreadDeinit(ThreadVars *tv, void *data);
@@ -40,4 +40,4 @@ int NapatechSetPortmap(int port, int peer);
 int NapatechGetAdapter(uint8_t port);
 
 #endif /* HAVE_NAPATECH */
-#endif /* __SOURCE_NAPATECH_H__ */
+#endif /* SURICATA_SOURCE_NAPATECH_H */
index b60d544d5c28a017bf003b3e429eedc2c72494ab..810752aa383d983b8f37fe5727a0a6e5ce63fa8b 100644 (file)
@@ -22,8 +22,8 @@
 * \author Victor Julien <victor@inliniac.net>
 */
 
-#ifndef __SOURCE_NETMAP_H__
-#define __SOURCE_NETMAP_H__
+#ifndef SURICATA_SOURCE_NETMAP_H
+#define SURICATA_SOURCE_NETMAP_H
 
 /* copy modes */
 enum {
@@ -78,4 +78,4 @@ int NetmapGetRSSCount(const char *ifname);
 void TmModuleReceiveNetmapRegister (void);
 void TmModuleDecodeNetmapRegister (void);
 
-#endif /* __SOURCE_NETMAP_H__ */
+#endif /* SURICATA_SOURCE_NETMAP_H */
index 98dd9edf20ebef7d478e11328df731ca2f6d4cdb..805d6ccbaff9793451221a80de4c3d34e3907e87 100644 (file)
@@ -21,8 +21,8 @@
  * \author Giuseppe Longo <giuseppelng@gmail.com>
  */
 
-#ifndef __SOURCE_NFLOG_H__
-#define __SOURCE_NFLOG_H__
+#ifndef SURICATA_SOURCE_NFLOG_H
+#define SURICATA_SOURCE_NFLOG_H
 
 #ifdef HAVE_NFLOG
 #include <libnetfilter_log/libnetfilter_log.h>
@@ -63,4 +63,4 @@ typedef struct NFLOGPacketVars_
 void TmModuleReceiveNFLOGRegister(void);
 void TmModuleDecodeNFLOGRegister(void);
 
-#endif /* __SOURCE_NFLOG_H__ */
+#endif /* SURICATA_SOURCE_NFLOG_H */
index eef25884b79de263c27ebda45fe1c3e7b3eb5217..4067be78b461bbf1bdacb458b6a15c36f2e0f7b3 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __SOURCE_NFQ_PROTOTYPES_H__
-#define __SOURCE_NFQ_PROTOTYPES_H__
+#ifndef SURICATA_SOURCE_NFQ_PROTOTYPES_H
+#define SURICATA_SOURCE_NFQ_PROTOTYPES_H
 
 void TmModuleReceiveNFQRegister (void);
 void TmModuleVerdictNFQRegister (void);
 void TmModuleDecodeNFQRegister (void);
 
-#endif /* __SOURCE_NFQ_PROTOTYPES_H__ */
-
+#endif /* SURICATA_SOURCE_NFQ_PROTOTYPES_H */
index b60e6d9cc537c0ee40502c4d0d362634f7cad4af..66ea0ba16fb890c6fdadf6910844f7fa199c56b1 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __SOURCE_NFQ_H__
-#define __SOURCE_NFQ_H__
+#ifndef SURICATA_SOURCE_NFQ_H
+#define SURICATA_SOURCE_NFQ_H
 
 #ifdef NFQ
 
@@ -96,5 +96,4 @@ void *NFQGetQueue(int number);
 void *NFQGetThread(int number);
 void NFQContextsClean(void);
 #endif /* NFQ */
-#endif /* __SOURCE_NFQ_H__ */
-
+#endif /* SURICATA_SOURCE_NFQ_H */
index 6e32c044d83baca5493c64e78199b019bf71350d..b1230b85e9f64f0ec040092c8261a3c99c880583 100644 (file)
@@ -25,8 +25,8 @@
 #include "source-pcap-file-helper.h"
 #include "queue.h"
 
-#ifndef __SOURCE_PCAP_FILE_DIRECTORY_HELPER_H__
-#define __SOURCE_PCAP_FILE_DIRECTORY_HELPER_H__
+#ifndef SURICATA_SOURCE_PCAP_FILE_DIRECTORY_HELPER_H
+#define SURICATA_SOURCE_PCAP_FILE_DIRECTORY_HELPER_H
 
 typedef struct PendingFile_
 {
@@ -83,4 +83,4 @@ TmEcode PcapDetermineDirectoryOrFile(char *filename, DIR **directory);
  */
 TmEcode PcapDirectoryDispatch(PcapFileDirectoryVars *ptv);
 
-#endif /* __SOURCE_PCAP_FILE_DIRECTORY_HELPER_H__ */
+#endif /* SURICATA_SOURCE_PCAP_FILE_DIRECTORY_HELPER_H */
index 7db83b1559bf2e215287bb510310c77d03cc61fa..ec5444887f8189415bbd7ce02a1da11b5a0e821f 100644 (file)
@@ -24,8 +24,8 @@
 #include "suricata-common.h"
 #include "tm-threads.h"
 
-#ifndef __SOURCE_PCAP_FILE_HELPER_H__
-#define __SOURCE_PCAP_FILE_HELPER_H__
+#ifndef SURICATA_SOURCE_PCAP_FILE_HELPER_H
+#define SURICATA_SOURCE_PCAP_FILE_HELPER_H
 
 typedef struct PcapFileGlobalVars_ {
     uint64_t cnt; /** packet counter */
@@ -114,4 +114,4 @@ TmEcode ValidateLinkType(int datalink, DecoderFunc *decoder);
 
 const char *PcapFileGetFilename(void);
 
-#endif /* __SOURCE_PCAP_FILE_HELPER_H__ */
+#endif /* SURICATA_SOURCE_PCAP_FILE_HELPER_H */
index 30a3c2ec69c0b57b92d0d145de1f0b92b3c2cee6..afc77787f61d6e80ee6a9a728581b6e69cd38ef4 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __SOURCE_PCAP_FILE_H__
-#define __SOURCE_PCAP_FILE_H__
+#ifndef SURICATA_SOURCE_PCAP_FILE_H
+#define SURICATA_SOURCE_PCAP_FILE_H
 
 void TmModuleReceivePcapFileRegister (void);
 void TmModuleDecodePcapFileRegister (void);
@@ -31,5 +31,4 @@ void PcapIncreaseInvalidChecksum(void);
 
 void PcapFileGlobalInit(void);
 
-#endif /* __SOURCE_PCAP_FILE_H__ */
-
+#endif /* SURICATA_SOURCE_PCAP_FILE_H */
index 5ac36f9bacf5005d24bfceffa6de7a91b81a196f..51f68aa6b8b1e16c01de10f4a89a1527ef091642 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __SOURCE_PCAP_H__
-#define __SOURCE_PCAP_H__
+#ifndef SURICATA_SOURCE_PCAP_H
+#define SURICATA_SOURCE_PCAP_H
 
 void TmModuleReceivePcapRegister (void);
 void TmModuleDecodePcapRegister (void);
@@ -59,4 +59,4 @@ typedef struct PcapIfaceConfig_
     void (*DerefFunc)(void *);
 } PcapIfaceConfig;
 
-#endif /* __SOURCE_PCAP_H__ */
+#endif /* SURICATA_SOURCE_PCAP_H */
index 6b170ee78d525d7f295835d6e0267e614f39286c..742e0ac6cbe901d60958430bdafdc41b3abd8eea 100644 (file)
@@ -21,8 +21,8 @@
  * \author William Metcalf <william.metcalf@gmail.com>
  */
 
-#ifndef __SOURCE_PFRING_H__
-#define __SOURCE_PFRING_H__
+#ifndef SURICATA_SOURCE_PFRING_H
+#define SURICATA_SOURCE_PFRING_H
 
 #define PFRING_IFACE_NAME_LENGTH 48
 
@@ -81,4 +81,4 @@ void PfringLoadConfig(void);
 #define CLUSTER_INNER_FLOW_2_TUPLE 7
 #define CLUSTER_INNER_FLOW_4_TUPLE 8
 #define CLUSTER_INNER_FLOW_5_TUPLE 9
-#endif /* __SOURCE_PFRING_H__ */
+#endif /* SURICATA_SOURCE_PFRING_H */
index acb0d7f8ab708cc45dfc19719e409468eb795a57..138226b5876edb1205720c4f830443ab0ed90454 100644 (file)
  * \author Jacob Masen-Smith <jacob@evengx.com>
  */
 
-#ifndef __SOURCE_WINDIVERT_PROTOTYPES_H__
-#define __SOURCE_WINDIVERT_PROTOTYPES_H__
+#ifndef SURICATA_SOURCE_WINDIVERT_PROTOTYPES_H
+#define SURICATA_SOURCE_WINDIVERT_PROTOTYPES_H
 
 void TmModuleReceiveWinDivertRegister(void);
 void TmModuleVerdictWinDivertRegister(void);
 void TmModuleDecodeWinDivertRegister(void);
 
-#endif /* __SOURCE_WINDIVERT_PROTOTYPES_H__ */
+#endif /* SURICATA_SOURCE_WINDIVERT_PROTOTYPES_H */
index 71574993ec91df79b973f38ea4615a96f27f445e..a8f022c2de21908f1308433f69b76b711bc3d335 100644 (file)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef __SOURCE_WINDIVERT_H__
-#define __SOURCE_WINDIVERT_H__
+#ifndef SURICATA_SOURCE_WINDIVERT_H
+#define SURICATA_SOURCE_WINDIVERT_H
 
 #ifdef WINDIVERT
 
@@ -79,4 +79,4 @@ void *WinDivertGetQueue(int queue);
 void SourceWinDivertRegisterTests(void);
 
 #endif /* WINDIVERT */
-#endif /* __SOURCE_WINDIVERT_H__ */
\ No newline at end of file
+#endif /* SURICATA_SOURCE_WINDIVERT_H */
\ No newline at end of file
index fc67bc82eb9bf71881cb45cd633c1a87e43dd5c7..47bc19daf03f9046a3bf77c7b316b594ca66be06 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __STREAM_TCP_CACHE_H__
-#define __STREAM_TCP_CACHE_H__
+#ifndef SURICATA_STREAM_TCP_CACHE_H
+#define SURICATA_STREAM_TCP_CACHE_H
 
 #include "stream-tcp-private.h"
 
@@ -34,4 +34,4 @@ void StreamTcpThreadCacheCleanup(void);
 TcpSegment *StreamTcpThreadCacheGetSegment(void);
 TcpSession *StreamTcpThreadCacheGetSession(void);
 
-#endif /* __STREAM_TCP_CACHE_H__ */
+#endif /* SURICATA_STREAM_TCP_CACHE_H */
index 515c6fd6503bd3ff4a9d44a17fa1730c84f43ea9..95f46aec9e70a1a126b73f8d3304ad77874ac765 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __STREAM_TCP_INLINE_H__
-#define __STREAM_TCP_INLINE_H__
+#ifndef SURICATA_STREAM_TCP_INLINE_H
+#define SURICATA_STREAM_TCP_INLINE_H
 
 #include "stream-tcp-private.h"
 
@@ -33,5 +33,4 @@ void StreamTcpInlineSegmentReplacePacket(const TcpStream *,
 
 void StreamTcpInlineRegisterTests(void);
 
-#endif /* __STREAM_TCP_INLINE_H__ */
-
+#endif /* SURICATA_STREAM_TCP_INLINE_H */
index 5612354a86a1e478006e0489d13c4fcf4ba0453f..c003bac07eed1bde4e2ee37574f3eb552aabc7fd 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __STREAM_TCP_LIST_H__
-#define __STREAM_TCP_LIST_H__
-
+#ifndef SURICATA_STREAM_TCP_LIST_H
+#define SURICATA_STREAM_TCP_LIST_H
 
 #ifdef UNITTESTS
 void StreamTcpListRegisterTests(void);
 #endif
 
-#endif /* __STREAM_TCP_LIST_H__ */
+#endif /* SURICATA_STREAM_TCP_LIST_H */
index 619398deb7c92f38d3e3777df07453f14398c8a4..7321f941b72df8985444f98e051d50fb375c81af 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __STREAM_TCP_PRIVATE_H__
-#define __STREAM_TCP_PRIVATE_H__
+#ifndef SURICATA_STREAM_TCP_PRIVATE_H
+#define SURICATA_STREAM_TCP_PRIVATE_H
 
 #include "util-pool-thread.h"
 #include "util-streaming-buffer.h"
@@ -323,4 +323,4 @@ typedef struct TcpSession_ {
 
 #define STREAM_PKT_FLAG_SET(p, f) (p)->tcpvars.stream_pkt_flags |= (f)
 
-#endif /* __STREAM_TCP_PRIVATE_H__ */
+#endif /* SURICATA_STREAM_TCP_PRIVATE_H */
index 6f761fc0b4e4aaa73238097d34314c68278819b5..b71be74b7fe6b65d228bd1b3456a3f41e71b80e0 100644 (file)
@@ -22,8 +22,8 @@
  * \author Gurvinder Singh <gurvindersinghdahiya@gmail.com>
  */
 
-#ifndef __STREAM_TCP_REASSEMBLE_H__
-#define __STREAM_TCP_REASSEMBLE_H__
+#ifndef SURICATA_STREAM_TCP_REASSEMBLE_H
+#define SURICATA_STREAM_TCP_REASSEMBLE_H
 
 #include "suricata.h"
 #include "flow.h"
@@ -156,5 +156,4 @@ static inline bool STREAM_LASTACK_GT_BASESEQ(const TcpStream *stream)
 
 uint32_t StreamDataAvailableForProtoDetect(TcpStream *stream);
 
-#endif /* __STREAM_TCP_REASSEMBLE_H__ */
-
+#endif /* SURICATA_STREAM_TCP_REASSEMBLE_H */
index 84e7cb1bdfe38b27f0f3c5658dc4722a1ca91174..789b5912d91c59ba80740d9a4e913a4723a38a19 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __STREAM_TCP_SACK_H__
-#define __STREAM_TCP_SACK_H__
+#ifndef SURICATA_STREAM_TCP_SACK_H
+#define SURICATA_STREAM_TCP_SACK_H
 
 #include "suricata-common.h"
 
@@ -44,4 +44,4 @@ void StreamTcpSackPruneList(TcpStream *);
 void StreamTcpSackFreeList(TcpStream *);
 void StreamTcpSackRegisterTests (void);
 
-#endif /* __STREAM_TCP_SACK_H__*/
+#endif /* SURICATA_STREAM_TCP_SACK_H*/
index fe05537e33efd948748d8e98393484ec75d89079..4b699a41a319fbfb50da0ce7e705190664cb1641 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __STREAM_TCP_UTIL_H__
-#define __STREAM_TCP_UTIL_H__
+#ifndef SURICATA_STREAM_TCP_UTIL_H
+#define SURICATA_STREAM_TCP_UTIL_H
 
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
@@ -44,5 +44,4 @@ int StreamTcpUTAddPayload(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx, TcpSes
 
 void StreamTcpUtilRegisterTests(void);
 
-#endif /* __STREAM_TCP_UTIL_H__ */
-
+#endif /* SURICATA_STREAM_TCP_UTIL_H */
index ff8a0998cb4e7172fff76e7f7f20d73db00efa04..07c443e9d11841d27093b15c869a7dc6e6fe042c 100644 (file)
@@ -22,8 +22,8 @@
  * \author Gurvinder Singh <gurvindersinghdahiya@gmail.com>
  */
 
-#ifndef __STREAM_TCP_H__
-#define __STREAM_TCP_H__
+#ifndef SURICATA_STREAM_TCP_H
+#define SURICATA_STREAM_TCP_H
 
 #include "stream-tcp-private.h"
 
@@ -205,5 +205,4 @@ uint64_t StreamDataRightEdge(const TcpStream *stream, const bool eof);
 void StreamTcpThreadCacheEnable(void);
 void StreamTcpThreadCacheCleanup(void);
 
-#endif /* __STREAM_TCP_H__ */
-
+#endif /* SURICATA_STREAM_TCP_H */
index 4821dc9981f5a4a7fa02440a84d5fc65ebf81e72..a132606a4136814790ae9a01ad101d6e050f7b09 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __STREAM_H__
-#define __STREAM_H__
+#ifndef SURICATA_STREAM_H
+#define SURICATA_STREAM_H
 
 #include "decode.h"
 #include "stream-tcp-private.h"
@@ -41,5 +41,4 @@ int StreamSegmentForEach(const Packet *p, uint8_t flag,
 int StreamSegmentForSession(
         const Packet *p, uint8_t flag, StreamSegmentCallback CallbackFunc, void *data);
 
-#endif /* __STREAM_H__ */
-
+#endif /* SURICATA_STREAM_H */
index 23bf6335eab655cba9167ede8678498321cbd8dc..30fa7998e0313e11c5a04ad1a3689faf069c6a3b 100644 (file)
@@ -23,8 +23,8 @@
  * Common includes, etc.
  */
 
-#ifndef __SURICATA_COMMON_H__
-#define __SURICATA_COMMON_H__
+#ifndef SURICATA_SURICATA_COMMON_H
+#define SURICATA_SURICATA_COMMON_H
 
 #ifdef DEBUG
 #define DBG_PERF
@@ -546,4 +546,4 @@ extern int g_ut_covered;
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
-#endif /* __SURICATA_COMMON_H__ */
+#endif /* SURICATA_SURICATA_COMMON_H */
index 3296b51397b81c705e83aaedc689ed2af14e88a9..cb2c667eaedb25f2e5c8b96836b8b11c829ee7fd 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __SURICATA_PLUGIN_H__
-#define __SURICATA_PLUGIN_H__
+#ifndef SURICATA_SURICATA_PLUGIN_H
+#define SURICATA_SURICATA_PLUGIN_H
 
 #include <stdint.h>
 #include <stdbool.h>
index 9d275edc5dd052a47c4efb106106d17431aebba3..fe95974e1134a4cd357e7d15bccfda9d3bc4a83e 100644 (file)
@@ -61,8 +61,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __SURICATA_H__
-#define __SURICATA_H__
+#ifndef SURICATA_SURICATA_H
+#define SURICATA_SURICATA_H
 
 #include "suricata-common.h"
 
@@ -203,5 +203,4 @@ void RegisterAllModules(void);
 
 const char *GetProgramVersion(void);
 
-#endif /* __SURICATA_H__ */
-
+#endif /* SURICATA_SURICATA_H */
index 2946d9140f26aad5bcd2b529d3f3882f7378151a..cff56a0a4710b08a0f529e90f7f278c98cea270b 100644 (file)
@@ -24,8 +24,8 @@
  * Threading functions defined as macros: debug variants
  */
 
-#ifndef __THREADS_DEBUG_H__
-#define __THREADS_DEBUG_H__
+#ifndef SURICATA_THREADS_DEBUG_H
+#define SURICATA_THREADS_DEBUG_H
 
 /* mutex */
 
index 43606ae982907f0f144ecebdfcc5086dd7695ab0..5e6c374e3b6f85705c30980158a071ad19e86ffd 100644 (file)
@@ -23,8 +23,8 @@
  * Lock profiling wrappers
  */
 
-#ifndef __THREADS_PROFILE_H__
-#define __THREADS_PROFILE_H__
+#ifndef SURICATA_THREADS_PROFILE_H
+#define SURICATA_THREADS_PROFILE_H
 
 // UtilCpuGetTicks
 #include "util-cpu.h"
index a9942b9746fb248cdf47aeac58df9aef903ccb3b..e2b0daa07c47e0d9c4968a03b85a485f10103a7f 100644 (file)
@@ -24,8 +24,8 @@
  * Threading functions defined as macros
  */
 
-#ifndef __THREADS_H__
-#define __THREADS_H__
+#ifndef SURICATA_THREADS_H
+#define SURICATA_THREADS_H
 
 #include "suricata-common.h"
 
@@ -308,5 +308,4 @@ extern thread_local char t_thread_name[THREAD_NAME_LEN + 1];
 
 void ThreadMacrosRegisterTests(void);
 
-#endif /* __THREADS_H__ */
-
+#endif /* SURICATA_THREADS_H */
index ea448c0949864c0979867aa64e3790033f2b2196..cebcdb4e3ac1c2b77a835e52de3e2280b6246f10 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __THREADVARS_H__
-#define __THREADVARS_H__
+#ifndef SURICATA_THREADVARS_H
+#define SURICATA_THREADVARS_H
 
 #include "tm-queues.h"
 #include "counters.h"
@@ -142,4 +142,4 @@ typedef struct ThreadVars_ {
 #define THREAD_SET_PRIORITY     0x02 /** Real time priority */
 #define THREAD_SET_AFFTYPE      0x04 /** Priority and affinity */
 
-#endif /* __THREADVARS_H__ */
+#endif /* SURICATA_THREADVARS_H */
index 0e7df648c6b193ca05496d82d4f324a7bf165886..5788e66f581f89a817e95ce71998d24d8735c1d3 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __TM_MODULES_H__
-#define __TM_MODULES_H__
+#ifndef SURICATA_TM_MODULES_H
+#define SURICATA_TM_MODULES_H
 
 #include "tm-threads-common.h"
 #include "threadvars.h"
@@ -106,5 +106,4 @@ const char * TmModuleTmmIdToString(TmmId id);
 void TmModuleRunInit(void);
 void TmModuleRunDeInit(void);
 
-#endif /* __TM_MODULES_H__ */
-
+#endif /* SURICATA_TM_MODULES_H */
index eb0081bba66b6ae2935491fafd644fe92e30c8ec..6820d8d666cfaaa51844a73d48885f807b20a9ae 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __TM_QUEUEHANDLERS_H__
-#define __TM_QUEUEHANDLERS_H__
+#ifndef SURICATA_TM_QUEUEHANDLERS_H
+#define SURICATA_TM_QUEUEHANDLERS_H
 
 enum {
     TMQH_NOT_SET,
@@ -51,5 +51,4 @@ int TmqhNameToID(const char *name);
 Tmqh *TmqhGetQueueHandlerByName(const char *name);
 Tmqh *TmqhGetQueueHandlerByID(const int id);
 
-#endif /* __TM_QUEUEHANDLERS_H__ */
-
+#endif /* SURICATA_TM_QUEUEHANDLERS_H */
index a203b6662327872f686db09457cd88c582371b3f..ef0490cc92f84e94e6a29324ceed65594feb8422 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __TM_QUEUES_H__
-#define __TM_QUEUES_H__
+#ifndef SURICATA_TM_QUEUES_H
+#define SURICATA_TM_QUEUES_H
 
 #include "packet-queue.h"
 
@@ -43,5 +43,4 @@ void TmqDebugList(void);
 void TmqResetQueues(void);
 void TmValidateQueueState(void);
 
-#endif /* __TM_QUEUES_H__ */
-
+#endif /* SURICATA_TM_QUEUES_H */
index 47b501c0789e8f42632fbe938ea7511237272751..fa9a731b0ddfcc8aece907a1588abaaa63b8c034 100644 (file)
@@ -22,8 +22,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __TM_THREADS_COMMON_H__
-#define __TM_THREADS_COMMON_H__
+#ifndef SURICATA_TM_THREADS_COMMON_H
+#define SURICATA_TM_THREADS_COMMON_H
 
 /** \brief Thread Model Module id's.
  *
@@ -94,5 +94,4 @@ enum {
     TVT_MAX,
 };
 
-#endif /* __TM_THREADS_COMMON_H__ */
-
+#endif /* SURICATA_TM_THREADS_COMMON_H */
index 4ca55f9bc72cdec4ed4623fc6ac1bea2e3d3d38e..f98a42fe6135b325df65dcadc70487b6401c332a 100644 (file)
@@ -22,8 +22,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __TM_THREADS_H__
-#define __TM_THREADS_H__
+#ifndef SURICATA_TM_THREADS_H
+#define SURICATA_TM_THREADS_H
 
 #include "tmqh-packetpool.h"
 #include "tm-threads-common.h"
@@ -288,4 +288,4 @@ void TmThreadsGetMinimalTimestamp(struct timeval *ts);
 uint16_t TmThreadsGetWorkerThreadMax(void);
 bool TmThreadsTimeSubsysIsReady(void);
 
-#endif /* __TM_THREADS_H__ */
+#endif /* SURICATA_TM_THREADS_H */
index 3cec7a165f5b8bdbf2aded9761e5b7d3f6071296..e3513d09983bc7871b6ba6e95a0bb71e92e567a9 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __TMQH_FLOW_H__
-#define __TMQH_FLOW_H__
+#ifndef SURICATA_TMQH_FLOW_H
+#define SURICATA_TMQH_FLOW_H
 
 typedef struct TmqhFlowMode_ {
     PacketQueue *q;
@@ -43,4 +43,4 @@ void TmqhFlowRegisterTests(void);
 
 void TmqhFlowPrintAutofpHandler(void);
 
-#endif /* __TMQH_FLOW_H__ */
+#endif /* SURICATA_TMQH_FLOW_H */
index 74074f953378a16c093e110e30fd21ccf934994c..8d274c9e12e87896d093f4ce58e2604be8182fb2 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __TMQH_PACKETPOOL_H__
-#define __TMQH_PACKETPOOL_H__
+#ifndef SURICATA_TMQH_PACKETPOOL_H
+#define SURICATA_TMQH_PACKETPOOL_H
 
 #include "decode.h"
 #include "threads.h"
@@ -84,4 +84,4 @@ void PacketPoolInitEmpty(void);
 void PacketPoolDestroy(void);
 void PacketPoolPostRunmodes(void);
 
-#endif /* __TMQH_PACKETPOOL_H__ */
+#endif /* SURICATA_TMQH_PACKETPOOL_H */
index d80de5085203da26f71728e0120f6e68ce8fb7b8..1a4677a575ef4862cb15843768d713c3acf0ea80 100644 (file)
@@ -21,9 +21,9 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __TMQH_SIMPLE_H__
-#define __TMQH_SIMPLE_H__
+#ifndef SURICATA_TMQH_SIMPLE_H
+#define SURICATA_TMQH_SIMPLE_H
 
 void TmqhSimpleRegister (void);
 
-#endif /* __TMQH_SIMPLE_H__ */
+#endif /* SURICATA_TMQH_SIMPLE_H */
index 6c96ba08b6ff2d5e5fb6ca0214a750fcc6b0517e..fbd5155e4b9db3379ca943c583215ce8fd6b70bd 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __ACTION_ORDER_H__
-#define __ACTION_ORDER_H__
+#ifndef SURICATA_ACTION_ORDER_H
+#define SURICATA_ACTION_ORDER_H
 
 #include "suricata-common.h"
 
@@ -31,4 +31,4 @@ uint8_t ActionOrderVal(uint8_t);
 #ifdef UNITTESTS
 void UtilActionRegisterTests(void);
 #endif
-#endif /* __ACTION_ORDER_H__ */
+#endif /* SURICATA_ACTION_ORDER_H */
index ef3c556498d92c5ef3c675646e18f0f53efbecaa..2fa4509ffa2cb8003a193dfef5feb45dd4d62b09 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_AFFINITY_H__
-#define __UTIL_AFFINITY_H__
+#ifndef SURICATA_UTIL_AFFINITY_H
+#define SURICATA_UTIL_AFFINITY_H
 #include "suricata-common.h"
 #include "conf.h"
 #include "threads.h"
@@ -97,4 +97,4 @@ void BuildCpusetWithCallback(const char *name, ConfNode *node,
                              void (*Callback)(int i, void * data),
                              void *data);
 
-#endif /* __UTIL_AFFINITY_H__ */
+#endif /* SURICATA_UTIL_AFFINITY_H */
index 5f23571430107c6603f523f6afc0374e3dbbf13a..84f1aa078e90bc260884b3ac77b4ad200258435e 100644 (file)
@@ -30,9 +30,8 @@
  * uses "somevar", internally "somevar_sc_atomic__" is used.
  */
 
-
-#ifndef __UTIL_ATOMIC_H__
-#define __UTIL_ATOMIC_H__
+#ifndef SURICATA_UTIL_ATOMIC_H
+#define SURICATA_UTIL_ATOMIC_H
 
 #if HAVE_STDATOMIC_H==1
 
 
 void SCAtomicRegisterTests(void);
 
-#endif /* __UTIL_ATOMIC_H__ */
-
+#endif /* SURICATA_UTIL_ATOMIC_H */
index 53cc14c9c4e0a224fc06f415991822314845c147..744b849d87fd1acd5e5f6a025df983d2bd533617 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_BASE64_H_
-#define __UTIL_BASE64_H_
+#ifndef SURICATA_UTIL_BASE64_H_
+#define SURICATA_UTIL_BASE64_H_
 
 #include "suricata-common.h"
 
index bdb0cfa09c9527dd5108ccd3918f3d19e729f26e..1614de1ac7edc18912742699eb27096dde862f54 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __BLOOMFILTERCOUNTING_H__
-#define __BLOOMFILTERCOUNTING_H__
+#ifndef SURICATA_BLOOMFILTERCOUNTING_H
+#define SURICATA_BLOOMFILTERCOUNTING_H
 
 /* Bloom filter structure */
 typedef struct BloomFilterCounting_ {
@@ -43,5 +43,4 @@ int BloomFilterCountingTest(BloomFilterCounting *, const void *, uint16_t);
 
 void BloomFilterCountingRegisterTests(void);
 
-#endif /* __BLOOMFILTERCOUNTING_H__ */
-
+#endif /* SURICATA_BLOOMFILTERCOUNTING_H */
index b6dee868a588c33503e0db8d4c0fe0daf31a2f1d..2eecdf3d7d6d513d252c22f6fbe328aa6fe09057 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __BLOOMFILTER_H__
-#define __BLOOMFILTER_H__
+#ifndef SURICATA_BLOOMFILTER_H
+#define SURICATA_BLOOMFILTER_H
 
 /* Bloom Filter structure */
 typedef struct BloomFilter_ {
@@ -63,5 +63,4 @@ static inline int BloomFilterTest(const BloomFilter *bf, const void *data, uint1
     return hit;
 }
 
-#endif /* __BLOOMFILTER_H__ */
-
+#endif /* SURICATA_BLOOMFILTER_H */
index 8196077f8a07f576dc33193a74f5322f4ad01c7e..5291ba7f7d157edad5b6fcc5948f79eea02a03ba 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_BPF_H__
-#define __UTIL_BPF_H__
+#ifndef SURICATA_UTIL_BPF_H
+#define SURICATA_UTIL_BPF_H
 
 #include "conf.h"
 
@@ -35,4 +35,4 @@ int SCBPFCompile(int snaplen_arg, int linktype_arg, struct bpf_program *program,
 
 void SCBPFFree(struct bpf_program *program);
 
-#endif /* __UTIL_BPF_H__ */
+#endif /* SURICATA_UTIL_BPF_H */
index 3a88c8e96b82fdf089e4fceba45abf23dd48b100..a396cc71ff178ea032da2c34af9941f69bd8db12 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_BUFFER_H__
-#define __UTIL_BUFFER_H__
+#ifndef SURICATA_UTIL_BUFFER_H
+#define SURICATA_UTIL_BUFFER_H
 
 typedef struct MemBuffer_ {
    uint8_t *buffer;
@@ -174,4 +174,4 @@ void MemBufferFree(MemBuffer *buffer);
         }                                                               \
     } while (0)
 
-#endif /* __UTIL_BUFFER_H__ */
+#endif /* SURICATA_UTIL_BUFFER_H */
index ae3e1d2a6902fc721e8568d8a1fd4d3f8be68e45..e0f0a67c27e0a16911b7ff3ec2a97ccdd7334d5a 100644 (file)
@@ -21,8 +21,8 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#ifndef __UTIL_BYTE_H__
-#define __UTIL_BYTE_H__
+#ifndef SURICATA_UTIL_BYTE_H
+#define SURICATA_UTIL_BYTE_H
 
 #include <stdint.h>
 
@@ -503,4 +503,4 @@ static inline int WARN_UNUSED ByteExtract(uint64_t *res, int e, uint16_t len, co
     return len;
 }
 
-#endif /* __UTIL_BYTE_H__ */
+#endif /* SURICATA_UTIL_BYTE_H */
index c7b056bdd88cfc5e14770cf689248ed32daa3bd4..7305f49dd8c629bc0caab68e60ee122427a84bb1 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_CHECKSUM_H__
-#define __UTIL_CHECKSUM_H__
+#ifndef SURICATA_UTIL_CHECKSUM_H
+#define SURICATA_UTIL_CHECKSUM_H
 
 #include "decode.h"
 
index 745f67823c61d28d65207b650ae926521a3df63c..157d0f294584e383e5afd64baa5c5c1a4ebf2db3 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_NETMASK_H__
-#define __UTIL_NETMASK_H__
+#ifndef SURICATA_UTIL_NETMASK_H
+#define SURICATA_UTIL_NETMASK_H
 
 int CIDRFromMask(uint32_t netmask);
 uint32_t CIDRGet(int);
@@ -30,5 +30,4 @@ void CIDRGetIPv6(int cidr, struct in6_addr *in6);
 
 void UtilCIDRTests(void);
 
-#endif /* __UTIL_NETMASK_H__ */
-
+#endif /* SURICATA_UTIL_NETMASK_H */
index 9ac00c85d09edd3b5f16ec799ef1d778a436dd16..a5d8026ca347f644f74f0adb07b668ff2f49bebf 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_CLASSIFICATION_CONFIG_H__
-#define __UTIL_CLASSIFICATION_CONFIG_H__
+#ifndef SURICATA_UTIL_CLASSIFICATION_CONFIG_H
+#define SURICATA_UTIL_CLASSIFICATION_CONFIG_H
 
 #define CLASSTYPE_NAME_MAX_LEN 64
 #define CLASSTYPE_DESC_MAX_LEN 512
@@ -62,4 +62,4 @@ FILE *SCClassConfGenerateInvalidDummyClassConfigFD02(void);
 FILE *SCClassConfGenerateInvalidDummyClassConfigFD03(void);
 #endif
 
-#endif /* __UTIL_CLASSIFICATION_CONFIG_H__ */
+#endif /* SURICATA_UTIL_CLASSIFICATION_CONFIG_H */
index cb6c17623f99a3f38bd4e1ea33ce4750b9b000c9..2d4d0d6356ccdf686d3fd259ff60c8ea08364370 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_CLOCK_H__
-#define __UTIL_CLOCK_H__
+#ifndef SURICATA_UTIL_CLOCK_H
+#define SURICATA_UTIL_CLOCK_H
 
 #include <time.h>
 
@@ -36,4 +36,4 @@
 #define CLOCK_PRINT_SEC                                                                            \
     printf("Seconds spent: %.4fs\n", ((double)(clo2 - clo1) / (double)CLOCKS_PER_SEC))
 
-#endif /*__UTIL_CLOCK_H__ */
+#endif /*SURICATA_UTIL_CLOCK_H */
index 1006c850cf110c0cc8b5018898dc2dba1fedec54..30fa5f4e4636df15abb48a10a3a901e0420f63bc 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_UTIL_CONF_H__
-#define __UTIL_UTIL_CONF_H__
+#ifndef SURICATA_UTIL_UTIL_CONF_H
+#define SURICATA_UTIL_UTIL_CONF_H
 
 #include "conf.h"
 
@@ -39,4 +39,4 @@ ConfNode *ConfFindDeviceConfig(ConfNode *node, const char *iface);
 
 int ConfUnixSocketIsEnable(void);
 
-#endif /* __UTIL_UTIL_CONF_H__ */
+#endif /* SURICATA_UTIL_UTIL_CONF_H */
index 92017d50216249f348e752f294a1811737a39525..49f4ec80b16341d88ed833cd1cfac00a9b8be1a9 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_CONFIG_H__
-#define __UTIL_CONFIG_H__
+#ifndef SURICATA_UTIL_CONFIG_H
+#define SURICATA_UTIL_CONFIG_H
 
 enum ConfigAction {
     CONFIG_ACTION_SET = 1,
index 168ffc9b04331ada0569c6284f39433e39e57473..c5e01f4d3e4c30452711bfa1ebda76d76acf55a8 100644 (file)
  * \author Eileen Donlon <emdonlo@gmail.com>
  */
 
-#ifndef __COREDUMP_CONFIG_H__
-#define __COREDUMP_CONFIG_H__
+#ifndef SURICATA_COREDUMP_CONFIG_H
+#define SURICATA_COREDUMP_CONFIG_H
 
 #include "suricata-common.h"
 
 int32_t CoredumpLoadConfig(void);
 void CoredumpEnable(void);
 
-#endif /* __COREDUMP_CONFIG_H__ */
+#endif /* SURICATA_COREDUMP_CONFIG_H */
index e0b651f3290a617d9f1d770a4e2d972fea5c14ce..4799490ee024f82fa1f4d8d490e4986e98b7a313 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __UTIL_CPU_H__
-#define __UTIL_CPU_H__
+#ifndef SURICATA_UTIL_CPU_H
+#define SURICATA_UTIL_CPU_H
 
 /* Processors configured: */
 uint16_t UtilCpuGetNumProcessorsConfigured(void);
@@ -36,4 +36,4 @@ void UtilCpuPrintSummary(void);
 
 uint64_t UtilCpuGetTicks(void);
 
-#endif /* __UTIL_CPU_H__ */
+#endif /* SURICATA_UTIL_CPU_H */
index 424d7093eae80e18fc86c1e1b2aa09c8eb05847f..ff5e73c8fefee5725697b0331df92970904eb5c4 100644 (file)
@@ -21,8 +21,8 @@
  * \author Gerardo Iglesias Galvan <iglesiasg@gmail.com>
  */
 
-#ifndef __UTIL_DAEMON_H__
-#define __UTIL_DAEMON_H__
+#ifndef SURICATA_UTIL_DAEMON_H
+#define SURICATA_UTIL_DAEMON_H
 
 #ifdef OS_WIN32
 #define Daemonize()
@@ -32,4 +32,4 @@ void Daemonize (void);
 
 int CheckValidDaemonModes (int, int);
 
-#endif /* __UTIL_DAEMON_H__ */
+#endif /* SURICATA_UTIL_DAEMON_H */
index 8f25bd7034a7f94cdbfcb8850685a3ccb64047d1..024dabe9f8fcef276dd4091ad37bc476fa514133 100644 (file)
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_DATALINK_H__
-#define __UTIL_DATALINK_H__
+#ifndef SURICATA_UTIL_DATALINK_H
+#define SURICATA_UTIL_DATALINK_H
 
 void DatalinkSetGlobalType(int datalink);
 int DatalinkGetGlobalType(void);
 bool DatalinkHasMultipleValues(void);
 
-#endif /* __UTIL_DATALINK_H__ */
+#endif /* SURICATA_UTIL_DATALINK_H */
index 26c9ec9c88a4c70d807d231724fa2d0f24c44f65..5007f7b9677a320df6956e6aac70fb73fd754e0f 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __DEBUG_FILTERS_H__
-#define __DEBUG_FILTERS_H__
+#ifndef SURICATA_DEBUG_FILTERS_H
+#define SURICATA_DEBUG_FILTERS_H
 
 // pthread_t
 #include "threads.h"
@@ -132,4 +132,4 @@ void SCLogAddToFGFLineList(SCLogFGFilterFunc *,
                                          int);
 
 void SCLogReleaseFDFilter(SCLogFDFilter *);
-#endif /* __DEBUG_FILTERS_H__ */
+#endif /* SURICATA_DEBUG_FILTERS_H */
index 296cf896519c068220d033222ff63a826fbc6d65..cb22e9097389294d77336e9d8c6b72e6ee1866f3 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_DEBUG_H__
-#define __UTIL_DEBUG_H__
+#ifndef SURICATA_UTIL_DEBUG_H
+#define SURICATA_UTIL_DEBUG_H
 
 #include "suricata-common.h"
 
@@ -547,4 +547,4 @@ void SCLogLoadConfig(int daemon, int verbose, uint32_t userid, uint32_t groupid)
 
 SCLogLevel SCLogGetLogLevel(void);
 
-#endif /* __UTIL_DEBUG_H__ */
+#endif /* SURICATA_UTIL_DEBUG_H */
index d5a2d46caf081d6b3aed8438720fd37f14f74dfe..8e5cedbbd0b980bea6c924a554f4c310c5859567 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_DEVICE_H__
-#define __UTIL_DEVICE_H__
+#ifndef SURICATA_UTIL_DEVICE_H
+#define SURICATA_UTIL_DEVICE_H
 
 #ifdef HAVE_DPDK
 #include <rte_mempool.h>
@@ -105,4 +105,4 @@ TmEcode LiveDeviceIfaceList(json_t *cmd, json_t *server_msg, void *data);
 TmEcode LiveDeviceGetBypassedStats(json_t *cmd, json_t *answer, void *data);
 #endif
 
-#endif /* __UTIL_DEVICE_H__ */
+#endif /* SURICATA_UTIL_DEVICE_H */
index bf1768a69da71d175ebb998034b42957974ecbd8..55c1fd608a28b49d677a849d435ac6e75d9b708d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_EBPF_H__
-#define __UTIL_EBPF_H__
+#ifndef SURICATA_UTIL_EBPF_H
+#define SURICATA_UTIL_EBPF_H
 
 #include "flow-bypass.h"
 
index ea88fc4b44603b06c7a90d663e4edbe05ef8c7c7..557bf4632ed44db042f2faa59ff809bef42a6e79 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_ENUM_H__
-#define __UTIL_ENUM_H__
+#ifndef SURICATA_UTIL_ENUM_H
+#define SURICATA_UTIL_ENUM_H
 
 typedef struct SCEnumCharMap_ {
     const char *enum_name;
@@ -33,4 +33,4 @@ int SCMapEnumNameToValue(const char *, SCEnumCharMap *);
 
 const char * SCMapEnumValueToName(int, SCEnumCharMap *);
 
-#endif /* __UTIL_ENUM_H__ */
+#endif /* SURICATA_UTIL_ENUM_H */
index f1bc80dd7c3c376b14681fe487571a09847ecae6..b345d75ef42d4601fd00a618bb337292be11caaa 100644 (file)
@@ -19,8 +19,8 @@
  * \file
  */
 
-#ifndef __UTIL_ERROR_H__
-#define __UTIL_ERROR_H__
+#ifndef SURICATA_UTIL_ERROR_H
+#define SURICATA_UTIL_ERROR_H
 
 /* different error types */
 typedef enum {
@@ -41,4 +41,4 @@ const char *SCErrorToString(SCError);
 
 extern thread_local SCError sc_errno;
 
-#endif /* __UTIL_ERROR_H__ */
+#endif /* SURICATA_UTIL_ERROR_H */
index 7b27e132117d3d53c05e0a541eb19ff701d87378..012888fce37bed47757e970d8ea898991c01b751 100644 (file)
@@ -19,8 +19,8 @@
  * \file
  */
 
-#ifndef __UTIL_EXCEPTION_POLICY_H__
-#define __UTIL_EXCEPTION_POLICY_H__
+#ifndef SURICATA_UTIL_EXCEPTION_POLICY_H
+#define SURICATA_UTIL_EXCEPTION_POLICY_H
 
 #include "decode.h"
 
index 043d68319115ec7def493ab73b178b1a64f3b3c6..e62f6a5e4dde80daeb74d9b5d7c127624c5cba69 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_FILE_DECOMPRESSION_H__
-#define __UTIL_FILE_DECOMPRESSION_H__
+#ifndef SURICATA_UTIL_FILE_DECOMPRESSION_H
+#define SURICATA_UTIL_FILE_DECOMPRESSION_H
 
 #include "detect.h"
 
@@ -41,4 +41,4 @@ int FileSwfDecompression(const uint8_t *buffer, uint32_t buffer_len,
                          int swf_type,
                          uint32_t decompress_depth, uint32_t compress_depth);
 
-#endif /* __UTIL_FILE_DECOMPRESSION_H__ */
+#endif /* SURICATA_UTIL_FILE_DECOMPRESSION_H */
index 65ac74add1785b986b7299477a378759de759425..be46aec9b88883739753b7d0a820854df2d21dac 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_FILE_SWF_DECOMPRESSION_H__
-#define __UTIL_FILE_SWF_DECOMPRESSION_H__
+#ifndef SURICATA_UTIL_FILE_SWF_DECOMPRESSION_H
+#define SURICATA_UTIL_FILE_SWF_DECOMPRESSION_H
 
 /* If we don't have the decompressed data len,
  * we use a default value.
@@ -39,4 +39,4 @@ int FileSwfLzmaDecompression(DetectEngineThreadCtx *det_ctx,
                              uint8_t *compressed_data, uint32_t compressed_data_len,
                              uint8_t *decompressed_data, uint32_t decompressed_data_len);
 
-#endif /* __UTIL_FILE_SWF_DECOMPRESSION_H__ */
+#endif /* SURICATA_UTIL_FILE_SWF_DECOMPRESSION_H */
index 55d91192fe1225fb33e2774f1000cc2afd9e0115..784d5de398cc2fe7ce29a56dac09a94d75181c10 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_FILE_H__
-#define __UTIL_FILE_H__
+#ifndef SURICATA_UTIL_FILE_H
+#define SURICATA_UTIL_FILE_H
 
 #include "conf.h"
 #include "util-streaming-buffer.h"
@@ -252,4 +252,4 @@ void FilePrintFlags(const File *file);
 
 void FilesPrune(FileContainer *fc, const StreamingBufferConfig *sbcfg, const bool trunc);
 
-#endif /* __UTIL_FILE_H__ */
+#endif /* SURICATA_UTIL_FILE_H */
index 4b558eaf98d068e97a76e0a4f23de013c86f9a77..ce3e25f9338d226144ea006c8ba994b163a76c79 100644 (file)
@@ -22,8 +22,8 @@
  *         Based on FMem.c of Alexandre Flori (2008/10/17 AF)
  */
 
-#ifndef __FMEMOPEN_H__
-#define __FMEMOPEN_H__
+#ifndef SURICATA_FMEMOPEN_H
+#define SURICATA_FMEMOPEN_H
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -52,4 +52,4 @@ FILE *SCFmemopen(void *, size_t, const char *);
 #define SCFmemopen fmemopen
 #endif
 
-#endif /* __FMEMOPEN_H__ */
+#endif /* SURICATA_FMEMOPEN_H */
index 7ef4cf5d06d5968b6e289bcc146d618f3774104f..62d3d14270b16aae60b59e57fdc00d427201794f 100644 (file)
@@ -34,8 +34,8 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy.
 -------------------------------------------------------------------------------
 */
 
-#ifndef __UTIL_HASH_LOOKUP3_H__
-#define __UTIL_HASH_LOOKUP3_H__
+#ifndef SURICATA_UTIL_HASH_LOOKUP3_H
+#define SURICATA_UTIL_HASH_LOOKUP3_H
 
 #define hashsize(n) ((uint32_t)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
@@ -64,5 +64,4 @@ void hashlittle2(const void *key,       /* the key to hash */
 
 uint32_t hashbig( const void *key, size_t length, uint32_t initval);
 
-#endif /* __UTIL_HASH_LOOKUP3_H__ */
-
+#endif /* SURICATA_UTIL_HASH_LOOKUP3_H */
index 7153af800d3b383971b22918169f90a19611207d..9d1eaa0769bdb5041f71e7f816734ea5a58b47a0 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_HASH_STRING_H__
-#define __UTIL_HASH_STRING_H__
+#ifndef SURICATA_UTIL_HASH_STRING_H
+#define SURICATA_UTIL_HASH_STRING_H
 
 #include "util-hash.h"
 
@@ -26,4 +26,4 @@ char StringHashCompareFunc(void *data1, uint16_t datalen1,
                            void *data2, uint16_t datalen2);
 void StringHashFreeFunc(void *data);
 
-#endif /* __UTIL_HASH_STRING_H__ */
+#endif /* SURICATA_UTIL_HASH_STRING_H */
index f16111887431820f5d68b492f82956612aaf843f..1f25cfdf076975233bed821612ad6f1cbbb15d83 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __HASH_H__
-#define __HASH_H__
+#ifndef SURICATA_HASH_H
+#define SURICATA_HASH_H
 
 /* hash bucket structure */
 typedef struct HashTableBucket_ {
@@ -57,5 +57,4 @@ char HashTableDefaultCompare(void *, uint16_t, void *, uint16_t);
 
 void HashTableRegisterTests(void);
 
-#endif /* __HASH_H__ */
-
+#endif /* SURICATA_HASH_H */
index bca74c98719bcf9d01ba25139a143c03a5d995d2..cfbc0287dfab2aaf0a7607157ce9987173e8e99d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __HASHLIST_H__
-#define __HASHLIST_H__
+#ifndef SURICATA_HASHLIST_H
+#define SURICATA_HASHLIST_H
 
 /* hash bucket structure */
 typedef struct HashListTableBucket_ {
@@ -59,5 +59,4 @@ char HashListTableDefaultCompare(void *, uint16_t, void *, uint16_t);
 
 void HashListTableRegisterTests(void);
 
-#endif /* __HASHLIST_H__ */
-
+#endif /* SURICATA_HASHLIST_H */
index b3a5e47a302a24c86cff45a7ceb6c7a89a28ad62..100b56801cdf1bcb3118275f176ec92dd6adb4c6 100644 (file)
@@ -21,9 +21,9 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_HOST_INFO_H__
-#define __UTIL_HOST_INFO_H__
+#ifndef SURICATA_UTIL_HOST_INFO_H
+#define SURICATA_UTIL_HOST_INFO_H
 
 int SCKernelVersionIsAtLeast(int major, int minor);
 
-#endif /* __UTIL_HOST_INFO_H__ */
+#endif /* SURICATA_UTIL_HOST_INFO_H */
index e83f470e95cfc45cd1713c06d5b7dce09724610c..d597ed334556f2a154d3dbf89b95435666a297ac 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_HOST_OS_INFO_H__
-#define __UTIL_HOST_OS_INFO_H__
+#ifndef SURICATA_UTIL_HOST_OS_INFO_H
+#define SURICATA_UTIL_HOST_OS_INFO_H
 
 #define SC_HINFO_IS_IPV6 0
 #define SC_HINFO_IS_IPV4 1
@@ -35,4 +35,4 @@ void SCHInfoCleanResources(void);
 void SCHInfoLoadFromConfig(void);
 void SCHInfoRegisterTests(void);
 
-#endif /* __UTIL_HOST_OS_INFO_H__ */
+#endif /* SURICATA_UTIL_HOST_OS_INFO_H */
index 67bcabf49d840732273afa1ef0dd08987ef89d22..661055a26096850548692c7df5f5b9d07e805623 100644 (file)
@@ -23,9 +23,9 @@
  * Support functions for Hyperscan library integration.
  */
 
-#ifndef __UTIL_HYPERSCAN__H__
-#define __UTIL_HYPERSCAN__H__
+#ifndef SURICATA_UTIL_HYPERSCAN__H
+#define SURICATA_UTIL_HYPERSCAN__H
 
 char *HSRenderPattern(const uint8_t *pat, uint16_t pat_len);
 
-#endif /* __UTIL_HYPERSCAN__H__ */
+#endif /* SURICATA_UTIL_HYPERSCAN__H */
index d0bcc884f1f2c3a1b0e4d1a73870d917e53705cd..c5ba35b562d2d888f921836359cd034b93ce378d 100644 (file)
@@ -22,8 +22,8 @@
  * \author Duarte Silva <duarte.silva@serializing.me>
  */
 
-#ifndef __UTIL_IP_H__
-#define __UTIL_IP_H__
+#ifndef SURICATA_UTIL_IP_H
+#define SURICATA_UTIL_IP_H
 
 bool IPv4AddressStringIsValid(const char *str);
 bool IPv6AddressStringIsValid(const char *str);
@@ -31,4 +31,4 @@ struct in_addr *ValidateIPV4Address(const char *);
 struct in6_addr *ValidateIPV6Address(const char *);
 void MaskIPNetblock(uint8_t *, int, int);
 
-#endif /* __UTIL_IP_H__ */
+#endif /* SURICATA_UTIL_IP_H */
index 5a0f8c508e6dbc7f653ceb5e1a55d5c3ee5ecdbb..e9d192ddbe1020c9e5082b54e9ef20d7b1c6b3ce 100644 (file)
@@ -21,8 +21,8 @@
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __UTIL_JA3_H__
-#define __UTIL_JA3_H__
+#ifndef SURICATA_UTIL_JA3_H
+#define SURICATA_UTIL_JA3_H
 
 #define JA3_BUFFER_INITIAL_SIZE 128
 
@@ -49,5 +49,4 @@ InspectionBuffer *Ja3DetectGetString(DetectEngineThreadCtx *det_ctx,
         const DetectEngineTransforms *transforms, Flow *_f, const uint8_t _flow_flags, void *txv,
         const int list_id);
 
-#endif /* __UTIL_JA3_H__ */
-
+#endif /* SURICATA_UTIL_JA3_H */
index 5c090435c087dcd6c40b9ba7a9b22323f9a1fa2d..9d6c61dccb88b8820ee83b73f759dcf34e7ec2d6 100644 (file)
  * \author Eric Leblond <el@stamus-networks.com>
  */
 
-#ifndef __UTIL_LANDLOCK_H__
-#define __UTIL_LANDLOCK_H__
+#ifndef SURICATA_UTIL_LANDLOCK_H
+#define SURICATA_UTIL_LANDLOCK_H
 
 #include "suricata.h"
 
 void LandlockSandboxing(SCInstance *suri);
 
-#endif /* __UTIL_LANDLOCK_H__ */
+#endif /* SURICATA_UTIL_LANDLOCK_H */
index 12e87dee4a30cf803697ecd7363ec651098be7a5..f53669a195b3a95f25bc1e3c825800b820d4f01c 100644 (file)
@@ -21,8 +21,8 @@
  * \author Paulo Pacheco <fooinha@gmail.com>
  */
 
-#ifndef __UTIL_LOG_REDIS_H__
-#define __UTIL_LOG_REDIS_H__
+#ifndef SURICATA_UTIL_LOG_REDIS_H
+#define SURICATA_UTIL_LOG_REDIS_H
 
 #ifdef HAVE_LIBHIREDIS
 #include <hiredis/hiredis.h>
@@ -63,4 +63,4 @@ int SCConfLogOpenRedis(ConfNode *, void *);
 int LogFileWriteRedis(void *, const char *, size_t);
 
 #endif /* HAVE_LIBHIREDIS */
-#endif /* __UTIL_LOG_REDIS_H__ */
+#endif /* SURICATA_UTIL_LOG_REDIS_H */
index bbb5211cda778a2d23c6a33b346cef566f22317e..e225be48903241e4742e986776f9b9e73cc2e2ff 100644 (file)
@@ -21,8 +21,8 @@
  * \author Mike Pomraning <mpomraning@qualys.com>
  */
 
-#ifndef __UTIL_LOGOPENFILE_H__
-#define __UTIL_LOGOPENFILE_H__
+#ifndef SURICATA_UTIL_LOGOPENFILE_H
+#define SURICATA_UTIL_LOGOPENFILE_H
 
 #include "threads.h"
 #include "conf.h"            /* ConfNode   */
@@ -173,4 +173,4 @@ int SCConfLogOpenGeneric(ConfNode *conf, LogFileCtx *, const char *, int);
 int SCConfLogReopen(LogFileCtx *);
 bool SCLogOpenThreadedFile(const char *log_path, const char *append, LogFileCtx *parent_ctx);
 
-#endif /* __UTIL_LOGOPENFILE_H__ */
+#endif /* SURICATA_UTIL_LOGOPENFILE_H */
index 2e0df28751a1143d94dd42a010c8173378a335c5..c7a23a04305f02845372f0e946211e8c7af1b47d 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_LUA_COMMON_H__
-#define __UTIL_LUA_COMMON_H__
+#ifndef SURICATA_UTIL_LUA_COMMON_H
+#define SURICATA_UTIL_LUA_COMMON_H
 
 #ifdef HAVE_LUA
 
@@ -39,4 +39,4 @@ int LuaStateNeedProto(lua_State *luastate, AppProto alproto);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_COMMON_H__ */
+#endif /* SURICATA_UTIL_LUA_COMMON_H */
index 6575695a26501efffee707306e81234b7b17692b..98bf2cdb562ceed23132e4fbb76f526bac18d856 100644 (file)
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_LUA_DNP3_OBJECTS_H__
-#define __UTIL_LUA_DNP3_OBJECTS_H__
+#ifndef SURICATA_UTIL_LUA_DNP3_OBJECTS_H
+#define SURICATA_UTIL_LUA_DNP3_OBJECTS_H
 
 void DNP3PushPoint(lua_State *luastate, DNP3Object *object,
     DNP3Point *item);
 
-#endif /* ! __UTIL_LUA_DNP3_OBJECTS_H__ */
+#endif /* ! SURICATA_UTIL_LUA_DNP3_OBJECTS_H */
index 3430e41b2205ee7ae34ef70f857200b2db94dbe9..4b656599f0005908b014f066b8a9344eb2618cf6 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_LUA_DNP3_H__
-#define __UTIL_LUA_DNP3_H__
+#ifndef SURICATA_UTIL_LUA_DNP3_H
+#define SURICATA_UTIL_LUA_DNP3_H
 
 #ifdef HAVE_LUA
 
@@ -24,4 +24,4 @@ int LuaRegisterDNP3Functions(lua_State *);
 
 #endif /* HAVE_LUA */
 
-#endif /* !__UTIL_LUA_DNP3_H__ */
+#endif /* !SURICATA_UTIL_LUA_DNP3_H */
index 582fdea75715a93daee3267bc7ae364969c523b9..f9bdc0b2901590e4891d8f0958e250328d23b636 100644 (file)
@@ -21,8 +21,8 @@
  * \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_LUA_DNS_H__
-#define __UTIL_LUA_DNS_H__
+#ifndef SURICATA_UTIL_LUA_DNS_H
+#define SURICATA_UTIL_LUA_DNS_H
 
 #ifdef HAVE_LUA
 
index 96e8ae6efdd07e0a96ac6246b133d0881ebad07b..733233542e9f73a85833436c55b6051b30a094ea 100644 (file)
@@ -21,8 +21,8 @@
  * \author Vadym Malakhatko <v.malakhatko@sirinsoftware.com>
  */
 
-#ifndef __UTIL_LUA_HASSH_H__
-#define __UTIL_LUA_HASSH_H__
+#ifndef SURICATA_UTIL_LUA_HASSH_H
+#define SURICATA_UTIL_LUA_HASSH_H
 
 #ifdef HAVE_LUA
 
@@ -30,4 +30,4 @@ int LuaRegisterHasshFunctions(lua_State *luastate);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_HASSH_H__ */
+#endif /* SURICATA_UTIL_LUA_HASSH_H */
index 8a75ec53e75a18dd87001dbd0497cf8c50bfe0eb..1e44c8599f36462be4cb03f482db242b32e94569 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_LUA_HTTP_H__
-#define __UTIL_LUA_HTTP_H__
+#ifndef SURICATA_UTIL_LUA_HTTP_H
+#define SURICATA_UTIL_LUA_HTTP_H
 
 #ifdef HAVE_LUA
 
@@ -30,4 +30,4 @@ int LuaRegisterHttpFunctions(lua_State *luastate);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_HTTP_H__ */
+#endif /* SURICATA_UTIL_LUA_HTTP_H */
index 4bad867a4a578fcbe9e898d9d050f4ddbb1bc936..84deb160a7f23a41c240f852a1c4bb5ae5874057 100644 (file)
@@ -21,8 +21,8 @@
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __UTIL_LUA_JA3_H__
-#define __UTIL_LUA_JA3_H__
+#ifndef SURICATA_UTIL_LUA_JA3_H
+#define SURICATA_UTIL_LUA_JA3_H
 
 #ifdef HAVE_LUA
 
@@ -30,4 +30,4 @@ int LuaRegisterJa3Functions(lua_State *luastate);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_JA3_H__ */
+#endif /* SURICATA_UTIL_LUA_JA3_H */
index 26750b8fbf22cd7c8f76d7759a45770a17b70e95..6c695051c313c77dc9b9263f31de4ef1027d4345 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_LUA_SMTP_H__
-#define __UTIL_LUA_SMTP_H__
+#ifndef SURICATA_UTIL_LUA_SMTP_H
+#define SURICATA_UTIL_LUA_SMTP_H
 
 #ifdef HAVE_LUA
 
@@ -24,4 +24,4 @@ int LuaRegisterSmtpFunctions(lua_State *luastate);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_SMTP_H__ */
+#endif /* SURICATA_UTIL_LUA_SMTP_H */
index aa6b6d704253d350bfa727d48d911f63d7051155..88f9972175257683ebd9ec4645a48676b4e58158 100644 (file)
@@ -21,8 +21,8 @@
  * \author Mats Klepsland <mats.klepsland@gmail.com>
  */
 
-#ifndef __UTIL_LUA_SSH_H__
-#define __UTIL_LUA_SSH_H__
+#ifndef SURICATA_UTIL_LUA_SSH_H
+#define SURICATA_UTIL_LUA_SSH_H
 
 #ifdef HAVE_LUA
 
@@ -30,4 +30,4 @@ int LuaRegisterSshFunctions(lua_State *luastate);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_SSH_H__ */
+#endif /* SURICATA_UTIL_LUA_SSH_H */
index 57a27b5500bee8b596dbccfba707f9f6c340f902..3e4c08d4357c708cf30d21f4926b29e7079bafa8 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_LUA_TLS_H__
-#define __UTIL_LUA_TLS_H__
+#ifndef SURICATA_UTIL_LUA_TLS_H
+#define SURICATA_UTIL_LUA_TLS_H
 
 #ifdef HAVE_LUA
 
@@ -30,4 +30,4 @@ int LuaRegisterTlsFunctions(lua_State *luastate);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_TLS_H__ */
+#endif /* SURICATA_UTIL_LUA_TLS_H */
index 471692526c557b3f7f0f820023e61ebae839aac6..ef15d9365253233e0a324135d1f6ec232c83865e 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_LUA_H__
-#define __UTIL_LUA_H__
+#ifndef SURICATA_UTIL_LUA_H
+#define SURICATA_UTIL_LUA_H
 
 #ifndef HAVE_LUA
 
@@ -105,4 +105,4 @@ int LuaPushInteger(lua_State *luastate, lua_Integer n);
 
 #endif /* HAVE_LUA */
 
-#endif /* __UTIL_LUA_H__ */
+#endif /* SURICATA_UTIL_LUA_H */
index b90cef431b47bdd64aba0ca64a33d0bd7d860bd2..83964f6fab6c607489bb749cf29613f20f6ad4d6 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_LUAJIT_H__
-#define __UTIL_LUAJIT_H__
+#ifndef SURICATA_UTIL_LUAJIT_H
+#define SURICATA_UTIL_LUAJIT_H
 
 #ifdef HAVE_LUAJIT
 
@@ -35,4 +35,4 @@ void LuajitReturnState(lua_State *s);
 
 #endif /* HAVE_LUAJIT */
 
-#endif /* __UTIL_LUAJIT_H__ */
+#endif /* SURICATA_UTIL_LUAJIT_H */
index 1b17255593c5878806db871ac3a48e385d835575..82a352773393abac8cf4931f9a0f1dfe0197db08 100644 (file)
@@ -21,8 +21,8 @@
  * \author Sascha Steinbiss <sascha.steinbiss@dcso.de>
  */
 
-#ifndef __UTIL_MACSET_H__
-#define __UTIL_MACSET_H__
+#ifndef SURICATA_UTIL_MACSET_H
+#define SURICATA_UTIL_MACSET_H
 
 typedef struct MacSet_ MacSet;
 typedef enum {
@@ -45,4 +45,4 @@ FlowStorageId MacSetGetFlowStorageID(void);
 bool    MacSetFlowStorageEnabled(void);
 void    MacSetRegisterTests(void);
 
-#endif /* __UTIL_MACSET_H__ */
+#endif /* SURICATA_UTIL_MACSET_H */
index 86202dc5a6b7a11c7ac61efaccd769f9497a388a..d120fec78a183fae1d4957d8c14df0ae6c6592cd 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_MAGIC_H__
-#define __UTIL_MAGIC_H__
+#ifndef SURICATA_UTIL_MAGIC_H
+#define SURICATA_UTIL_MAGIC_H
 
 #ifdef HAVE_MAGIC
 magic_t MagicInitContext(void);
index 56a7b22c78f0e620d51db2c0cbc4e6e8fd32e53c..8ddd2725fbecd3a612997532635c50c972534eb7 100644 (file)
@@ -28,8 +28,8 @@
  * free, but there are more.
  */
 
-#ifndef __UTIL_MEM_H__
-#define __UTIL_MEM_H__
+#ifndef SURICATA_UTIL_MEM_H
+#define SURICATA_UTIL_MEM_H
 
 #if CPPCHECK==1 || defined(__clang_analyzer__)
 #define SCMalloc malloc
@@ -78,5 +78,4 @@ void SCFreeAlignedFunc(void *ptr);
 
 #endif /* CPPCHECK */
 
-#endif /* __UTIL_MEM_H__ */
-
+#endif /* SURICATA_UTIL_MEM_H */
index 47bfc98c9a16068f46c41a3be1756b85e8601d59..f9fc75357c17eefeb2cf20d49f03ef5376488d93 100644 (file)
@@ -26,8 +26,8 @@
  * 1 on a failed match.
  */
 
-#ifndef __UTIL_MEMCMP_H__
-#define __UTIL_MEMCMP_H__
+#ifndef SURICATA_UTIL_MEMCMP_H
+#define SURICATA_UTIL_MEMCMP_H
 
 #include "suricata-common.h"
 #include "util-optimize.h"
@@ -308,5 +308,4 @@ static inline int SCBufferCmp(const void *s1, size_t len1, const void *s2, size_
     return 1;
 }
 
-#endif /* __UTIL_MEMCMP_H__ */
-
+#endif /* SURICATA_UTIL_MEMCMP_H */
index 67e5ce7add4097b1a83611a73c3f27be394ece0a..6d1d5e68fc1f9a487f6feff277c15f98a8f5400f 100644 (file)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef __UTIL_MEMCPY_H__
-#define __UTIL_MEMCPY_H__
+#ifndef SURICATA_UTIL_MEMCPY_H
+#define SURICATA_UTIL_MEMCPY_H
 
 #include "suricata-common.h"
 
@@ -46,4 +46,4 @@ static inline void memcpy_tolower(uint8_t *d, const uint8_t *s, uint16_t len)
     return;
 }
 
-#endif /* __UTIL_MEMCPY_H__ */
+#endif /* SURICATA_UTIL_MEMCPY_H */
index c3b5c8d89316e0fa0149700216aeca5dbee5747b..0a5ddfb85d6c4d00161b73bfb00c94c3506fb022 100644 (file)
  *
  */
 
-#ifndef __UTIL_MEMRCHR_H__
-#define __UTIL_MEMRCHR_H__
+#ifndef SURICATA_UTIL_MEMRCHR_H
+#define SURICATA_UTIL_MEMRCHR_H
 
 void *memrchr(const void *s, int c, size_t n);
 
 void MemrchrRegisterTests(void);
 
-#endif /* __UTIL_MEMRCHR_H__ */
+#endif /* SURICATA_UTIL_MEMRCHR_H */
index a3d398d92f0a0af87e07f2bc69f4996be72bee41..ac23b9777f268f8c891321d0250ef4a8cbe8cac8 100644 (file)
@@ -21,9 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_MISC_H__
-#define __UTIL_MISC_H__
-
+#ifndef SURICATA_UTIL_MISC_H
+#define SURICATA_UTIL_MISC_H
 
 /**
  * \brief Generic API that can be used by all to log an
@@ -57,4 +56,4 @@ void ParseSizeDeinit(void);
 void ShortenString(const char *input,
     char *output, size_t output_size, char c);
 
-#endif /* __UTIL_MISC_H__ */
+#endif /* SURICATA_UTIL_MISC_H */
index 4979f84241a44ec4d5d1b50501bc0ee85ca184fb..f840d5bb909787b3daaeef942ec4ced571991ffb 100644 (file)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef __UTIL_MPM_AC_KS__H__
-#define __UTIL_MPM_AC_KS__H__
+#ifndef SURICATA_UTIL_MPM_AC_KS__H
+#define SURICATA_UTIL_MPM_AC_KS__H
 
 typedef struct SCACTilePatternList_ {
     uint8_t *cs;
@@ -147,4 +147,4 @@ typedef struct SCACTileSearchCtx_ {
 
 void MpmACTileRegister(void);
 
-#endif /* __UTIL_MPM_AC_KS__H__ */
+#endif /* SURICATA_UTIL_MPM_AC_KS__H */
index 3e8ec9db5bb287e2ef2b6028a668afd0215856d5..f6cbe512b7790f62fb07f43194a0dacc4190f110 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_MPM_AC__H__
-#define __UTIL_MPM_AC__H__
+#ifndef SURICATA_UTIL_MPM_AC__H
+#define SURICATA_UTIL_MPM_AC__H
 
 #include "util-mpm.h"
 
@@ -79,4 +79,4 @@ typedef struct SCACCtx_ {
 
 void MpmACRegister(void);
 
-#endif /* __UTIL_MPM_AC__H__ */
+#endif /* SURICATA_UTIL_MPM_AC__H */
index 4778ab85012a68dc284ad495ac203c76ed307395..09deb5ff99f991b6dc3d67beb30f272d1e2019be 100644 (file)
@@ -24,8 +24,8 @@
  * MPM pattern matcher that calls the Hyperscan regex matcher.
  */
 
-#ifndef __UTIL_MPM_HS__H__
-#define __UTIL_MPM_HS__H__
+#ifndef SURICATA_UTIL_MPM_HS__H
+#define SURICATA_UTIL_MPM_HS__H
 
 typedef struct SCHSPattern_ {
     /* length of the pattern */
@@ -73,4 +73,4 @@ void MpmHSRegister(void);
 
 void MpmHSGlobalCleanup(void);
 
-#endif /* __UTIL_MPM_HS__H__ */
+#endif /* SURICATA_UTIL_MPM_HS__H */
index 96cbeadb212941006174b0258f463ebedb759174..c3b12d8a1afd14af9ecef30b77dd8a7a5d8ad3fe 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_MPM_H__
-#define __UTIL_MPM_H__
+#ifndef SURICATA_UTIL_MPM_H
+#define SURICATA_UTIL_MPM_H
 
 #include "app-layer-protos.h"
 #include "util-prefilter.h"
@@ -200,4 +200,4 @@ int MpmAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen,
                             uint16_t offset, uint16_t depth, uint32_t pid,
                             SigIntId sid, uint8_t flags);
 
-#endif /* __UTIL_MPM_H__ */
+#endif /* SURICATA_UTIL_MPM_H */
index 45d4ddf6789db3a2c90a50f5a0be2142094385c6..0cc0f7c2e03c251a142301b9a672b59bd7956b1c 100644 (file)
@@ -20,8 +20,8 @@
  * \author Phil Young <py@napatech.com>
  *
  */
-#ifndef __UTIL_NAPATECH_H__
-#define __UTIL_NAPATECH_H__
+#ifndef SURICATA_UTIL_NAPATECH_H
+#define SURICATA_UTIL_NAPATECH_H
 
 #ifdef HAVE_NAPATECH
 #include <nt.h>
@@ -118,4 +118,4 @@ int NapatechIsBypassSupported(void);
 
 #endif /* NAPATECH_ENABLE_BYPASS */
 #endif /* HAVE_NAPATECH */
-#endif /* __UTIL_NAPATECH_H__ */
+#endif /* SURICATA_UTIL_NAPATECH_H */
index bde35ddd810eacc6521725283291a754709ec545..3db8c16e71e0e9d20017342e6ed998d8efb30d55 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_OPTIMIZE_H__
-#define __UTIL_OPTIMIZE_H__
+#ifndef SURICATA_UTIL_OPTIMIZE_H
+#define SURICATA_UTIL_OPTIMIZE_H
 
 /**
  * \file
@@ -48,5 +48,4 @@
  */
 #define hw_barrier() __sync_synchronize()
 
-#endif /* __UTIL_OPTIMIZE_H__ */
-
+#endif /* SURICATA_UTIL_OPTIMIZE_H */
index 037639147737f25add6ac23c9ccdeacebdbca3bc..238b90f6b9498c88995aeab00894f5de97f7ac59 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_PAGES_H__
-#define __UTIL_PAGES_H__
+#ifndef SURICATA_UTIL_PAGES_H
+#define SURICATA_UTIL_PAGES_H
 
 #include "suricata-common.h"
 
@@ -41,4 +41,4 @@
     #endif /* HAVE_SYS_MMAN_H */
 #endif
 
-#endif /* __UTIL_PAGES_H__ */
+#endif /* SURICATA_UTIL_PAGES_H */
index 141b6fc2472e77c768fa490d0f016bcdedfd066d..fee58eabd3c4ffb04c5546266c7ece7962d5b034 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_PATH_H__
-#define __UTIL_PATH_H__
+#ifndef SURICATA_UTIL_PATH_H
+#define SURICATA_UTIL_PATH_H
 
 #ifdef OS_WIN32
 typedef struct _stat SCStat;
@@ -61,4 +61,4 @@ char *SCRealPath(const char *path, char *resolved_path);
 const char *SCBasename(const char *path);
 bool SCPathContainsTraversal(const char *path);
 
-#endif /* __UTIL_PATH_H__ */
+#endif /* SURICATA_UTIL_PATH_H */
index ef071f4e8424011691db7e5cf07b7798819b9217..07a3e65ee3e3d0c2925bb401727857b05f93126e 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_PID_H__
-#define __UTIL_PID_H__
+#ifndef SURICATA_UTIL_PID_H
+#define SURICATA_UTIL_PID_H
 
 int SCPidfileCreate(const char *);
 void SCPidfileRemove(const char *);
 int SCPidfileTestRunning(const char *pid_filename);
 
-#endif /* __UTIL_PID_H__ */
-
+#endif /* SURICATA_UTIL_PID_H */
index c958f2d79ccdf2b63abb0bfe6070ccda8c7d01d8..7b5531c816a2f5d3810bafa29ed7b8b59c4a1dea 100644 (file)
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef __UTIL_PLUGIN_H__
-#define __UTIL_PLUGIN_H__
+#ifndef SURICATA_UTIL_PLUGIN_H
+#define SURICATA_UTIL_PLUGIN_H
 
 #include "suricata-plugin.h"
 
@@ -26,4 +26,4 @@ SCCapturePlugin *SCPluginFindCaptureByName(const char *name);
 
 bool RegisterPlugin(SCPlugin *, void *);
 
-#endif /* __UTIL_PLUGIN_H__ */
+#endif /* SURICATA_UTIL_PLUGIN_H */
index 44b76e75e2924954d74423cd68a625068d48d697..7d6ad1f1a54174e1656f1b49b5269227bc1dd287 100644 (file)
@@ -36,8 +36,8 @@
  *  from thread Y.
  */
 
-#ifndef __UTIL_POOL_THREAD_H__
-#define __UTIL_POOL_THREAD_H__
+#ifndef SURICATA_UTIL_POOL_THREAD_H
+#define SURICATA_UTIL_POOL_THREAD_H
 
 #include "threads.h"
 #include "util-pool.h"
@@ -100,7 +100,7 @@ void PoolThreadUnlock(PoolThread *pt, PoolThreadId id);
  *  \retval size or -1 on error */
 int PoolThreadSize(PoolThread *pt);
 
-#endif /* __UTIL_POOL_THREAD_H__ */
+#endif /* SURICATA_UTIL_POOL_THREAD_H */
 
 /**
  * @}
index cb82ff6da0763899e7af95ac480cb217f4842291..a2cc68d53129a96d97d8533ee95e3eaa8c954eb4 100644 (file)
@@ -27,8 +27,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_POOL_H__
-#define __UTIL_POOL_H__
+#ifndef SURICATA_UTIL_POOL_H
+#define SURICATA_UTIL_POOL_H
 
 #define POOL_BUCKET_PREALLOCATED    (1 << 0)
 
@@ -82,7 +82,7 @@ void PoolReturn(Pool *, void *);
 
 void PoolRegisterTests(void);
 
-#endif /* __UTIL_POOL_H__ */
+#endif /* SURICATA_UTIL_POOL_H */
 
 /**
  * @}
index 0eda61b72a02636b344e1fc94f242b19a014f372..d84c3527bb8aa213bb563883b2bddc7cf55edd8d 100644 (file)
@@ -21,9 +21,9 @@
  * \author Shivani Bhardwaj <shivani@oisf.net>
  */
 
-#ifndef __UTIL_INTERVAL_TREE_H__
-#define __UTIL_INTERVAL_TREE_H__
+#ifndef SURICATA_UTIL_INTERVAL_TREE_H
+#define SURICATA_UTIL_INTERVAL_TREE_H
 
 #include "detect-engine-port.h"
 
-#endif /* __UTIL_INTERVAL_TREE_H__ */
+#endif /* SURICATA_UTIL_INTERVAL_TREE_H */
index 67c24d6c9de7c07d245583b44b63105e75783f81..51a65c55b443ffb8c5a52e82fba9a4608808c9bc 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_PREFILTER_H__
-#define __UTIL_PREFILTER_H__
+#ifndef SURICATA_UTIL_PREFILTER_H
+#define SURICATA_UTIL_PREFILTER_H
 
 #include "util-debug.h"
 
@@ -87,4 +87,4 @@ void PmqReset(PrefilterRuleStore *);
 void PmqCleanup(PrefilterRuleStore *);
 void PmqFree(PrefilterRuleStore *);
 
-#endif /* __UTIL_PREFILTER_H__ */
+#endif /* SURICATA_UTIL_PREFILTER_H */
index 249ec20f7353756e5c5e94b5a134ce429373f6c7..debb8953bc14e90fcab583bc98057f22ff30740a 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-
-
-#ifndef __UTIL_PRINT_H__
-#define __UTIL_PRINT_H__
+#ifndef SURICATA_UTIL_PRINT_H
+#define SURICATA_UTIL_PRINT_H
 
 #define PrintBufferData(buf, buf_offset_ptr, buf_size, ...) do {         \
         int cw = snprintf((buf) + *(buf_offset_ptr),                    \
@@ -55,5 +53,4 @@ void PrintRawLineHexBuf(char *, uint32_t, const uint8_t *, uint32_t );
 const char *PrintInet(int , const void *, char *, socklen_t);
 void PrintHexString(char *str, size_t size, uint8_t *buf, size_t buf_len);
 
-#endif /* __UTIL_PRINT_H__ */
-
+#endif /* SURICATA_UTIL_PRINT_H */
index 08d745a7218232d8f0e11e5e9f94e947ff94a69b..9a973d30a7471d60ed69462f97c04aeb98200a54 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_PROFILE_LOCKS_H__
-#define __UTIL_PROFILE_LOCKS_H__
+#ifndef SURICATA_UTIL_PROFILE_LOCKS_H
+#define SURICATA_UTIL_PROFILE_LOCKS_H
 
 #ifdef PROFILING
 
@@ -32,5 +32,4 @@ int LockRecordInitHash(void);
 void LockRecordFreeHash(void);
 
 #endif /* PROFILING */
-#endif /* __UTIL_PROFILE_LOCKS_H__ */
-
+#endif /* SURICATA_UTIL_PROFILE_LOCKS_H */
index 6450bc8cefe3f5b72102b18c41d89d0f5423c519..21b60a3c19161286feeb826858872a0c229335da 100644 (file)
@@ -22,8 +22,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_PROFILE_H__
-#define __UTIL_PROFILE_H__
+#ifndef SURICATA_UTIL_PROFILE_H
+#define SURICATA_UTIL_PROFILE_H
 
 #include "util-cpu.h"
 
@@ -432,4 +432,4 @@ void SCProfilingRuleThreatAggregate(DetectEngineThreadCtx *det_ctx);
 
 #endif /* PROFILE_RULES */
 
-#endif /* ! __UTIL_PROFILE_H__ */
+#endif /* ! SURICATA_UTIL_PROFILE_H */
index bc5037395a0dd6edf3e5548e90d1fdd2184e9f69..23b19844630b3faba3b14cd46cb4046ad4b85e61 100644 (file)
@@ -21,8 +21,8 @@
  * \author Gurvinder Singh <gurvindersinghdahiya@gmail.com>
  */
 
-#ifndef __UTIL_PROTO_NAME_H__
-#define        __UTIL_PROTO_NAME_H__
+#ifndef SURICATA_UTIL_PROTO_NAME_H
+#define SURICATA_UTIL_PROTO_NAME_H
 
 /** Lookup array to hold the information related to known protocol
  *  values
@@ -38,5 +38,4 @@ void SCProtoNameRelease(void);
 void SCProtoNameRegisterTests(void);
 #endif
 
-#endif /* __UTIL_PROTO_NAME_H__ */
-
+#endif /* SURICATA_UTIL_PROTO_NAME_H */
index c43e14eb01265d56c9309d705bc7de708920b6e9..240c2690733174c2a87d3b1e855960a3d16897bb 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_RADIX_TREE_H__
-#define __UTIL_RADIX_TREE_H__
+#ifndef SURICATA_UTIL_RADIX_TREE_H
+#define SURICATA_UTIL_RADIX_TREE_H
 
 #define SC_RADIX_BITTEST(x, y) ((x) & (y))
 
@@ -124,4 +124,4 @@ void SCRadixPrintNodeInfo(SCRadixNode *, int,  void (*PrintData)(void*));
 
 void SCRadixRegisterTests(void);
 
-#endif /* __UTIL_RADIX_TREE_H__ */
+#endif /* SURICATA_UTIL_RADIX_TREE_H */
index 6376c05a3aaa8ef7d8bc190d8d530730fafcce61..aa846854e89cec731431bb2bb7df7d6689401f39 100644 (file)
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_RANDOM_H__
-#define __UTIL_RANDOM_H__
+#ifndef SURICATA_UTIL_RANDOM_H
+#define SURICATA_UTIL_RANDOM_H
 
 long int RandomGet(void);
 
-#endif /* __UTIL_RANDOM_H__ */
-
+#endif /* SURICATA_UTIL_RANDOM_H */
index 5334fd7c42c1701f371796dd9b0c0bb0d3141ae0..c21c51622bfde94a78cb625117f26007d26a8582 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_REFERENCE_CONFIG_H__
-#define __UTIL_REFERENCE_CONFIG_H__
+#ifndef SURICATA_UTIL_REFERENCE_CONFIG_H
+#define SURICATA_UTIL_REFERENCE_CONFIG_H
 
 #include "detect.h"
 
@@ -56,4 +56,4 @@ FILE *SCRConfGenerateInvalidDummyReferenceConfigFD03(void);
 void SCReferenceConfInit(DetectEngineCtx *de_ctx);
 void SCReferenceConfDeinit(DetectEngineCtx *de_ctx);
 
-#endif /* __UTIL_REFERENCE_CONFIG_H__ */
+#endif /* SURICATA_UTIL_REFERENCE_CONFIG_H */
index 3b044274a54baa5036f7433a74761266d1db48d8..ee530f6cab0c4bc46039a69609c9e965e5299d1c 100644 (file)
@@ -21,9 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_ROHASH_H__
-#define __UTIL_ROHASH_H__
-
+#ifndef SURICATA_UTIL_ROHASH_H
+#define SURICATA_UTIL_ROHASH_H
 
 typedef struct ROHashTable_ {
     uint8_t locked;
@@ -44,4 +43,4 @@ uint32_t ROHashMemorySize(ROHashTable *table);
 /* run time */
 void *ROHashLookup(ROHashTable *table, void *data, uint16_t size);
 
-#endif /* __UTIL_ROHASH_H__ */
+#endif /* SURICATA_UTIL_ROHASH_H */
index a5be2fa3a3dba3932f60f1e8192fff6d8691fcad..0e198b745b6e5a2354aa9ab50ff956989a56f2ba 100644 (file)
@@ -21,8 +21,8 @@
  *  \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_RULE_VARS_H__
-#define __UTIL_RULE_VARS_H__
+#ifndef SURICATA_UTIL_RULE_VARS_H
+#define SURICATA_UTIL_RULE_VARS_H
 
 #include "detect.h"
 
@@ -35,4 +35,4 @@ typedef enum {
 const char *SCRuleVarsGetConfVar(const DetectEngineCtx *, const char *, SCRuleVarsType);
 void SCRuleVarsRegisterTests(void);
 
-#endif /* __UTIL_RULE_VARS_H__ */
+#endif /* SURICATA_UTIL_RULE_VARS_H */
index 419f9f95112de61172bf76b89d1626818b04618f..d1e4c80208b74976f542db956e9d7a3b92f4e49c 100644 (file)
@@ -20,8 +20,8 @@
  *  \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_RUNMODES_H__
-#define __UTIL_RUNMODES_H__
+#ifndef SURICATA_UTIL_RUNMODES_H
+#define SURICATA_UTIL_RUNMODES_H
 
 typedef void *(*ConfigIfaceParserFunc) (const char *);
 typedef void *(*ConfigIPSParserFunc) (int);
@@ -59,4 +59,4 @@ int RunModeSetIPSWorker(ConfigIPSParserFunc ConfigParser,
 
 char *RunmodeAutoFpCreatePickupQueuesString(int n);
 
-#endif /* __UTIL_RUNMODES_H__ */
+#endif /* SURICATA_UTIL_RUNMODES_H */
index ca3bc8c28dd3851a185b678421dbe835ca8edc17..83a52d90a91b2348f2b271295a08ed316d15df4b 100644 (file)
  *  \author Eric Leblond <eric@regit.org>
  */
 
-#ifndef __UTIL_RUNNING_MODES_H__
-#define __UTIL_RUNNING_MODES_H__
+#ifndef SURICATA_UTIL_RUNNING_MODES_H
+#define SURICATA_UTIL_RUNNING_MODES_H
 
 int ListKeywords(const char *keyword_info);
 int ListAppLayerProtocols(const char *conf_filename);
 
-#endif /* __UTIL_RUNNING_MODES_H__ */
+#endif /* SURICATA_UTIL_RUNNING_MODES_H */
index 1d5ba3973e6f821cd8946c140ca07bc92aee0167..7061b6bb733440b655511889b9601bd46a3507c9 100644 (file)
@@ -21,8 +21,8 @@
  * \author Anoop Saldanha <anoopsaldanha@gmail.com>
  */
 
-#ifndef __UTIL_SIGNAL_H__
-#define __UTIL_SIGNAL_H__
+#ifndef SURICATA_UTIL_SIGNAL_H
+#define SURICATA_UTIL_SIGNAL_H
 
 int UtilSignalBlock(int);
 int UtilSignalUnblock(int);
@@ -30,4 +30,4 @@ void UtilSignalHandlerSetup(int, void (*handler)(int));
 #if 0
 int UtilSignalIsHandler(int sig, void (*handler)(int));
 #endif
-#endif /* __UTIL_SIGNAL_H__ */
+#endif /* SURICATA_UTIL_SIGNAL_H */
index 6c0afbc3d74623d78de0c59272f6582c54db4665..42e4c90ec4fe69f9eb8256174e57787afaa06377 100644 (file)
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __UTIL_SPM_BM__
-#define __UTIL_SPM_BM__
+#ifndef SURICATA_UTIL_SPM_BM
+#define SURICATA_UTIL_SPM_BM
 
 #include "suricata-common.h"
 
@@ -49,5 +49,4 @@ void BoyerMooreCtxDeInit(BmCtx *);
 
 void SpmBMRegister(void);
 
-#endif /* __UTIL_SPM_BM__ */
-
+#endif /* SURICATA_UTIL_SPM_BM */
index ddd9302390520867836a9d127c86ed852fc7774b..87f028ab6381a8ec26d5dd885303975b6880dfcd 100644 (file)
@@ -22,8 +22,8 @@
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __UTIL_SPM_BS__
-#define __UTIL_SPM_BS__
+#ifndef SURICATA_UTIL_SPM_BS
+#define SURICATA_UTIL_SPM_BS
 
 #include "suricata-common.h"
 
@@ -31,5 +31,4 @@ uint8_t *BasicSearch(const uint8_t *, uint32_t, const uint8_t *, uint16_t);
 uint8_t *BasicSearchNocase(const uint8_t *, uint32_t, const uint8_t *, uint16_t);
 void BasicSearchInit (void);
 
-#endif /* __UTIL_SPM_BS__ */
-
+#endif /* SURICATA_UTIL_SPM_BS */
index 74df96aae1e2a15ca18962e600623153cf085def..c502d5314c4364f049d3e32913eb946116572903 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __UTIL_SPM_BS2BM__
-#define __UTIL_SPM_BS2BM__
+#ifndef SURICATA_UTIL_SPM_BS2BM
+#define SURICATA_UTIL_SPM_BS2BM
 
 #include "suricata-common.h"
 
@@ -33,5 +33,4 @@ void Bs2BmBadcharsNocase(const uint8_t *, uint16_t, uint8_t *);
 uint8_t *Bs2Bm(const uint8_t *, uint32_t, const uint8_t *, uint16_t, const uint8_t[]);
 uint8_t *Bs2BmNocase(const uint8_t *, uint32_t, const uint8_t *, uint16_t, const uint8_t[]);
 
-#endif /* __UTIL_SPM_BS2BM__ */
-
+#endif /* SURICATA_UTIL_SPM_BS2BM */
index e362198819c89bf6fab2215292378de0f002fc2d..170e9d2588abc697405317372dd6506fb78d6ee3 100644 (file)
@@ -23,9 +23,9 @@
  * Single pattern matcher that uses the Hyperscan regex matcher.
  */
 
-#ifndef __UTIL_SPM_HS_H__
-#define __UTIL_SPM_HS_H__
+#ifndef SURICATA_UTIL_SPM_HS_H
+#define SURICATA_UTIL_SPM_HS_H
 
 void SpmHSRegister(void);
 
-#endif /* __UTIL_SPM_HS_H__ */
+#endif /* SURICATA_UTIL_SPM_HS_H */
index 9893dcd4222ed12d0ec146cadc3146a625b3aae7..2daeab85c740bf382c7e555aa4d8571ea24ec493 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __UTIL_SPM_H__
-#define __UTIL_SPM_H__
+#ifndef SURICATA_UTIL_SPM_H
+#define SURICATA_UTIL_SPM_H
 
 #include "util-spm-bs.h"
 
@@ -121,4 +121,4 @@ uint8_t *BoyerMooreNocaseSearch(const uint8_t *text, uint32_t textlen, uint8_t *
 #ifdef UNITTESTS
 void UtilSpmSearchRegistertests(void);
 #endif
-#endif /* __UTIL_SPM_H__ */
+#endif /* SURICATA_UTIL_SPM_H */
index 6866874f7deb77c1a8c0c35c388834666af9d849..84860e622cf2bcb7fc2a0aa430ce70b7e2aa9243 100644 (file)
@@ -23,8 +23,8 @@
  *  Storage API
  */
 
-#ifndef __UTIL_STORAGE_H__
-#define __UTIL_STORAGE_H__
+#ifndef SURICATA_UTIL_STORAGE_H
+#define SURICATA_UTIL_STORAGE_H
 
 typedef enum StorageEnum_ {
     STORAGE_HOST,
index 98ee6f67ca260ebdd451f4a8879d1282fbf352c4..bfd441045be1b19658ee461ebca1222b75dc0f5d 100644 (file)
@@ -55,9 +55,8 @@
  * +-----------+-----------+
  */
 
-
-#ifndef __UTIL_STREAMING_BUFFER_H__
-#define __UTIL_STREAMING_BUFFER_H__
+#ifndef SURICATA_UTIL_STREAMING_BUFFER_H
+#define SURICATA_UTIL_STREAMING_BUFFER_H
 
 #include "tree.h"
 
@@ -200,4 +199,4 @@ int StreamingBufferSegmentIsBeforeWindow(const StreamingBuffer *sb,
 
 void StreamingBufferRegisterTests(void);
 
-#endif /* __UTIL_STREAMING_BUFFER_H__ */
+#endif /* SURICATA_UTIL_STREAMING_BUFFER_H */
index 9618d5c06442f2d24c349cf9aeb8775aa96d43c6..f45b6e84316717bd55a310135a13be491b528b9c 100644 (file)
@@ -23,8 +23,8 @@
  * thash -> thread hash. Hash table with locking handling.
  */
 
-#ifndef __THASH_H__
-#define __THASH_H__
+#ifndef SURICATA_THASH_H
+#define SURICATA_THASH_H
 
 #include "threads.h"
 
@@ -198,4 +198,4 @@ int THashRemoveFromHash (THashTableContext *ctx, void *data);
 void THashConsolidateMemcap(THashTableContext *ctx);
 void THashDataMoveToSpare(THashTableContext *ctx, THashData *h);
 
-#endif /* __THASH_H__ */
+#endif /* SURICATA_THASH_H */
index ff0eadcf312594805c46b1881bd3ebeeee715c63..2a100a6c3201cb9abe8005e32437ed41cd1e7730 100644 (file)
@@ -21,8 +21,8 @@
  * \author Breno Silva Pinto <breno.silva@gmail.com>
  */
 
-#ifndef __UTIL_THRESHOLD_CONFIG_H__
-#define __UTIL_THRESHOLD_CONFIG_H__
+#ifndef SURICATA_UTIL_THRESHOLD_CONFIG_H
+#define SURICATA_UTIL_THRESHOLD_CONFIG_H
 
 int SCThresholdConfParseFile(DetectEngineCtx *, FILE *);
 int SCThresholdConfInitContext(DetectEngineCtx *);
@@ -31,4 +31,4 @@ void SCThresholdConfRegisterTests(void);
 
 void SCThresholdConfGlobalInit(void);
 
-#endif /* __UTIL_THRESHOLD_CONFIG_H__ */
+#endif /* SURICATA_UTIL_THRESHOLD_CONFIG_H */
index b0f7207b3c86b4fab60aa14d2f4e6f8341b102c1..a2a915039fbb4f3638dd2714273d313955c90d93 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_TIME_H__
-#define __UTIL_TIME_H__
+#ifndef SURICATA_UTIL_TIME_H
+#define SURICATA_UTIL_TIME_H
 
 /*
  * The SCTime_t member is broken up as
@@ -162,5 +162,4 @@ uint64_t SCGetSecondsUntil (const char *str, time_t epoch);
 uint64_t SCTimespecAsEpochMillis(const struct timespec *ts);
 uint64_t TimeDifferenceMicros(struct timeval t0, struct timeval t1);
 
-#endif /* __UTIL_TIME_H__ */
-
+#endif /* SURICATA_UTIL_TIME_H */
index b3b6d18aa4b0166b460b95f0bd4aa0b43dc39041..ed6a023d10116fe7ef8c05b8930b4ee71aa72f42 100644 (file)
@@ -21,8 +21,8 @@
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  */
 
-#ifndef __UTIL_UNITTEST_HELPER__
-#define __UTIL_UNITTEST_HELPER__
+#ifndef SURICATA_UTIL_UNITTEST_HELPER
+#define SURICATA_UTIL_UNITTEST_HELPER
 
 #if defined(UNITTESTS)
 #include "flow.h"
@@ -78,4 +78,4 @@ int UTHParseSignature(const char *str, bool expect);
 
 void UTHRegisterTests(void);
 
-#endif /* __UTIL_UNITTEST_HELPER__ */
+#endif /* SURICATA_UTIL_UNITTEST_HELPER */
index 80d666304da3a799516496fc12299e07ba7622c3..749ce21c93bd23ece8e30010f338a918320c2f87 100644 (file)
@@ -30,8 +30,8 @@
  * @{
  */
 
-#ifndef __UTIL_UNITTEST_H__
-#define __UTIL_UNITTEST_H__
+#ifndef SURICATA_UTIL_UNITTEST_H
+#define SURICATA_UTIL_UNITTEST_H
 
 #ifdef UNITTESTS
 
@@ -108,7 +108,7 @@ extern int unittests_fatal;
 
 #endif
 
-#endif /* __UTIL_UNITTEST_H__ */
+#endif /* SURICATA_UTIL_UNITTEST_H */
 
 /**
  * @}
index c0dac20b78be49c3faee614af57d6a017389936a..f892c7aecc56a299bde60b48f719cbca3f4394c3 100644 (file)
@@ -27,9 +27,8 @@
  * used for testing.
  */
 
-
-#ifndef __UTIL_VALIDATE_H__
-#define __UTIL_VALIDATE_H__
+#ifndef SURICATA_UTIL_VALIDATE_H
+#define SURICATA_UTIL_VALIDATE_H
 
 #ifdef DEBUG_VALIDATION
 
 
 #endif /* DEBUG_VALIDATE */
 
-#endif /* __UTIL_VALIDATE_H__ */
-
+#endif /* SURICATA_UTIL_VALIDATE_H */
index 5f21ea3fa4ca3cbd1a027be4b6018caafbc1afec..dc50050043526996c40beaf0556a0b40571614e0 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_VAR_NAME_H__
-#define __UTIL_VAR_NAME_H__
+#ifndef SURICATA_UTIL_VAR_NAME_H
+#define SURICATA_UTIL_VAR_NAME_H
 
 void VarNameStoreInit(void);
 void VarNameStoreDestroy(void);
index ce491ecdcd82d56683dc38fbec8cf5a04978f6fc..c8e7d5af6d0cb72a264a5f93fead1d287a242275 100644 (file)
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __UTIL_VAR_H__
-#define __UTIL_VAR_H__
+#ifndef SURICATA_UTIL_VAR_H
+#define SURICATA_UTIL_VAR_H
 
 enum VarTypes {
     VAR_TYPE_NOT_SET,
@@ -78,5 +78,4 @@ void GenericVarRemove(GenericVar **, GenericVar *);
 int AddVariableToResolveList(ResolvedVariablesList *list, const char *var);
 void CleanVariableResolveList(ResolvedVariablesList *var_list);
 
-#endif /* __UTIL_VAR_H__ */
-
+#endif /* SURICATA_UTIL_VAR_H */
index adecd05e5fa65aa87710e61b9c4913d0c64f4295..4baf46f39d22b82610b4cedbe2ee148ae381a998 100644 (file)
@@ -21,8 +21,8 @@
  * \author Jan Jezek <jjezek@kerio.com>
  */
 
-#ifndef __WIN32_MISC_H__
-#define __WIN32_MISC_H__
+#ifndef SURICATA_WIN32_MISC_H
+#define SURICATA_WIN32_MISC_H
 
 #include <sdkddkver.h>
 
index 6be80171e0244d3518a3a481eeae18a82cfd75d3..24785d75564ab572a78bf5bed18307d06b5919a7 100644 (file)
@@ -21,8 +21,8 @@
  * \author Ondrej Slanina <oslanina@kerio.com>
  */
 
-#ifndef __WIN32_SERVICE_H__
-#define __WIN32_SERVICE_H__
+#ifndef SURICATA_WIN32_SERVICE_H
+#define SURICATA_WIN32_SERVICE_H
 
 #ifdef OS_WIN32
 int SCRunningAsService(void);
index beb164df19eea8342f5f3d3e32b142cbf61fbce8..a61e23fdd70863f9a9649b6e0cd46a8771b367c9 100644 (file)
@@ -23,8 +23,8 @@
  * Isolation for WMI/COM functionality
  */
 
-#ifndef __WIN32_SYSCALL_H__
-#define __WIN32_SYSCALL_H__
+#ifndef SURICATA_WIN32_SYSCALL_H
+#define SURICATA_WIN32_SYSCALL_H
 #ifdef OS_WIN32
 
 #include <inttypes.h>
@@ -50,4 +50,4 @@ int RestoreIfaceOffloadingWin32(LiveDevice *ldev);
 void Win32SyscallRegisterTests(void);
 
 #endif /* OS_WIN32 */
-#endif /* __WIN32_SYSCALL_H__ */
\ No newline at end of file
+#endif /* SURICATA_WIN32_SYSCALL_H */
\ No newline at end of file
index 78aa06671fde2f5702e7e314903638b87202bbd4..058856c1b435a73e3760d861a8919ef67dd3714d 100644 (file)
@@ -33,8 +33,8 @@
  *     @(#)syslog.h    8.1 (Berkeley) 6/2/93
  */
 
-#ifndef __WIN32_SYSLOG_H__
-#define __WIN32_SYSLOG_H__
+#ifndef SURICATA_WIN32_SYSLOG_H
+#define SURICATA_WIN32_SYSLOG_H
 
 #define        LOG_EMERG       0       /* system is unusable */
 #define        LOG_ALERT       1       /* action must be taken immediately */