From 44388f1b69ea6ed813dc1126e327b60817d5d50b Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Sat, 9 Mar 2024 12:12:43 -0600 Subject: [PATCH] src: make include guards more library friendly Include guards for libraries should use a prefix that is meaningful for the library to avoid conflicts with other user code. For Suricata, use SURICATA. Additionally, remove the pattern of leading and trailing underscores as these are reserved for the language implementation per the C and C++ standards. --- src/action-globals.h | 6 +++--- src/alert-debuglog.h | 7 +++---- src/alert-fastlog.h | 7 +++---- src/alert-syslog.h | 7 +++---- src/app-layer-detect-proto.h | 6 +++--- src/app-layer-dnp3-objects.h | 6 +++--- src/app-layer-dnp3.h | 6 +++--- src/app-layer-enip-common.h | 6 +++--- src/app-layer-enip.h | 7 +++---- src/app-layer-events.h | 7 +++---- src/app-layer-expectation.h | 6 +++--- src/app-layer-frames.h | 4 ++-- src/app-layer-ftp.h | 7 +++---- src/app-layer-htp-body.h | 6 +++--- src/app-layer-htp-file.h | 6 +++--- src/app-layer-htp-libhtp.h | 6 +++--- src/app-layer-htp-range.h | 6 +++--- src/app-layer-htp-xff.h | 6 +++--- src/app-layer-htp.h | 6 +++--- src/app-layer-http2.h | 6 +++--- src/app-layer-ike.h | 6 +++--- src/app-layer-krb5.h | 6 +++--- src/app-layer-modbus.h | 6 +++--- src/app-layer-nfs-tcp.h | 6 +++--- src/app-layer-nfs-udp.h | 6 +++--- src/app-layer-ntp.h | 6 +++--- src/app-layer-parser.h | 6 +++--- src/app-layer-protos.h | 6 +++--- src/app-layer-quic.h | 6 +++--- src/app-layer-rdp.h | 6 +++--- src/app-layer-register.h | 6 +++--- src/app-layer-rfb.h | 6 +++--- src/app-layer-sip.h | 6 +++--- src/app-layer-smb.h | 6 +++--- src/app-layer-smtp.h | 6 +++--- src/app-layer-snmp.h | 6 +++--- src/app-layer-ssh.h | 7 +++---- src/app-layer-ssl.h | 6 +++--- src/app-layer-tftp.h | 6 +++--- src/app-layer.h | 4 ++-- src/conf-yaml-loader.h | 6 +++--- src/conf.h | 6 +++--- src/counters.h | 7 +++---- src/datasets-ipv4.h | 6 +++--- src/datasets-ipv6.h | 4 ++-- src/datasets-md5.h | 6 +++--- src/datasets-reputation.h | 6 +++--- src/datasets-sha256.h | 6 +++--- src/datasets-string.h | 6 +++--- src/datasets.h | 6 +++--- src/decode-chdlc.h | 6 +++--- src/decode-erspan.h | 7 +++---- src/decode-esp.h | 6 +++--- src/decode-ethernet.h | 7 +++---- src/decode-events.h | 6 +++--- src/decode-geneve.h | 6 +++--- src/decode-gre.h | 7 +++---- src/decode-icmpv4.h | 6 +++--- src/decode-icmpv6.h | 6 +++--- src/decode-ipv4.h | 6 +++--- src/decode-ipv6.h | 6 +++--- src/decode-mpls.h | 6 +++--- src/decode-nsh.h | 7 +++---- src/decode-ppp.h | 7 +++---- src/decode-pppoe.h | 8 +++----- src/decode-raw.h | 7 +++---- src/decode-sctp.h | 6 +++--- src/decode-sll.h | 7 +++---- src/decode-tcp.h | 6 +++--- src/decode-template.h | 6 +++--- src/decode-teredo.h | 4 ++-- src/decode-udp.h | 6 +++--- src/decode-vlan.h | 7 +++---- src/decode-vntag.h | 6 +++--- src/decode-vxlan.h | 6 +++--- src/decode.h | 6 +++--- src/defrag-hash.h | 7 +++---- src/defrag-queue.h | 7 +++---- src/defrag-timeout.h | 4 ++-- src/defrag.h | 6 +++--- src/detect-app-layer-event.h | 6 +++--- src/detect-app-layer-protocol.h | 6 +++--- src/detect-asn1.h | 6 +++--- src/detect-base64-data.h | 6 +++--- src/detect-base64-decode.h | 6 +++--- src/detect-bsize.h | 6 +++--- src/detect-bypass.h | 6 +++--- src/detect-byte-extract.h | 6 +++--- src/detect-byte.h | 6 +++--- src/detect-bytejump.h | 7 +++---- src/detect-bytemath.h | 6 +++--- src/detect-bytetest.h | 6 +++--- src/detect-classtype.h | 7 +++---- src/detect-config.h | 6 +++--- src/detect-content.h | 6 +++--- src/detect-csum.h | 7 +++---- src/detect-datarep.h | 6 +++--- src/detect-dataset.h | 6 +++--- src/detect-dce-iface.h | 7 +++---- src/detect-dce-opnum.h | 7 +++---- src/detect-dce-stub-data.h | 7 +++---- src/detect-depth.h | 7 +++---- src/detect-detection-filter.h | 7 +++---- src/detect-dhcp-leasetime.h | 6 +++--- src/detect-dhcp-rebinding-time.h | 6 +++--- src/detect-dhcp-renewal-time.h | 6 +++--- src/detect-distance.h | 7 +++---- src/detect-dnp3.h | 6 +++--- src/detect-dns-answer-name.h | 6 +++--- src/detect-dns-opcode.h | 6 +++--- src/detect-dns-query-name.h | 6 +++--- src/detect-dns-query.h | 6 +++--- src/detect-dns-rcode.h | 6 +++--- src/detect-dns-rrtype.h | 6 +++--- src/detect-dsize.h | 7 +++---- src/detect-engine-address-ipv4.h | 7 +++---- src/detect-engine-address-ipv6.h | 7 +++---- src/detect-engine-address.h | 8 +++----- src/detect-engine-alert.h | 6 +++--- src/detect-engine-analyzer.h | 6 +++--- src/detect-engine-build.h | 6 +++--- src/detect-engine-content-inspection.h | 6 +++--- src/detect-engine-dcepayload.h | 6 +++--- src/detect-engine-enip.h | 6 +++--- src/detect-engine-event.h | 8 +++----- src/detect-engine-file.h | 6 +++--- src/detect-engine-iponly.h | 7 +++---- src/detect-engine-loader.h | 6 +++--- src/detect-engine-mpm.h | 8 +++----- src/detect-engine-payload.h | 7 +++---- src/detect-engine-port.h | 7 +++---- src/detect-engine-prefilter-common.h | 6 +++--- src/detect-engine-prefilter.h | 4 ++-- src/detect-engine-proto.h | 7 +++---- src/detect-engine-register.h | 6 +++--- src/detect-engine-siggroup.h | 6 +++--- src/detect-engine-sigorder.h | 6 +++--- src/detect-engine-state.h | 7 +++---- src/detect-engine-tag.h | 8 +++----- src/detect-engine-threshold.h | 6 +++--- src/detect-engine-uint.h | 6 +++--- src/detect-engine.h | 6 +++--- src/detect-fast-pattern.h | 7 +++---- src/detect-file-data.h | 6 +++--- src/detect-file-hash-common.h | 6 +++--- src/detect-filemagic.h | 6 +++--- src/detect-filemd5.h | 6 +++--- src/detect-filename.h | 6 +++--- src/detect-filesha1.h | 6 +++--- src/detect-filesha256.h | 6 +++--- src/detect-filesize.h | 4 ++-- src/detect-filestore.h | 6 +++--- src/detect-flow-age.h | 6 +++--- src/detect-flow-pkts.h | 6 +++--- src/detect-flow.h | 7 +++---- src/detect-flowbits.h | 7 +++---- src/detect-flowint.h | 7 +++---- src/detect-flowvar.h | 6 +++--- src/detect-fragbits.h | 7 +++---- src/detect-fragoffset.h | 6 +++--- src/detect-frame.h | 6 +++--- src/detect-ftpbounce.h | 7 +++---- src/detect-ftpdata.h | 6 +++--- src/detect-geoip.h | 4 ++-- src/detect-gid.h | 7 +++---- src/detect-hostbits.h | 6 +++--- src/detect-http-accept-enc.h | 6 +++--- src/detect-http-accept-lang.h | 6 +++--- src/detect-http-accept.h | 6 +++--- src/detect-http-client-body.h | 6 +++--- src/detect-http-connection.h | 6 +++--- src/detect-http-content-len.h | 6 +++--- src/detect-http-content-type.h | 6 +++--- src/detect-http-header-common.h | 6 +++--- src/detect-http-header-names.h | 6 +++--- src/detect-http-header.h | 6 +++--- src/detect-http-headers.h | 6 +++--- src/detect-http-host.h | 6 +++--- src/detect-http-location.h | 6 +++--- src/detect-http-method.h | 7 +++---- src/detect-http-protocol.h | 6 +++--- src/detect-http-raw-header.h | 6 +++--- src/detect-http-referer.h | 6 +++--- src/detect-http-request-line.h | 6 +++--- src/detect-http-response-line.h | 6 +++--- src/detect-http-server-body.h | 6 +++--- src/detect-http-server.h | 6 +++--- src/detect-http-start.h | 6 +++--- src/detect-http-ua.h | 6 +++--- src/detect-icmp-id.h | 6 +++--- src/detect-icmp-seq.h | 6 +++--- src/detect-icode.h | 6 +++--- src/detect-id.h | 8 +++----- src/detect-ike-chosen-sa.h | 6 +++--- src/detect-ike-exch-type.h | 6 +++--- src/detect-ike-key-exchange-payload-length.h | 6 +++--- src/detect-ike-key-exchange-payload.h | 6 +++--- src/detect-ike-nonce-payload-length.h | 6 +++--- src/detect-ike-nonce-payload.h | 6 +++--- src/detect-ike-spi.h | 6 +++--- src/detect-ike-vendor.h | 6 +++--- src/detect-ipaddr.h | 6 +++--- src/detect-ipopts.h | 8 +++----- src/detect-ipproto.h | 7 +++---- src/detect-iprep.h | 6 +++--- src/detect-isdataat.h | 7 +++---- src/detect-itype.h | 6 +++--- src/detect-krb5-cname.h | 6 +++--- src/detect-krb5-errcode.h | 6 +++--- src/detect-krb5-msgtype.h | 6 +++--- src/detect-krb5-sname.h | 6 +++--- src/detect-krb5-ticket-encryption.h | 6 +++--- src/detect-l3proto.h | 6 +++--- src/detect-lua-extensions.h | 4 ++-- src/detect-lua.h | 6 +++--- src/detect-mark.h | 7 +++---- src/detect-metadata.h | 7 +++---- src/detect-modbus.h | 6 +++--- src/detect-mqtt-connack-sessionpresent.h | 6 +++--- src/detect-mqtt-connect-clientid.h | 6 +++--- src/detect-mqtt-connect-flags.h | 6 +++--- src/detect-mqtt-connect-password.h | 6 +++--- src/detect-mqtt-connect-protocol-string.h | 6 +++--- src/detect-mqtt-connect-username.h | 6 +++--- src/detect-mqtt-connect-willmessage.h | 6 +++--- src/detect-mqtt-connect-willtopic.h | 6 +++--- src/detect-mqtt-flags.h | 6 +++--- src/detect-mqtt-protocol-version.h | 6 +++--- src/detect-mqtt-publish-message.h | 6 +++--- src/detect-mqtt-publish-topic.h | 6 +++--- src/detect-mqtt-qos.h | 6 +++--- src/detect-mqtt-reason-code.h | 6 +++--- src/detect-mqtt-subscribe-topic.h | 6 +++--- src/detect-mqtt-type.h | 6 +++--- src/detect-mqtt-unsubscribe-topic.h | 6 +++--- src/detect-msg.h | 7 +++---- src/detect-nfs-procedure.h | 6 +++--- src/detect-nfs-version.h | 6 +++--- src/detect-noalert.h | 7 +++---- src/detect-nocase.h | 7 +++---- src/detect-offset.h | 7 +++---- src/detect-parse.h | 6 +++--- src/detect-pcre.h | 7 +++---- src/detect-pkt-data.h | 6 +++--- src/detect-pktvar.h | 7 +++---- src/detect-prefilter.h | 6 +++--- src/detect-priority.h | 7 +++---- src/detect-quic-cyu-hash.h | 6 +++--- src/detect-quic-cyu-string.h | 6 +++--- src/detect-quic-sni.h | 6 +++--- src/detect-quic-ua.h | 6 +++--- src/detect-quic-version.h | 6 +++--- src/detect-rawbytes.h | 7 +++---- src/detect-reference.h | 7 +++---- src/detect-replace.h | 4 ++-- src/detect-requires.h | 6 +++--- src/detect-rev.h | 7 +++---- src/detect-rfb-name.h | 6 +++--- src/detect-rfb-secresult.h | 6 +++--- src/detect-rfb-sectype.h | 6 +++--- src/detect-rpc.h | 7 +++---- src/detect-sameip.h | 6 +++--- src/detect-sid.h | 7 +++---- src/detect-sip-method.h | 6 +++--- src/detect-sip-protocol.h | 6 +++--- src/detect-sip-request-line.h | 6 +++--- src/detect-sip-response-line.h | 6 +++--- src/detect-sip-stat-code.h | 6 +++--- src/detect-sip-stat-msg.h | 6 +++--- src/detect-sip-uri.h | 6 +++--- src/detect-smb-ntlmssp.h | 6 +++--- src/detect-smb-share.h | 6 +++--- src/detect-smb-version.h | 6 +++--- src/detect-snmp-community.h | 7 +++---- src/detect-snmp-pdu_type.h | 7 +++---- src/detect-snmp-usm.h | 6 +++--- src/detect-snmp-version.h | 7 +++---- src/detect-ssh-hassh-server-string.h | 6 +++--- src/detect-ssh-hassh-server.h | 7 +++---- src/detect-ssh-hassh-string.h | 6 +++--- src/detect-ssh-hassh.h | 6 +++--- src/detect-ssh-proto-version.h | 7 +++---- src/detect-ssh-proto.h | 6 +++--- src/detect-ssh-software-version.h | 7 +++---- src/detect-ssh-software.h | 6 +++--- src/detect-tag.h | 7 +++---- src/detect-target.h | 6 +++--- src/detect-tcp-ack.h | 6 +++--- src/detect-tcp-flags.h | 7 +++---- src/detect-tcp-seq.h | 6 +++--- src/detect-tcp-window.h | 6 +++--- src/detect-template-rust-buffer.h | 6 +++--- src/detect-template.h | 6 +++--- src/detect-threshold.h | 7 +++---- src/detect-tls-cert-fingerprint.h | 6 +++--- src/detect-tls-cert-issuer.h | 7 +++---- src/detect-tls-cert-serial.h | 6 +++--- src/detect-tls-cert-subject.h | 7 +++---- src/detect-tls-cert-validity.h | 6 +++--- src/detect-tls-certs.h | 6 +++--- src/detect-tls-ja3-hash.h | 6 +++--- src/detect-tls-ja3-string.h | 6 +++--- src/detect-tls-ja3s-hash.h | 6 +++--- src/detect-tls-ja3s-string.h | 6 +++--- src/detect-tls-random.h | 6 +++--- src/detect-tls-sni.h | 6 +++--- src/detect-tls-version.h | 7 +++---- src/detect-tls.h | 6 +++--- src/detect-tos.h | 6 +++--- src/detect-transform-casechange.h | 6 +++--- src/detect-transform-compress-whitespace.h | 6 +++--- src/detect-transform-dotprefix.h | 6 +++--- src/detect-transform-header-lowercase.h | 6 +++--- src/detect-transform-md5.h | 6 +++--- src/detect-transform-pcrexform.h | 6 +++--- src/detect-transform-sha1.h | 6 +++--- src/detect-transform-sha256.h | 6 +++--- src/detect-transform-strip-pseudo-headers.h | 6 +++--- src/detect-transform-strip-whitespace.h | 6 +++--- src/detect-transform-urldecode.h | 6 +++--- src/detect-transform-xor.h | 6 +++--- src/detect-uricontent.h | 6 +++--- src/detect-within.h | 7 +++---- src/detect-xbits.h | 6 +++--- src/detect.h | 8 +++----- src/device-storage.h | 6 +++--- src/feature.h | 6 +++--- src/flow-bit.h | 7 +++---- src/flow-bypass.h | 4 ++-- src/flow-hash.h | 7 +++---- src/flow-manager.h | 6 +++--- src/flow-private.h | 6 +++--- src/flow-queue.h | 7 +++---- src/flow-spare-pool.h | 6 +++--- src/flow-storage.h | 6 +++--- src/flow-timeout.h | 6 +++--- src/flow-util.h | 6 +++--- src/flow-var.h | 7 +++---- src/flow-worker.h | 6 +++--- src/flow.h | 6 +++--- src/host-bit.h | 6 +++--- src/host-queue.h | 7 +++---- src/host-storage.h | 6 +++--- src/host-timeout.h | 4 ++-- src/host.h | 7 +++---- src/ippair-bit.h | 6 +++--- src/ippair-queue.h | 6 +++--- src/ippair-storage.h | 6 +++--- src/ippair-timeout.h | 4 ++-- src/ippair.h | 6 +++--- src/log-cf-common.h | 6 +++--- src/log-httplog.h | 7 +++---- src/log-pcap.h | 6 +++--- src/log-stats.h | 4 ++-- src/log-tcp-data.h | 6 +++--- src/log-tlslog.h | 7 +++---- src/log-tlsstore.h | 6 +++--- src/output-eve-stream.h | 6 +++--- src/output-eve-syslog.h | 6 +++--- src/output-file.h | 6 +++--- src/output-filedata.h | 6 +++--- src/output-filestore.h | 6 +++--- src/output-flow.h | 6 +++--- src/output-json-alert.h | 7 +++---- src/output-json-anomaly.h | 4 ++-- src/output-json-bittorrent-dht.h | 6 +++--- src/output-json-dcerpc.h | 6 +++--- src/output-json-dhcp.h | 6 +++--- src/output-json-dnp3-objects.h | 6 +++--- src/output-json-dnp3.h | 6 +++--- src/output-json-dns.h | 6 +++--- src/output-json-drop.h | 6 +++--- src/output-json-email-common.h | 6 +++--- src/output-json-file.h | 6 +++--- src/output-json-flow.h | 6 +++--- src/output-json-frame.h | 6 +++--- src/output-json-ftp.h | 6 +++--- src/output-json-http.h | 7 +++---- src/output-json-http2.h | 6 +++--- src/output-json-ike.h | 6 +++--- src/output-json-krb5.h | 6 +++--- src/output-json-metadata.h | 6 +++--- src/output-json-modbus.h | 6 +++--- src/output-json-mqtt.h | 6 +++--- src/output-json-netflow.h | 4 ++-- src/output-json-nfs.h | 6 +++--- src/output-json-pgsql.h | 6 +++--- src/output-json-quic.h | 6 +++--- src/output-json-rdp.h | 6 +++--- src/output-json-rfb.h | 6 +++--- src/output-json-sip.h | 6 +++--- src/output-json-smb.h | 6 +++--- src/output-json-smtp.h | 6 +++--- src/output-json-snmp.h | 6 +++--- src/output-json-ssh.h | 6 +++--- src/output-json-stats.h | 6 +++--- src/output-json-template.h | 6 +++--- src/output-json-tftp.h | 6 +++--- src/output-json-tls.h | 6 +++--- src/output-json.h | 6 +++--- src/output-lua.h | 6 +++--- src/output-packet.h | 6 +++--- src/output-stats.h | 6 +++--- src/output-streaming.h | 7 +++---- src/output-tx.h | 6 +++--- src/output.h | 6 +++--- src/packet-queue.h | 7 +++---- src/packet.h | 4 ++-- src/pkt-var.h | 7 +++---- src/reputation.h | 6 +++--- src/respond-reject-libnet11.h | 6 +++--- src/respond-reject.h | 7 +++---- src/runmode-af-packet.h | 6 +++--- src/runmode-af-xdp.h | 6 +++--- src/runmode-dpdk.h | 6 +++--- src/runmode-erf-dag.h | 6 +++--- src/runmode-erf-file.h | 6 +++--- src/runmode-ipfw.h | 6 +++--- src/runmode-napatech.h | 8 +++----- src/runmode-netmap.h | 6 +++--- src/runmode-nflog.h | 6 +++--- src/runmode-nfq.h | 6 +++--- src/runmode-pcap-file.h | 6 +++--- src/runmode-pcap.h | 6 +++--- src/runmode-pfring.h | 6 +++--- src/runmode-unittests.h | 7 +++---- src/runmode-unix-socket.h | 6 +++--- src/runmode-windivert.h | 6 +++--- src/runmodes.h | 6 +++--- src/rust-context.h | 6 +++--- src/rust.h | 6 +++--- src/source-af-packet.h | 6 +++--- src/source-af-xdp.h | 6 +++--- src/source-dpdk.h | 6 +++--- src/source-erf-dag.h | 7 +++---- src/source-erf-file.h | 6 +++--- src/source-ipfw.h | 7 +++---- src/source-napatech.h | 6 +++--- src/source-netmap.h | 6 +++--- src/source-nflog.h | 6 +++--- src/source-nfq-prototypes.h | 7 +++---- src/source-nfq.h | 7 +++---- src/source-pcap-file-directory-helper.h | 6 +++--- src/source-pcap-file-helper.h | 6 +++--- src/source-pcap-file.h | 7 +++---- src/source-pcap.h | 6 +++--- src/source-pfring.h | 6 +++--- src/source-windivert-prototypes.h | 6 +++--- src/source-windivert.h | 6 +++--- src/stream-tcp-cache.h | 6 +++--- src/stream-tcp-inline.h | 7 +++---- src/stream-tcp-list.h | 7 +++---- src/stream-tcp-private.h | 6 +++--- src/stream-tcp-reassemble.h | 7 +++---- src/stream-tcp-sack.h | 6 +++--- src/stream-tcp-util.h | 7 +++---- src/stream-tcp.h | 7 +++---- src/stream.h | 7 +++---- src/suricata-common.h | 6 +++--- src/suricata-plugin.h | 4 ++-- src/suricata.h | 7 +++---- src/threads-debug.h | 4 ++-- src/threads-profile.h | 4 ++-- src/threads.h | 7 +++---- src/threadvars.h | 6 +++--- src/tm-modules.h | 7 +++---- src/tm-queuehandlers.h | 7 +++---- src/tm-queues.h | 7 +++---- src/tm-threads-common.h | 7 +++---- src/tm-threads.h | 6 +++--- src/tmqh-flow.h | 6 +++--- src/tmqh-packetpool.h | 6 +++--- src/tmqh-simple.h | 6 +++--- src/util-action.h | 6 +++--- src/util-affinity.h | 6 +++--- src/util-atomic.h | 8 +++----- src/util-base64.h | 4 ++-- src/util-bloomfilter-counting.h | 7 +++---- src/util-bloomfilter.h | 7 +++---- src/util-bpf.h | 6 +++--- src/util-buffer.h | 6 +++--- src/util-byte.h | 6 +++--- src/util-checksum.h | 4 ++-- src/util-cidr.h | 7 +++---- src/util-classification-config.h | 6 +++--- src/util-clock.h | 6 +++--- src/util-conf.h | 6 +++--- src/util-config.h | 4 ++-- src/util-coredump-config.h | 6 +++--- src/util-cpu.h | 6 +++--- src/util-daemon.h | 6 +++--- src/util-datalink.h | 6 +++--- src/util-debug-filters.h | 6 +++--- src/util-debug.h | 6 +++--- src/util-device.h | 6 +++--- src/util-ebpf.h | 4 ++-- src/util-enum.h | 6 +++--- src/util-error.h | 6 +++--- src/util-exception-policy.h | 4 ++-- src/util-file-decompression.h | 6 +++--- src/util-file-swf-decompression.h | 6 +++--- src/util-file.h | 6 +++--- src/util-fmemopen.h | 6 +++--- src/util-hash-lookup3.h | 7 +++---- src/util-hash-string.h | 6 +++--- src/util-hash.h | 7 +++---- src/util-hashlist.h | 7 +++---- src/util-host-info.h | 6 +++--- src/util-host-os-info.h | 6 +++--- src/util-hyperscan.h | 6 +++--- src/util-ip.h | 6 +++--- src/util-ja3.h | 7 +++---- src/util-landlock.h | 6 +++--- src/util-log-redis.h | 6 +++--- src/util-logopenfile.h | 6 +++--- src/util-lua-common.h | 6 +++--- src/util-lua-dnp3-objects.h | 6 +++--- src/util-lua-dnp3.h | 6 +++--- src/util-lua-dns.h | 4 ++-- src/util-lua-hassh.h | 6 +++--- src/util-lua-http.h | 6 +++--- src/util-lua-ja3.h | 6 +++--- src/util-lua-smtp.h | 6 +++--- src/util-lua-ssh.h | 6 +++--- src/util-lua-tls.h | 6 +++--- src/util-lua.h | 6 +++--- src/util-luajit.h | 6 +++--- src/util-macset.h | 6 +++--- src/util-magic.h | 4 ++-- src/util-mem.h | 7 +++---- src/util-memcmp.h | 7 +++---- src/util-memcpy.h | 6 +++--- src/util-memrchr.h | 6 +++--- src/util-misc.h | 7 +++---- src/util-mpm-ac-ks.h | 6 +++--- src/util-mpm-ac.h | 6 +++--- src/util-mpm-hs.h | 6 +++--- src/util-mpm.h | 6 +++--- src/util-napatech.h | 6 +++--- src/util-optimize.h | 7 +++---- src/util-pages.h | 6 +++--- src/util-path.h | 6 +++--- src/util-pidfile.h | 7 +++---- src/util-plugin.h | 6 +++--- src/util-pool-thread.h | 6 +++--- src/util-pool.h | 6 +++--- src/util-port-interval-tree.h | 6 +++--- src/util-prefilter.h | 6 +++--- src/util-print.h | 9 +++------ src/util-profiling-locks.h | 7 +++---- src/util-profiling.h | 6 +++--- src/util-proto-name.h | 7 +++---- src/util-radix-tree.h | 6 +++--- src/util-random.h | 7 +++---- src/util-reference-config.h | 6 +++--- src/util-rohash.h | 7 +++---- src/util-rule-vars.h | 6 +++--- src/util-runmodes.h | 6 +++--- src/util-running-modes.h | 6 +++--- src/util-signal.h | 6 +++--- src/util-spm-bm.h | 7 +++---- src/util-spm-bs.h | 7 +++---- src/util-spm-bs2bm.h | 7 +++---- src/util-spm-hs.h | 6 +++--- src/util-spm.h | 6 +++--- src/util-storage.h | 4 ++-- src/util-streaming-buffer.h | 7 +++---- src/util-thash.h | 6 +++--- src/util-threshold-config.h | 6 +++--- src/util-time.h | 7 +++---- src/util-unittest-helper.h | 6 +++--- src/util-unittest.h | 6 +++--- src/util-validate.h | 8 +++----- src/util-var-name.h | 4 ++-- src/util-var.h | 7 +++---- src/win32-misc.h | 4 ++-- src/win32-service.h | 4 ++-- src/win32-syscall.h | 6 +++--- src/win32-syslog.h | 4 ++-- 579 files changed, 1705 insertions(+), 1856 deletions(-) diff --git a/src/action-globals.h b/src/action-globals.h index b63086f668..edf3d9fc2f 100644 --- a/src/action-globals.h +++ b/src/action-globals.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/alert-debuglog.h b/src/alert-debuglog.h index f7c411c3ab..b2cd0118bf 100644 --- a/src/alert-debuglog.h +++ b/src/alert-debuglog.h @@ -21,10 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/alert-fastlog.h b/src/alert-fastlog.h index cdac2a49d4..acae191972 100644 --- a/src/alert-fastlog.h +++ b/src/alert-fastlog.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/alert-syslog.h b/src/alert-syslog.h index 0655a3ae47..3557827039 100644 --- a/src/alert-syslog.h +++ b/src/alert-syslog.h @@ -24,10 +24,9 @@ * */ -#ifndef __ALERT_SYSLOG_H__ -#define __ALERT_SYSLOG_H__ +#ifndef SURICATA_ALERT_SYSLOG_H +#define SURICATA_ALERT_SYSLOG_H void AlertSyslogRegister(void); -#endif /* __ALERT_SYSLOG_H__ */ - +#endif /* SURICATA_ALERT_SYSLOG_H */ diff --git a/src/app-layer-detect-proto.h b/src/app-layer-detect-proto.h index 4ee4bac10a..158ad234dd 100644 --- a/src/app-layer-detect-proto.h +++ b/src/app-layer-detect-proto.h @@ -22,8 +22,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/app-layer-dnp3-objects.h b/src/app-layer-dnp3-objects.h index e292f01275..adb4ca6a51 100644 --- a/src/app-layer-dnp3-objects.h +++ b/src/app-layer-dnp3-objects.h @@ -23,8 +23,8 @@ * This file contains the types (definitions) of the DNP3 objects. */ -#ifndef __APP_LAYER_DNP3_OBJECTS_H__ -#define __APP_LAYER_DNP3_OBJECTS_H__ +#ifndef SURICATA_APP_LAYER_DNP3_OBJECTS_H +#define SURICATA_APP_LAYER_DNP3_OBJECTS_H #define DNP3_OBJECT_CODE(group, variation) (group << 8 | variation) @@ -1461,4 +1461,4 @@ int DNP3DecodeObject(int group, int variation, const uint8_t **buf, DNP3PointList *DNP3PointListAlloc(void); void DNP3FreeObjectPointList(int group, int variation, DNP3PointList *); -#endif /* __APP_LAYER_DNP3_OBJECTS_H__ */ +#endif /* SURICATA_APP_LAYER_DNP3_OBJECTS_H */ diff --git a/src/app-layer-dnp3.h b/src/app-layer-dnp3.h index aae07f9c80..fb142305ef 100644 --- a/src/app-layer-dnp3.h +++ b/src/app-layer-dnp3.h @@ -21,8 +21,8 @@ * DNP3 application layer protocol header file */ -#ifndef __APP_LAYER_DNP3_H__ -#define __APP_LAYER_DNP3_H__ +#ifndef SURICATA_APP_LAYER_DNP3_H +#define SURICATA_APP_LAYER_DNP3_H #include "rust.h" #if __BYTE_ORDER == __BIG_ENDIAN @@ -257,4 +257,4 @@ void RegisterDNP3Parsers(void); void DNP3ParserRegisterTests(void); int DNP3PrefixIsSize(uint8_t); -#endif /* __APP_LAYER_DNP3_H__ */ +#endif /* SURICATA_APP_LAYER_DNP3_H */ diff --git a/src/app-layer-enip-common.h b/src/app-layer-enip-common.h index 1578343a69..936bf08224 100644 --- a/src/app-layer-enip-common.h +++ b/src/app-layer-enip-common.h @@ -21,8 +21,8 @@ * \author Kevin Wong */ -#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 */ diff --git a/src/app-layer-enip.h b/src/app-layer-enip.h index 25cb1d5745..8736c02a8a 100644 --- a/src/app-layer-enip.h +++ b/src/app-layer-enip.h @@ -21,12 +21,11 @@ * \author Kevin Wong */ -#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 */ diff --git a/src/app-layer-events.h b/src/app-layer-events.h index 8b0dc8276d..40bda72abf 100644 --- a/src/app-layer-events.h +++ b/src/app-layer-events.h @@ -22,8 +22,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/app-layer-expectation.h b/src/app-layer-expectation.h index 0219e33bcf..2d8b4af916 100644 --- a/src/app-layer-expectation.h +++ b/src/app-layer-expectation.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/app-layer-frames.h b/src/app-layer-frames.h index 65ba5b6a69..1904917b42 100644 --- a/src/app-layer-frames.h +++ b/src/app-layer-frames.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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" diff --git a/src/app-layer-ftp.h b/src/app-layer-ftp.h index fb71d6b52d..353feb3582 100644 --- a/src/app-layer-ftp.h +++ b/src/app-layer-ftp.h @@ -22,8 +22,8 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/app-layer-htp-body.h b/src/app-layer-htp-body.h index fe59ac6210..bcb58938f3 100644 --- a/src/app-layer-htp-body.h +++ b/src/app-layer-htp-body.h @@ -25,12 +25,12 @@ * This file provides a HTTP protocol support for the engine using HTP library. */ -#ifndef __APP_LAYER_HTP_BODY_H__ -#define __APP_LAYER_HTP_BODY_H__ +#ifndef SURICATA_APP_LAYER_HTP_BODY_H +#define SURICATA_APP_LAYER_HTP_BODY_H int HtpBodyAppendChunk(const HTPCfgDir *, HtpBody *, const uint8_t *, uint32_t); void HtpBodyPrint(HtpBody *); void HtpBodyFree(const HTPCfgDir *, HtpBody *); void HtpBodyPrune(HtpState *, HtpBody *, int); -#endif /* __APP_LAYER_HTP_BODY_H__ */ +#endif /* SURICATA_APP_LAYER_HTP_BODY_H */ diff --git a/src/app-layer-htp-file.h b/src/app-layer-htp-file.h index b0436df22f..5e05bcb28b 100644 --- a/src/app-layer-htp-file.h +++ b/src/app-layer-htp-file.h @@ -22,8 +22,8 @@ * */ -#ifndef __APP_LAYER_HTP_FILE_H__ -#define __APP_LAYER_HTP_FILE_H__ +#ifndef SURICATA_APP_LAYER_HTP_FILE_H +#define SURICATA_APP_LAYER_HTP_FILE_H #include "app-layer-htp.h" @@ -41,4 +41,4 @@ int HTPFileClose(HtpState *, HtpTxUserData *tx, const uint8_t *data, uint32_t da void HTPFileParserRegisterTests(void); -#endif /* __APP_LAYER_HTP_FILE_H__ */ +#endif /* SURICATA_APP_LAYER_HTP_FILE_H */ diff --git a/src/app-layer-htp-libhtp.h b/src/app-layer-htp-libhtp.h index b08cda508e..fa9a9ecc3b 100644 --- a/src/app-layer-htp-libhtp.h +++ b/src/app-layer-htp-libhtp.h @@ -43,11 +43,11 @@ * APIs from libhtp 0.5.x. */ -#ifndef __APP_LAYER_HTP_LIBHTP__H__ -#define __APP_LAYER_HTP_LIBHTP__H__ +#ifndef SURICATA_APP_LAYER_HTP_LIBHTP__H +#define SURICATA_APP_LAYER_HTP_LIBHTP__H #include "suricata-common.h" bstr *SCHTPGenerateNormalizedUri(htp_tx_t *tx, htp_uri_t *uri, bool uri_include_all); -#endif /* __APP_LAYER_HTP_LIBHTP__H__ */ +#endif /* SURICATA_APP_LAYER_HTP_LIBHTP__H */ diff --git a/src/app-layer-htp-range.h b/src/app-layer-htp-range.h index 8a668aee6d..9ca2890550 100644 --- a/src/app-layer-htp-range.h +++ b/src/app-layer-htp-range.h @@ -15,8 +15,8 @@ * 02110-1301, USA. */ -#ifndef __APP_LAYER_HTP_RANGE_H__ -#define __APP_LAYER_HTP_RANGE_H__ +#ifndef SURICATA_APP_LAYER_HTP_RANGE_H +#define SURICATA_APP_LAYER_HTP_RANGE_H #include "suricata-common.h" @@ -111,4 +111,4 @@ HttpRangeContainerBlock *HttpRangeContainerOpenFile(const unsigned char *key, ui void HttpRangeFreeBlock(HttpRangeContainerBlock *b); -#endif /* __APP_LAYER_HTP_RANGE_H__ */ +#endif /* SURICATA_APP_LAYER_HTP_RANGE_H */ diff --git a/src/app-layer-htp-xff.h b/src/app-layer-htp-xff.h index 03671d3fbb..2d14f3f55b 100644 --- a/src/app-layer-htp-xff.h +++ b/src/app-layer-htp-xff.h @@ -22,8 +22,8 @@ * \author Duarte Silva */ -#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 */ diff --git a/src/app-layer-htp.h b/src/app-layer-htp.h index 5972bdaf50..a61121db59 100644 --- a/src/app-layer-htp.h +++ b/src/app-layer-htp.h @@ -30,8 +30,8 @@ * This file provides a HTTP protocol support for the engine using HTP library. */ -#ifndef __APP_LAYER_HTP_H__ -#define __APP_LAYER_HTP_H__ +#ifndef SURICATA_APP_LAYER_HTP_H +#define SURICATA_APP_LAYER_HTP_H #include "rust.h" #include "app-layer-frames.h" @@ -297,7 +297,7 @@ void HtpConfigRestoreBackup(void); void *HtpGetTxForH2(void *); -#endif /* __APP_LAYER_HTP_H__ */ +#endif /* SURICATA_APP_LAYER_HTP_H */ /** * @} diff --git a/src/app-layer-http2.h b/src/app-layer-http2.h index b3c52c1d70..b2d4d0ef77 100644 --- a/src/app-layer-http2.h +++ b/src/app-layer-http2.h @@ -21,11 +21,11 @@ * \author Philippe Antoine */ -#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 */ diff --git a/src/app-layer-ike.h b/src/app-layer-ike.h index c6270cccc5..a4c97e9fa6 100644 --- a/src/app-layer-ike.h +++ b/src/app-layer-ike.h @@ -22,8 +22,8 @@ * \author Frank Honza */ -#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 */ diff --git a/src/app-layer-krb5.h b/src/app-layer-krb5.h index 19968fc50b..ec8d5a5406 100644 --- a/src/app-layer-krb5.h +++ b/src/app-layer-krb5.h @@ -21,8 +21,8 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/app-layer-modbus.h b/src/app-layer-modbus.h index 04a12bcee9..8a399e12e0 100644 --- a/src/app-layer-modbus.h +++ b/src/app-layer-modbus.h @@ -31,9 +31,9 @@ * \author David DIALLO */ -#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 */ diff --git a/src/app-layer-nfs-tcp.h b/src/app-layer-nfs-tcp.h index d1c72d72ff..ea1b4fac22 100644 --- a/src/app-layer-nfs-tcp.h +++ b/src/app-layer-nfs-tcp.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/app-layer-nfs-udp.h b/src/app-layer-nfs-udp.h index 4cb11dd126..f70873689a 100644 --- a/src/app-layer-nfs-udp.h +++ b/src/app-layer-nfs-udp.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/app-layer-ntp.h b/src/app-layer-ntp.h index 2160639550..08797d413a 100644 --- a/src/app-layer-ntp.h +++ b/src/app-layer-ntp.h @@ -21,8 +21,8 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/app-layer-parser.h b/src/app-layer-parser.h index e9f8cf55e9..7fd034195a 100644 --- a/src/app-layer-parser.h +++ b/src/app-layer-parser.h @@ -22,8 +22,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/app-layer-protos.h b/src/app-layer-protos.h index e2efbec4d4..dc17ddca1e 100644 --- a/src/app-layer-protos.h +++ b/src/app-layer-protos.h @@ -22,8 +22,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/app-layer-quic.h b/src/app-layer-quic.h index d8a833d108..79551ae6a9 100644 --- a/src/app-layer-quic.h +++ b/src/app-layer-quic.h @@ -20,9 +20,9 @@ * */ -#ifndef __APP_LAYER_QUIC_H__ -#define __APP_LAYER_QUIC_H__ +#ifndef SURICATA_APP_LAYER_QUIC_H +#define SURICATA_APP_LAYER_QUIC_H void RegisterQuicParsers(void); -#endif /* __APP_LAYER_QUIC_H__ */ +#endif /* SURICATA_APP_LAYER_QUIC_H */ diff --git a/src/app-layer-rdp.h b/src/app-layer-rdp.h index 8ede7cfdbb..4b804f7ee0 100644 --- a/src/app-layer-rdp.h +++ b/src/app-layer-rdp.h @@ -21,9 +21,9 @@ * \author Zach Kelly */ -#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 */ diff --git a/src/app-layer-register.h b/src/app-layer-register.h index 4fcbe6cf8b..b3aa65ac38 100644 --- a/src/app-layer-register.h +++ b/src/app-layer-register.h @@ -21,8 +21,8 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/app-layer-rfb.h b/src/app-layer-rfb.h index 79c2f49b81..0a19ad4199 100644 --- a/src/app-layer-rfb.h +++ b/src/app-layer-rfb.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/app-layer-sip.h b/src/app-layer-sip.h index 19ee002236..af4f4e1f6c 100644 --- a/src/app-layer-sip.h +++ b/src/app-layer-sip.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/app-layer-smb.h b/src/app-layer-smb.h index 39ae041154..f8b1d66b86 100644 --- a/src/app-layer-smb.h +++ b/src/app-layer-smb.h @@ -21,9 +21,9 @@ * SMB protocol handling */ -#ifndef __APP_LAYER_SMB_H__ -#define __APP_LAYER_SMB_H__ +#ifndef SURICATA_APP_LAYER_SMB_H +#define SURICATA_APP_LAYER_SMB_H void RegisterSMBParsers(void); -#endif /* !__APP_LAYER_SMB_H__ */ +#endif /* !SURICATA_APP_LAYER_SMB_H */ diff --git a/src/app-layer-smtp.h b/src/app-layer-smtp.h index 33b81d026a..37369af034 100644 --- a/src/app-layer-smtp.h +++ b/src/app-layer-smtp.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/app-layer-snmp.h b/src/app-layer-snmp.h index 7c2d09680c..637e94f370 100644 --- a/src/app-layer-snmp.h +++ b/src/app-layer-snmp.h @@ -21,8 +21,8 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/app-layer-ssh.h b/src/app-layer-ssh.h index 996cc260c7..e356c7ef9e 100644 --- a/src/app-layer-ssh.h +++ b/src/app-layer-ssh.h @@ -22,13 +22,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/app-layer-ssl.h b/src/app-layer-ssl.h index f2e4262230..82e33f5411 100644 --- a/src/app-layer-ssl.h +++ b/src/app-layer-ssl.h @@ -23,8 +23,8 @@ * */ -#ifndef __APP_LAYER_SSL_H__ -#define __APP_LAYER_SSL_H__ +#ifndef SURICATA_APP_LAYER_SSL_H +#define SURICATA_APP_LAYER_SSL_H #include "util-ja3.h" #include "rust.h" @@ -308,4 +308,4 @@ void SSLVersionToString(uint16_t, char *); void SSLEnableJA3(void); bool SSLJA3IsEnabled(void); -#endif /* __APP_LAYER_SSL_H__ */ +#endif /* SURICATA_APP_LAYER_SSL_H */ diff --git a/src/app-layer-tftp.h b/src/app-layer-tftp.h index 65dd8f4c9b..b45e6d9219 100644 --- a/src/app-layer-tftp.h +++ b/src/app-layer-tftp.h @@ -21,8 +21,8 @@ * \author Clément Galland */ -#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 */ diff --git a/src/app-layer.h b/src/app-layer.h index cbe2fbc9af..2a6b4df146 100644 --- a/src/app-layer.h +++ b/src/app-layer.h @@ -24,8 +24,8 @@ * Application layer handling and protocols implementation */ -#ifndef __APP_LAYER_H__ -#define __APP_LAYER_H__ +#ifndef SURICATA_APP_LAYER_H +#define SURICATA_APP_LAYER_H #include "threadvars.h" #include "decode.h" diff --git a/src/conf-yaml-loader.h b/src/conf-yaml-loader.h index fcf73aaa8d..0355ebc5c9 100644 --- a/src/conf-yaml-loader.h +++ b/src/conf-yaml-loader.h @@ -21,8 +21,8 @@ * \author Endace Technology Limited - Jason Ish */ -#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 */ diff --git a/src/conf.h b/src/conf.h index 0b278a0f60..c1dbd5318a 100644 --- a/src/conf.h +++ b/src/conf.h @@ -21,8 +21,8 @@ * \author Endace Technology Limited - Jason Ish */ -#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 */ diff --git a/src/counters.h b/src/counters.h index b3ffddbd56..e16186daa4 100644 --- a/src/counters.h +++ b/src/counters.h @@ -22,8 +22,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/datasets-ipv4.h b/src/datasets-ipv4.h index 277acc6b88..db7abd6851 100644 --- a/src/datasets-ipv4.h +++ b/src/datasets-ipv4.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/datasets-ipv6.h b/src/datasets-ipv6.h index a4cabcaf78..f3f59a0a96 100644 --- a/src/datasets-ipv6.h +++ b/src/datasets-ipv6.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#ifndef __DATASETS_IPV6_H__ -#define __DATASETS_IPV6_H__ +#ifndef SURICATA_DATASETS_IPV6_H +#define SURICATA_DATASETS_IPV6_H #include "datasets-reputation.h" diff --git a/src/datasets-md5.h b/src/datasets-md5.h index ad4d0e28a3..e6030540df 100644 --- a/src/datasets-md5.h +++ b/src/datasets-md5.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/datasets-reputation.h b/src/datasets-reputation.h index 48c8820b90..3483d823cd 100644 --- a/src/datasets-reputation.h +++ b/src/datasets-reputation.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/datasets-sha256.h b/src/datasets-sha256.h index 8793cc17a5..716fa93dcf 100644 --- a/src/datasets-sha256.h +++ b/src/datasets-sha256.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/datasets-string.h b/src/datasets-string.h index b1513e3584..b9c3c30024 100644 --- a/src/datasets-string.h +++ b/src/datasets-string.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/datasets.h b/src/datasets.h index af4fc173f1..78602548ca 100644 --- a/src/datasets.h +++ b/src/datasets.h @@ -15,8 +15,8 @@ * 02110-1301, USA. */ -#ifndef __DATASETS_H__ -#define __DATASETS_H__ +#ifndef SURICATA_DATASETS_H +#define SURICATA_DATASETS_H #include "util-thash.h" #include "datasets-reputation.h" @@ -64,4 +64,4 @@ int DatasetAddSerialized(Dataset *set, const char *string); int DatasetRemoveSerialized(Dataset *set, const char *string); int DatasetLookupSerialized(Dataset *set, const char *string); -#endif /* __DATASETS_H__ */ +#endif /* SURICATA_DATASETS_H */ diff --git a/src/decode-chdlc.h b/src/decode-chdlc.h index 47e0d7c1a3..6ec32814ea 100644 --- a/src/decode-chdlc.h +++ b/src/decode-chdlc.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/decode-erspan.h b/src/decode-erspan.h index d92965db02..350eb5ef30 100644 --- a/src/decode-erspan.h +++ b/src/decode-erspan.h @@ -22,9 +22,8 @@ * */ -#ifndef __DECODE_ERSPAN_H__ -#define __DECODE_ERSPAN_H__ - +#ifndef SURICATA_DECODE_ERSPAN_H +#define SURICATA_DECODE_ERSPAN_H typedef struct ErspanHdr_ { uint16_t ver_vlan; @@ -33,4 +32,4 @@ typedef struct ErspanHdr_ { } __attribute__((__packed__)) ErspanHdr; void DecodeERSPANConfig(void); -#endif /* __DECODE_ERSPAN_H__ */ +#endif /* SURICATA_DECODE_ERSPAN_H */ diff --git a/src/decode-esp.h b/src/decode-esp.h index 432de276d7..2ac1ab0645 100644 --- a/src/decode-esp.h +++ b/src/decode-esp.h @@ -19,8 +19,8 @@ * \file */ -#ifndef __DECODE_ESP_H__ -#define __DECODE_ESP_H__ +#ifndef SURICATA_DECODE_ESP_H +#define SURICATA_DECODE_ESP_H /** \brief size of the ESP header */ #define ESP_HEADER_LEN 8 @@ -48,4 +48,4 @@ typedef struct ESPHdr_ { void DecodeESPRegisterTests(void); -#endif /* __DECODE_ESP_H__ */ +#endif /* SURICATA_DECODE_ESP_H */ diff --git a/src/decode-ethernet.h b/src/decode-ethernet.h index aa077056d6..05e6425eef 100644 --- a/src/decode-ethernet.h +++ b/src/decode-ethernet.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/decode-events.h b/src/decode-events.h index 5547866fa5..27a2299cd6 100644 --- a/src/decode-events.h +++ b/src/decode-events.h @@ -22,8 +22,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/decode-geneve.h b/src/decode-geneve.h index 3c1cb23d59..9ca487cd7b 100644 --- a/src/decode-geneve.h +++ b/src/decode-geneve.h @@ -23,11 +23,11 @@ * Geneve decoder. */ -#ifndef __DECODE_GENEVE_H__ -#define __DECODE_GENEVE_H__ +#ifndef SURICATA_DECODE_GENEVE_H +#define SURICATA_DECODE_GENEVE_H void DecodeGeneveRegisterTests(void); void DecodeGeneveConfig(void); bool DecodeGeneveEnabledForPort(const uint16_t sp, const uint16_t dp); -#endif /* !__DECODE_GENEVE_H__ */ +#endif /* !SURICATA_DECODE_GENEVE_H */ diff --git a/src/decode-gre.h b/src/decode-gre.h index adf576fbd9..2e05ae4e46 100644 --- a/src/decode-gre.h +++ b/src/decode-gre.h @@ -23,8 +23,8 @@ * Generic Route Encapsulation (GRE) from RFC 1701. */ -#ifndef __DECODE_GRE_H__ -#define __DECODE_GRE_H__ +#ifndef SURICATA_DECODE_GRE_H +#define SURICATA_DECODE_GRE_H #ifndef IPPROTO_GRE #define IPPROTO_GRE 47 @@ -84,5 +84,4 @@ typedef struct GRESreHdr_ void DecodeGRERegisterTests(void); -#endif /* __DECODE_GRE_H__ */ - +#endif /* SURICATA_DECODE_GRE_H */ diff --git a/src/decode-icmpv4.h b/src/decode-icmpv4.h index f3a94ad2e5..87bcd9bd75 100644 --- a/src/decode-icmpv4.h +++ b/src/decode-icmpv4.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/decode-icmpv6.h b/src/decode-icmpv6.h index aa66c1f64a..412d9c5fa3 100644 --- a/src/decode-icmpv6.h +++ b/src/decode-icmpv6.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/decode-ipv4.h b/src/decode-ipv4.h index d247fa9f00..de32ed8277 100644 --- a/src/decode-ipv4.h +++ b/src/decode-ipv4.h @@ -22,8 +22,8 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/decode-ipv6.h b/src/decode-ipv6.h index 651939ae56..a2b833c4cc 100644 --- a/src/decode-ipv6.h +++ b/src/decode-ipv6.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/decode-mpls.h b/src/decode-mpls.h index c701d3df21..578b4ac53f 100644 --- a/src/decode-mpls.h +++ b/src/decode-mpls.h @@ -23,12 +23,12 @@ * MPLS decoder. */ -#ifndef __DECODE_MPLS_H__ -#define __DECODE_MPLS_H__ +#ifndef SURICATA_DECODE_MPLS_H +#define SURICATA_DECODE_MPLS_H #define ETHERNET_TYPE_MPLS_UNICAST 0x8847 #define ETHERNET_TYPE_MPLS_MULTICAST 0x8848 void DecodeMPLSRegisterTests(void); -#endif /* !__DECODE_MPLS_H__ */ +#endif /* !SURICATA_DECODE_MPLS_H */ diff --git a/src/decode-nsh.h b/src/decode-nsh.h index a45cce3029..54ab257ad3 100644 --- a/src/decode-nsh.h +++ b/src/decode-nsh.h @@ -22,9 +22,8 @@ * */ -#ifndef __DECODE_NSH_H__ -#define __DECODE_NSH_H__ - +#ifndef SURICATA_DECODE_NSH_H +#define SURICATA_DECODE_NSH_H #define NSH_NEXT_PROTO_UNASSIGNED 0x0 #define NSH_NEXT_PROTO_IPV4 0x1 @@ -47,4 +46,4 @@ typedef struct NshHdr_ { void DecodeNSHRegisterTests(void); -#endif /* __DECODE_NSH_H__ */ +#endif /* SURICATA_DECODE_NSH_H */ diff --git a/src/decode-ppp.h b/src/decode-ppp.h index f8914cf2e7..ee5258c694 100644 --- a/src/decode-ppp.h +++ b/src/decode-ppp.h @@ -21,8 +21,8 @@ * \author Breno Silva Pinto */ -#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 */ diff --git a/src/decode-pppoe.h b/src/decode-pppoe.h index 836d4a30c3..6a0a770432 100644 --- a/src/decode-pppoe.h +++ b/src/decode-pppoe.h @@ -21,9 +21,8 @@ * \author James Riden */ -#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 */ diff --git a/src/decode-raw.h b/src/decode-raw.h index ff637870ad..1f86cfc62b 100644 --- a/src/decode-raw.h +++ b/src/decode-raw.h @@ -21,8 +21,7 @@ * \author William Metcalf */ -#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 */ diff --git a/src/decode-sctp.h b/src/decode-sctp.h index 53aa007dbb..6ec20cca33 100644 --- a/src/decode-sctp.h +++ b/src/decode-sctp.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/decode-sll.h b/src/decode-sll.h index babdd7ac21..cbc41f9dd1 100644 --- a/src/decode-sll.h +++ b/src/decode-sll.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/decode-tcp.h b/src/decode-tcp.h index 4b26df5c26..8c3e337a7e 100644 --- a/src/decode-tcp.h +++ b/src/decode-tcp.h @@ -22,8 +22,8 @@ * \todo RAW* macro's should be returning the raw value, not the host order */ -#ifndef __DECODE_TCP_H__ -#define __DECODE_TCP_H__ +#ifndef SURICATA_DECODE_TCP_H +#define SURICATA_DECODE_TCP_H #define TCP_HEADER_LEN 20 #define TCP_OPTLENMAX 40 @@ -308,4 +308,4 @@ static inline uint16_t TCPV6Checksum( return (uint16_t)~csum; } -#endif /* __DECODE_TCP_H__ */ +#endif /* SURICATA_DECODE_TCP_H */ diff --git a/src/decode-template.h b/src/decode-template.h index f02187faf1..b0a7823c5d 100644 --- a/src/decode-template.h +++ b/src/decode-template.h @@ -22,8 +22,8 @@ * */ -#ifndef __DECODE_TEMPLATE_H__ -#define __DECODE_TEMPLATE_H__ +#ifndef SURICATA_DECODE_TEMPLATE_H +#define SURICATA_DECODE_TEMPLATE_H /* Header layout. Keep things like alignment and endianness in * mind while constructing this. */ @@ -34,4 +34,4 @@ typedef struct TemplateHdr_ { uint16_t pad1; } __attribute__((__packed__)) TemplateHdr; -#endif /* __DECODE_TEMPLATE_H__ */ +#endif /* SURICATA_DECODE_TEMPLATE_H */ diff --git a/src/decode-teredo.h b/src/decode-teredo.h index bbd9dc8163..eb97c265f5 100644 --- a/src/decode-teredo.h +++ b/src/decode-teredo.h @@ -15,8 +15,8 @@ * 02110-1301, USA. */ -#ifndef __DECODE_TEREDO_H__ -#define __DECODE_TEREDO_H__ +#ifndef SURICATA_DECODE_TEREDO_H +#define SURICATA_DECODE_TEREDO_H int DecodeTeredo(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *pkt, uint16_t len); diff --git a/src/decode-udp.h b/src/decode-udp.h index 6f695bd177..c34812de7a 100644 --- a/src/decode-udp.h +++ b/src/decode-udp.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/decode-vlan.h b/src/decode-vlan.h index 809038dbe6..586e210ae9 100644 --- a/src/decode-vlan.h +++ b/src/decode-vlan.h @@ -21,8 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/decode-vntag.h b/src/decode-vntag.h index 02392589b1..77a628090f 100644 --- a/src/decode-vntag.h +++ b/src/decode-vntag.h @@ -21,8 +21,8 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/decode-vxlan.h b/src/decode-vxlan.h index 988b35125a..f80ebd001a 100644 --- a/src/decode-vxlan.h +++ b/src/decode-vxlan.h @@ -23,11 +23,11 @@ * VXLAN decoder. */ -#ifndef __DECODE_VXLAN_H__ -#define __DECODE_VXLAN_H__ +#ifndef SURICATA_DECODE_VXLAN_H +#define SURICATA_DECODE_VXLAN_H void DecodeVXLANRegisterTests(void); void DecodeVXLANConfig(void); bool DecodeVXLANEnabledForPort(const uint16_t sp, const uint16_t dp); -#endif /* !__DECODE_VXLAN_H__ */ +#endif /* !SURICATA_DECODE_VXLAN_H */ diff --git a/src/decode.h b/src/decode.h index 6392f3361e..22a512b935 100644 --- a/src/decode.h +++ b/src/decode.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/defrag-hash.h b/src/defrag-hash.h index b115b13a91..0cbbef1840 100644 --- a/src/defrag-hash.h +++ b/src/defrag-hash.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/defrag-queue.h b/src/defrag-queue.h index 63a58d0786..2148063566 100644 --- a/src/defrag-queue.h +++ b/src/defrag-queue.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/defrag-timeout.h b/src/defrag-timeout.h index baece4516e..6a24fc0f42 100644 --- a/src/defrag-timeout.h +++ b/src/defrag-timeout.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#ifndef __DEFRAG_TIMEOUT_H__ -#define __DEFRAG_TIMEOUT_H__ +#ifndef SURICATA_DEFRAG_TIMEOUT_H +#define SURICATA_DEFRAG_TIMEOUT_H uint32_t DefragTimeoutHash(SCTime_t ts); diff --git a/src/defrag.h b/src/defrag.h index 11e6a619b2..e9a15923ae 100644 --- a/src/defrag.h +++ b/src/defrag.h @@ -21,8 +21,8 @@ * \author Endace Technology Limited, Jason Ish */ -#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 */ diff --git a/src/detect-app-layer-event.h b/src/detect-app-layer-event.h index 4400545aa0..8b5a16e6da 100644 --- a/src/detect-app-layer-event.h +++ b/src/detect-app-layer-event.h @@ -21,9 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-app-layer-protocol.h b/src/detect-app-layer-protocol.h index 864bd671b2..02f13968a0 100644 --- a/src/detect-app-layer-protocol.h +++ b/src/detect-app-layer-protocol.h @@ -21,9 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-asn1.h b/src/detect-asn1.h index 8c81ddcb30..7c4812c98b 100644 --- a/src/detect-asn1.h +++ b/src/detect-asn1.h @@ -20,8 +20,8 @@ * * Implements "asn1" keyword */ -#ifndef __DETECT_ASN1_H__ -#define __DETECT_ASN1_H__ +#ifndef SURICATA_DETECT_ASN1_H +#define SURICATA_DETECT_ASN1_H /* prototypes */ void DetectAsn1Register (void); @@ -29,4 +29,4 @@ void DetectAsn1Register (void); bool DetectAsn1Match(const SigMatchData *smd, const uint8_t *buffer, const uint32_t buffer_len, const uint32_t offset); -#endif /* __DETECT_ASN1_H__ */ +#endif /* SURICATA_DETECT_ASN1_H */ diff --git a/src/detect-base64-data.h b/src/detect-base64-data.h index 4b7d54d04e..b1987fae7c 100644 --- a/src/detect-base64-data.h +++ b/src/detect-base64-data.h @@ -15,9 +15,9 @@ * 02110-1301, USA. */ -#ifndef __DETECT_BASE64_DATA_H__ -#define __DETECT_BASE64_DATA_H__ +#ifndef SURICATA_DETECT_BASE64_DATA_H +#define SURICATA_DETECT_BASE64_DATA_H void DetectBase64DataRegister(void); -#endif /* __DETECT_BASE64_DATA_H__ */ +#endif /* SURICATA_DETECT_BASE64_DATA_H */ diff --git a/src/detect-base64-decode.h b/src/detect-base64-decode.h index 58f4e52688..04543da41c 100644 --- a/src/detect-base64-decode.h +++ b/src/detect-base64-decode.h @@ -15,11 +15,11 @@ * 02110-1301, USA. */ -#ifndef __DETECT_BASE64_DECODE_H__ -#define __DETECT_BASE64_DECODE_H__ +#ifndef SURICATA_DETECT_BASE64_DECODE_H +#define SURICATA_DETECT_BASE64_DECODE_H void DetectBase64DecodeRegister(void); int DetectBase64DecodeDoMatch(DetectEngineThreadCtx *, const Signature *, const SigMatchData *, const uint8_t *, uint32_t); -#endif /* __DETECT_BASE64_DECODE_H__ */ +#endif /* SURICATA_DETECT_BASE64_DECODE_H */ diff --git a/src/detect-bsize.h b/src/detect-bsize.h index ac0b72e589..9231102d41 100644 --- a/src/detect-bsize.h +++ b/src/detect-bsize.h @@ -21,11 +21,11 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-bypass.h b/src/detect-bypass.h index 7afc4c9a32..6a4371f28c 100644 --- a/src/detect-bypass.h +++ b/src/detect-bypass.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-byte-extract.h b/src/detect-byte-extract.h index 71b433d340..fc04131d63 100644 --- a/src/detect-byte-extract.h +++ b/src/detect-byte-extract.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-byte.h b/src/detect-byte.h index 373a57d7e5..b6b1de03a0 100644 --- a/src/detect-byte.h +++ b/src/detect-byte.h @@ -21,12 +21,12 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/detect-bytejump.h b/src/detect-bytejump.h index 15f6103443..85914c2a81 100644 --- a/src/detect-bytejump.h +++ b/src/detect-bytejump.h @@ -21,8 +21,8 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/detect-bytemath.h b/src/detect-bytemath.h index c18a3e82dc..347c0e4672 100644 --- a/src/detect-bytemath.h +++ b/src/detect-bytemath.h @@ -21,8 +21,8 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/detect-bytetest.h b/src/detect-bytetest.h index 4b4684972b..320a621a3e 100644 --- a/src/detect-bytetest.h +++ b/src/detect-bytetest.h @@ -21,8 +21,8 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/detect-classtype.h b/src/detect-classtype.h index 6e0dd509cf..383512c8b3 100644 --- a/src/detect-classtype.h +++ b/src/detect-classtype.h @@ -21,11 +21,10 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-config.h b/src/detect-config.h index d6948a3f4e..735d1e09a5 100644 --- a/src/detect-config.h +++ b/src/detect-config.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-content.h b/src/detect-content.h index bc47562a96..0968e4d6ea 100644 --- a/src/detect-content.h +++ b/src/detect-content.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-csum.h b/src/detect-csum.h index 64914912fe..fd4d2859e5 100644 --- a/src/detect-csum.h +++ b/src/detect-csum.h @@ -21,10 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-datarep.h b/src/detect-datarep.h index b619158824..cb2248574f 100644 --- a/src/detect-datarep.h +++ b/src/detect-datarep.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-dataset.h b/src/detect-dataset.h index ca83267d15..4dae4a4a17 100644 --- a/src/detect-dataset.h +++ b/src/detect-dataset.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-dce-iface.h b/src/detect-dce-iface.h index edaded4044..161988f929 100644 --- a/src/detect-dce-iface.h +++ b/src/detect-dce-iface.h @@ -15,10 +15,9 @@ * 02110-1301, USA. */ -#ifndef __DETECT_DCE_IFACE_H__ -#define __DETECT_DCE_IFACE_H__ - +#ifndef SURICATA_DETECT_DCE_IFACE_H +#define SURICATA_DETECT_DCE_IFACE_H void DetectDceIfaceRegister(void); -#endif /* __DETECT_DCE_IFACE_H__ */ +#endif /* SURICATA_DETECT_DCE_IFACE_H */ diff --git a/src/detect-dce-opnum.h b/src/detect-dce-opnum.h index 1072a60bba..6ce4e4b6de 100644 --- a/src/detect-dce-opnum.h +++ b/src/detect-dce-opnum.h @@ -21,10 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-dce-stub-data.h b/src/detect-dce-stub-data.h index 035fa258a5..2668f69948 100644 --- a/src/detect-dce-stub-data.h +++ b/src/detect-dce-stub-data.h @@ -21,10 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-depth.h b/src/detect-depth.h index b864f62175..cafde44cc0 100644 --- a/src/detect-depth.h +++ b/src/detect-depth.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-detection-filter.h b/src/detect-detection-filter.h index f136d3aca5..27e6d777a3 100644 --- a/src/detect-detection-filter.h +++ b/src/detect-detection-filter.h @@ -21,8 +21,8 @@ * \author Gerardo Iglesias */ -#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 */ diff --git a/src/detect-dhcp-leasetime.h b/src/detect-dhcp-leasetime.h index 6a9baeb5fa..53b1f42ac7 100644 --- a/src/detect-dhcp-leasetime.h +++ b/src/detect-dhcp-leasetime.h @@ -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 */ diff --git a/src/detect-dhcp-rebinding-time.h b/src/detect-dhcp-rebinding-time.h index 169efad70b..b14f0af661 100644 --- a/src/detect-dhcp-rebinding-time.h +++ b/src/detect-dhcp-rebinding-time.h @@ -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 */ diff --git a/src/detect-dhcp-renewal-time.h b/src/detect-dhcp-renewal-time.h index 55c27519f4..06d64c5560 100644 --- a/src/detect-dhcp-renewal-time.h +++ b/src/detect-dhcp-renewal-time.h @@ -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 */ diff --git a/src/detect-distance.h b/src/detect-distance.h index 80aebe4f71..7becab8e38 100644 --- a/src/detect-distance.h +++ b/src/detect-distance.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-dnp3.h b/src/detect-dnp3.h index 7479d7841a..050158c182 100644 --- a/src/detect-dnp3.h +++ b/src/detect-dnp3.h @@ -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 */ diff --git a/src/detect-dns-answer-name.h b/src/detect-dns-answer-name.h index 4f84b4894c..e259f1a577 100644 --- a/src/detect-dns-answer-name.h +++ b/src/detect-dns-answer-name.h @@ -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 */ diff --git a/src/detect-dns-opcode.h b/src/detect-dns-opcode.h index 0518a58b49..a26a39e711 100644 --- a/src/detect-dns-opcode.h +++ b/src/detect-dns-opcode.h @@ -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 */ diff --git a/src/detect-dns-query-name.h b/src/detect-dns-query-name.h index b1d7db99e8..3f5bc03bf7 100644 --- a/src/detect-dns-query-name.h +++ b/src/detect-dns-query-name.h @@ -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 */ diff --git a/src/detect-dns-query.h b/src/detect-dns-query.h index c894b878db..33270432c2 100644 --- a/src/detect-dns-query.h +++ b/src/detect-dns-query.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-dns-rcode.h b/src/detect-dns-rcode.h index 9501ceb457..cd4188eb36 100644 --- a/src/detect-dns-rcode.h +++ b/src/detect-dns-rcode.h @@ -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 diff --git a/src/detect-dns-rrtype.h b/src/detect-dns-rrtype.h index 962364f7e2..e2913b4a1c 100644 --- a/src/detect-dns-rrtype.h +++ b/src/detect-dns-rrtype.h @@ -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 */ diff --git a/src/detect-dsize.h b/src/detect-dsize.h index c262a31186..0d4b8beb3f 100644 --- a/src/detect-dsize.h +++ b/src/detect-dsize.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-address-ipv4.h b/src/detect-engine-address-ipv4.h index 5f2780a3c0..5abce56072 100644 --- a/src/detect-engine-address-ipv4.h +++ b/src/detect-engine-address-ipv4.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-address-ipv6.h b/src/detect-engine-address-ipv6.h index b8c573d0ce..96727ee276 100644 --- a/src/detect-engine-address-ipv6.h +++ b/src/detect-engine-address-ipv6.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-address.h b/src/detect-engine-address.h index 3c8221e630..bbeb4bcac2 100644 --- a/src/detect-engine-address.h +++ b/src/detect-engine-address.h @@ -21,10 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-alert.h b/src/detect-engine-alert.h index 984f0c3228..9fcd33996c 100644 --- a/src/detect-engine-alert.h +++ b/src/detect-engine-alert.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-analyzer.h b/src/detect-engine-analyzer.h index 7ad67c6080..dda71f3384 100644 --- a/src/detect-engine-analyzer.h +++ b/src/detect-engine-analyzer.h @@ -21,8 +21,8 @@ * \author Eileen Donlon */ -#ifndef __DETECT_ENGINE_ANALYZER_H__ -#define __DETECT_ENGINE_ANALYZER_H__ +#ifndef SURICATA_DETECT_ENGINE_ANALYZER_H +#define SURICATA_DETECT_ENGINE_ANALYZER_H #include @@ -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 */ diff --git a/src/detect-engine-build.h b/src/detect-engine-build.h index 513845477e..a61a930f9a 100644 --- a/src/detect-engine-build.h +++ b/src/detect-engine-build.h @@ -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 */ diff --git a/src/detect-engine-content-inspection.h b/src/detect-engine-content-inspection.h index ec785165df..2c253b77ad 100644 --- a/src/detect-engine-content-inspection.h +++ b/src/detect-engine-content-inspection.h @@ -22,8 +22,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-dcepayload.h b/src/detect-engine-dcepayload.h index dc2fcd809b..504693e632 100644 --- a/src/detect-engine-dcepayload.h +++ b/src/detect-engine-dcepayload.h @@ -21,12 +21,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-enip.h b/src/detect-engine-enip.h index 3c263f9997..dbc498e084 100644 --- a/src/detect-engine-enip.h +++ b/src/detect-engine-enip.h @@ -20,8 +20,8 @@ * \author Kevin Wong */ -#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 */ diff --git a/src/detect-engine-event.h b/src/detect-engine-event.h index 178af0472f..c53e71e76f 100644 --- a/src/detect-engine-event.h +++ b/src/detect-engine-event.h @@ -21,9 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-engine-file.h b/src/detect-engine-file.h index 3705a8f6e6..13aa7465f4 100644 --- a/src/detect-engine-file.h +++ b/src/detect-engine-file.h @@ -21,11 +21,11 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-iponly.h b/src/detect-engine-iponly.h index 7fa9e223e7..b3297876da 100644 --- a/src/detect-engine-iponly.h +++ b/src/detect-engine-iponly.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-loader.h b/src/detect-engine-loader.h index f43ff9a549..43eadc407a 100644 --- a/src/detect-engine-loader.h +++ b/src/detect-engine-loader.h @@ -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 */ diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h index b05f86e43e..c331b5f36f 100644 --- a/src/detect-engine-mpm.h +++ b/src/detect-engine-mpm.h @@ -21,9 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-payload.h b/src/detect-engine-payload.h index 7ef29db6c6..bafaf790cc 100644 --- a/src/detect-engine-payload.h +++ b/src/detect-engine-payload.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-port.h b/src/detect-engine-port.h index 641a4e2385..a9a1f997ba 100644 --- a/src/detect-engine-port.h +++ b/src/detect-engine-port.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-prefilter-common.h b/src/detect-engine-prefilter-common.h index f5ea765215..8ef3bb5b15 100644 --- a/src/detect-engine-prefilter-common.h +++ b/src/detect-engine-prefilter-common.h @@ -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 */ diff --git a/src/detect-engine-prefilter.h b/src/detect-engine-prefilter.h index 1f6143fd15..58daeca6e7 100644 --- a/src/detect-engine-prefilter.h +++ b/src/detect-engine-prefilter.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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" diff --git a/src/detect-engine-proto.h b/src/detect-engine-proto.h index 4e4c031110..6008430be6 100644 --- a/src/detect-engine-proto.h +++ b/src/detect-engine-proto.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h index f6f992d131..f4f2742470 100644 --- a/src/detect-engine-register.h +++ b/src/detect-engine-register.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-siggroup.h b/src/detect-engine-siggroup.h index f0638293a6..4b44f2a647 100644 --- a/src/detect-engine-siggroup.h +++ b/src/detect-engine-siggroup.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-sigorder.h b/src/detect-engine-sigorder.h index 7d7e105361..d45a4e443f 100644 --- a/src/detect-engine-sigorder.h +++ b/src/detect-engine-sigorder.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-engine-state.h b/src/detect-engine-state.h index 25cd679a0d..326b3bad4e 100644 --- a/src/detect-engine-state.h +++ b/src/detect-engine-state.h @@ -31,9 +31,8 @@ * \author Anoop Saldanha */ - -#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 */ /** * @} diff --git a/src/detect-engine-tag.h b/src/detect-engine-tag.h index 73f3fd871a..17af74851f 100644 --- a/src/detect-engine-tag.h +++ b/src/detect-engine-tag.h @@ -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 */ diff --git a/src/detect-engine-threshold.h b/src/detect-engine-threshold.h index 6fd7a9feaa..1516359a4b 100644 --- a/src/detect-engine-threshold.h +++ b/src/detect-engine-threshold.h @@ -22,8 +22,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-engine-uint.h b/src/detect-engine-uint.h index 81e4cab893..36993c611d 100644 --- a/src/detect-engine-uint.h +++ b/src/detect-engine-uint.h @@ -21,8 +21,8 @@ * \author Philippe Antoine */ -#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 */ diff --git a/src/detect-engine.h b/src/detect-engine.h index c0b694eb01..a7fa737efe 100644 --- a/src/detect-engine.h +++ b/src/detect-engine.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-fast-pattern.h b/src/detect-fast-pattern.h index af57540c74..97e621060c 100644 --- a/src/detect-fast-pattern.h +++ b/src/detect-fast-pattern.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-file-data.h b/src/detect-file-data.h index 1be9b40010..c96eb13194 100644 --- a/src/detect-file-data.h +++ b/src/detect-file-data.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-file-hash-common.h b/src/detect-file-hash-common.h index b547e03677..886289c895 100644 --- a/src/detect-file-hash-common.h +++ b/src/detect-file-hash-common.h @@ -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 */ diff --git a/src/detect-filemagic.h b/src/detect-filemagic.h index d005597fca..963f0d358d 100644 --- a/src/detect-filemagic.h +++ b/src/detect-filemagic.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-filemd5.h b/src/detect-filemd5.h index 0905fc4ce0..2d48dee7de 100644 --- a/src/detect-filemd5.h +++ b/src/detect-filemd5.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-filename.h b/src/detect-filename.h index 02684fcea4..a05bcb04f9 100644 --- a/src/detect-filename.h +++ b/src/detect-filename.h @@ -21,10 +21,10 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-filesha1.h b/src/detect-filesha1.h index d7504344c6..a7e1cf829d 100644 --- a/src/detect-filesha1.h +++ b/src/detect-filesha1.h @@ -22,10 +22,10 @@ * \author Duarte Silva */ -#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 */ diff --git a/src/detect-filesha256.h b/src/detect-filesha256.h index a205b48699..af416c8d21 100644 --- a/src/detect-filesha256.h +++ b/src/detect-filesha256.h @@ -22,10 +22,10 @@ * \author Duarte Silva */ -#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 */ diff --git a/src/detect-filesize.h b/src/detect-filesize.h index 803b0a3607..00db41ce79 100644 --- a/src/detect-filesize.h +++ b/src/detect-filesize.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#ifndef __DETECT_FILESIZE_H__ -#define __DETECT_FILESIZE_H__ +#ifndef SURICATA_DETECT_FILESIZE_H +#define SURICATA_DETECT_FILESIZE_H void DetectFilesizeRegister(void); diff --git a/src/detect-filestore.h b/src/detect-filestore.h index f394842fbd..847fce03c1 100644 --- a/src/detect-filestore.h +++ b/src/detect-filestore.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-flow-age.h b/src/detect-flow-age.h index 6db3cdba89..3cf1238243 100644 --- a/src/detect-flow-age.h +++ b/src/detect-flow-age.h @@ -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 */ diff --git a/src/detect-flow-pkts.h b/src/detect-flow-pkts.h index ddc5cd172b..da1e0eb5a6 100644 --- a/src/detect-flow-pkts.h +++ b/src/detect-flow-pkts.h @@ -15,12 +15,12 @@ * 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 */ diff --git a/src/detect-flow.h b/src/detect-flow.h index 0fee4bf8c1..990d07b83a 100644 --- a/src/detect-flow.h +++ b/src/detect-flow.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-flowbits.h b/src/detect-flowbits.h index 5e382de0a7..0a5823ef60 100644 --- a/src/detect-flowbits.h +++ b/src/detect-flowbits.h @@ -22,8 +22,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-flowint.h b/src/detect-flowint.h index 6ffa1f0930..7542290458 100644 --- a/src/detect-flowint.h +++ b/src/detect-flowint.h @@ -21,8 +21,8 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-flowvar.h b/src/detect-flowvar.h index b2988a6351..ce0ccdfb59 100644 --- a/src/detect-flowvar.h +++ b/src/detect-flowvar.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-fragbits.h b/src/detect-fragbits.h index 1ab6cae310..a4b0152a7a 100644 --- a/src/detect-fragbits.h +++ b/src/detect-fragbits.h @@ -21,9 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-fragoffset.h b/src/detect-fragoffset.h index 408b5377f0..7c9389cfed 100644 --- a/src/detect-fragoffset.h +++ b/src/detect-fragoffset.h @@ -21,8 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-frame.h b/src/detect-frame.h index ae094624c2..75bbc7c7ec 100644 --- a/src/detect-frame.h +++ b/src/detect-frame.h @@ -19,10 +19,10 @@ * \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 */ diff --git a/src/detect-ftpbounce.h b/src/detect-ftpbounce.h index f9cdfe390c..94e05323b3 100644 --- a/src/detect-ftpbounce.h +++ b/src/detect-ftpbounce.h @@ -21,11 +21,10 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-ftpdata.h b/src/detect-ftpdata.h index 9345c68e82..5ec6847754 100644 --- a/src/detect-ftpdata.h +++ b/src/detect-ftpdata.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/detect-geoip.h b/src/detect-geoip.h index 4ec97b5df8..aa068bc0ad 100644 --- a/src/detect-geoip.h +++ b/src/detect-geoip.h @@ -22,8 +22,8 @@ * \author Bill Meeks */ -#ifndef __DETECT_GEOIP_H__ -#define __DETECT_GEOIP_H__ +#ifndef SURICATA_DETECT_GEOIP_H +#define SURICATA_DETECT_GEOIP_H #ifdef HAVE_GEOIP diff --git a/src/detect-gid.h b/src/detect-gid.h index fa714ef8f5..015cfcbce3 100644 --- a/src/detect-gid.h +++ b/src/detect-gid.h @@ -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 diff --git a/src/detect-hostbits.h b/src/detect-hostbits.h index 6e9c7f5f0e..ee55996308 100644 --- a/src/detect-hostbits.h +++ b/src/detect-hostbits.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-http-accept-enc.h b/src/detect-http-accept-enc.h index 040ece82ee..7deb2ed8ee 100644 --- a/src/detect-http-accept-enc.h +++ b/src/detect-http-accept-enc.h @@ -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 */ diff --git a/src/detect-http-accept-lang.h b/src/detect-http-accept-lang.h index 735ae9132d..d75e537588 100644 --- a/src/detect-http-accept-lang.h +++ b/src/detect-http-accept-lang.h @@ -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 */ diff --git a/src/detect-http-accept.h b/src/detect-http-accept.h index c3924af980..7c3c1c0a98 100644 --- a/src/detect-http-accept.h +++ b/src/detect-http-accept.h @@ -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 */ diff --git a/src/detect-http-client-body.h b/src/detect-http-client-body.h index 7a2249c230..b3339d4063 100644 --- a/src/detect-http-client-body.h +++ b/src/detect-http-client-body.h @@ -21,9 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-http-connection.h b/src/detect-http-connection.h index 7210132232..729fd2a565 100644 --- a/src/detect-http-connection.h +++ b/src/detect-http-connection.h @@ -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 */ diff --git a/src/detect-http-content-len.h b/src/detect-http-content-len.h index 1e4b1a260a..1e17db436d 100644 --- a/src/detect-http-content-len.h +++ b/src/detect-http-content-len.h @@ -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 */ diff --git a/src/detect-http-content-type.h b/src/detect-http-content-type.h index 291b2756d2..e12e16d227 100644 --- a/src/detect-http-content-type.h +++ b/src/detect-http-content-type.h @@ -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 */ diff --git a/src/detect-http-header-common.h b/src/detect-http-header-common.h index a9c830e2a2..4677407943 100644 --- a/src/detect-http-header-common.h +++ b/src/detect-http-header-common.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-http-header-names.h b/src/detect-http-header-names.h index f45a0ae00a..21fc50a8cf 100644 --- a/src/detect-http-header-names.h +++ b/src/detect-http-header-names.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-http-header.h b/src/detect-http-header.h index 369386f400..187b827364 100644 --- a/src/detect-http-header.h +++ b/src/detect-http-header.h @@ -21,12 +21,12 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-http-headers.h b/src/detect-http-headers.h index 30b9bc59d0..095a01c274 100644 --- a/src/detect-http-headers.h +++ b/src/detect-http-headers.h @@ -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 */ diff --git a/src/detect-http-host.h b/src/detect-http-host.h index bb6fd3dac5..5481be11f3 100644 --- a/src/detect-http-host.h +++ b/src/detect-http-host.h @@ -21,9 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-http-location.h b/src/detect-http-location.h index de55a705c8..310e714b12 100644 --- a/src/detect-http-location.h +++ b/src/detect-http-location.h @@ -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 */ diff --git a/src/detect-http-method.h b/src/detect-http-method.h index 871177b587..2cf019a7bd 100644 --- a/src/detect-http-method.h +++ b/src/detect-http-method.h @@ -21,11 +21,10 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/detect-http-protocol.h b/src/detect-http-protocol.h index 88dde2f8c7..f225877ffe 100644 --- a/src/detect-http-protocol.h +++ b/src/detect-http-protocol.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-http-raw-header.h b/src/detect-http-raw-header.h index f6b480b2b9..7b2729bffb 100644 --- a/src/detect-http-raw-header.h +++ b/src/detect-http-raw-header.h @@ -21,9 +21,9 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-http-referer.h b/src/detect-http-referer.h index ae265890a0..779d7bf907 100644 --- a/src/detect-http-referer.h +++ b/src/detect-http-referer.h @@ -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 */ diff --git a/src/detect-http-request-line.h b/src/detect-http-request-line.h index 64751b7ee3..2bc06b1e07 100644 --- a/src/detect-http-request-line.h +++ b/src/detect-http-request-line.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-http-response-line.h b/src/detect-http-response-line.h index 0563feaf60..5452897961 100644 --- a/src/detect-http-response-line.h +++ b/src/detect-http-response-line.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-http-server-body.h b/src/detect-http-server-body.h index 7f20dc54a6..5ced18ef5a 100644 --- a/src/detect-http-server-body.h +++ b/src/detect-http-server-body.h @@ -21,9 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-http-server.h b/src/detect-http-server.h index c74137264c..1ba1073d5a 100644 --- a/src/detect-http-server.h +++ b/src/detect-http-server.h @@ -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 */ diff --git a/src/detect-http-start.h b/src/detect-http-start.h index 52cada1c86..85558e293d 100644 --- a/src/detect-http-start.h +++ b/src/detect-http-start.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-http-ua.h b/src/detect-http-ua.h index 2b04245e73..4c58c8b79f 100644 --- a/src/detect-http-ua.h +++ b/src/detect-http-ua.h @@ -21,9 +21,9 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-icmp-id.h b/src/detect-icmp-id.h index b952249b6e..9afc1611cf 100644 --- a/src/detect-icmp-id.h +++ b/src/detect-icmp-id.h @@ -21,8 +21,8 @@ * \author Gerardo Iglesias Galvan */ -#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 */ diff --git a/src/detect-icmp-seq.h b/src/detect-icmp-seq.h index e148177b8d..3c40f3a707 100644 --- a/src/detect-icmp-seq.h +++ b/src/detect-icmp-seq.h @@ -21,8 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-icode.h b/src/detect-icode.h index 9d0a179c2f..1f08ec4a9b 100644 --- a/src/detect-icode.h +++ b/src/detect-icode.h @@ -23,10 +23,10 @@ * \author Gerardo Iglesias */ -#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 */ diff --git a/src/detect-id.h b/src/detect-id.h index 3198c9c31e..9fb9156670 100644 --- a/src/detect-id.h +++ b/src/detect-id.h @@ -21,9 +21,8 @@ * \author Pablo Rincon Crespo */ -#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 */ diff --git a/src/detect-ike-chosen-sa.h b/src/detect-ike-chosen-sa.h index efbd5fe4c2..d5e107d22f 100644 --- a/src/detect-ike-chosen-sa.h +++ b/src/detect-ike-chosen-sa.h @@ -21,9 +21,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ike-exch-type.h b/src/detect-ike-exch-type.h index f7360eb21c..ca2c824680 100644 --- a/src/detect-ike-exch-type.h +++ b/src/detect-ike-exch-type.h @@ -21,9 +21,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ike-key-exchange-payload-length.h b/src/detect-ike-key-exchange-payload-length.h index 7d76e558b9..4667158633 100644 --- a/src/detect-ike-key-exchange-payload-length.h +++ b/src/detect-ike-key-exchange-payload-length.h @@ -20,9 +20,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ike-key-exchange-payload.h b/src/detect-ike-key-exchange-payload.h index 55a914b5c3..0732a8f600 100644 --- a/src/detect-ike-key-exchange-payload.h +++ b/src/detect-ike-key-exchange-payload.h @@ -20,9 +20,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ike-nonce-payload-length.h b/src/detect-ike-nonce-payload-length.h index 8a17f5530a..dd11cc1388 100644 --- a/src/detect-ike-nonce-payload-length.h +++ b/src/detect-ike-nonce-payload-length.h @@ -20,9 +20,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ike-nonce-payload.h b/src/detect-ike-nonce-payload.h index f0923d8776..f705c42395 100644 --- a/src/detect-ike-nonce-payload.h +++ b/src/detect-ike-nonce-payload.h @@ -20,9 +20,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ike-spi.h b/src/detect-ike-spi.h index e4ae75d542..11baf8d62f 100644 --- a/src/detect-ike-spi.h +++ b/src/detect-ike-spi.h @@ -20,9 +20,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ike-vendor.h b/src/detect-ike-vendor.h index 2570f91752..8b551c3ad8 100644 --- a/src/detect-ike-vendor.h +++ b/src/detect-ike-vendor.h @@ -21,9 +21,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/detect-ipaddr.h b/src/detect-ipaddr.h index d9eba7a55e..9fd7efd3e1 100644 --- a/src/detect-ipaddr.h +++ b/src/detect-ipaddr.h @@ -21,9 +21,9 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/detect-ipopts.h b/src/detect-ipopts.h index a4009252d0..0008a03b03 100644 --- a/src/detect-ipopts.h +++ b/src/detect-ipopts.h @@ -21,9 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-ipproto.h b/src/detect-ipproto.h index eeac35a5c1..0c6affb3eb 100644 --- a/src/detect-ipproto.h +++ b/src/detect-ipproto.h @@ -21,8 +21,8 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/detect-iprep.h b/src/detect-iprep.h index 07cd5c7f60..35b2ea4b1c 100644 --- a/src/detect-iprep.h +++ b/src/detect-iprep.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-isdataat.h b/src/detect-isdataat.h index 60b1388229..01ea2e304f 100644 --- a/src/detect-isdataat.h +++ b/src/detect-isdataat.h @@ -21,8 +21,8 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-itype.h b/src/detect-itype.h index c8d1092e6b..9eef3d6796 100644 --- a/src/detect-itype.h +++ b/src/detect-itype.h @@ -21,10 +21,10 @@ * \author Gerardo Iglesias */ -#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 */ diff --git a/src/detect-krb5-cname.h b/src/detect-krb5-cname.h index 0358c8e1c0..2c87e5990f 100644 --- a/src/detect-krb5-cname.h +++ b/src/detect-krb5-cname.h @@ -21,9 +21,9 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/detect-krb5-errcode.h b/src/detect-krb5-errcode.h index b803e9fb56..4373d706a8 100644 --- a/src/detect-krb5-errcode.h +++ b/src/detect-krb5-errcode.h @@ -21,8 +21,8 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/detect-krb5-msgtype.h b/src/detect-krb5-msgtype.h index 76e8235a11..2be0a579c4 100644 --- a/src/detect-krb5-msgtype.h +++ b/src/detect-krb5-msgtype.h @@ -21,8 +21,8 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/detect-krb5-sname.h b/src/detect-krb5-sname.h index 4eb52ff016..75c47f716d 100644 --- a/src/detect-krb5-sname.h +++ b/src/detect-krb5-sname.h @@ -21,9 +21,9 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/detect-krb5-ticket-encryption.h b/src/detect-krb5-ticket-encryption.h index bae81b30ad..57dabd5e57 100644 --- a/src/detect-krb5-ticket-encryption.h +++ b/src/detect-krb5-ticket-encryption.h @@ -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 */ diff --git a/src/detect-l3proto.h b/src/detect-l3proto.h index 447cd95d09..a57dcc45ee 100644 --- a/src/detect-l3proto.h +++ b/src/detect-l3proto.h @@ -22,12 +22,12 @@ * */ -#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 */ diff --git a/src/detect-lua-extensions.h b/src/detect-lua-extensions.h index efd9416f1b..24b0e8657e 100644 --- a/src/detect-lua-extensions.h +++ b/src/detect-lua-extensions.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 *); diff --git a/src/detect-lua.h b/src/detect-lua.h index dcf99b6c3f..ae38b026ca 100644 --- a/src/detect-lua.h +++ b/src/detect-lua.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-mark.h b/src/detect-mark.h index b8de378fd2..05dfd0db0f 100644 --- a/src/detect-mark.h +++ b/src/detect-mark.h @@ -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 */ diff --git a/src/detect-metadata.h b/src/detect-metadata.h index fafa63f5ae..7a847cc705 100644 --- a/src/detect-metadata.h +++ b/src/detect-metadata.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-modbus.h b/src/detect-modbus.h index 9c96ddeef8..5d0f466098 100644 --- a/src/detect-modbus.h +++ b/src/detect-modbus.h @@ -31,10 +31,10 @@ * \author David DIALLO */ -#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 */ diff --git a/src/detect-mqtt-connack-sessionpresent.h b/src/detect-mqtt-connack-sessionpresent.h index 10e0a69322..42a7887b27 100644 --- a/src/detect-mqtt-connack-sessionpresent.h +++ b/src/detect-mqtt-connack-sessionpresent.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-connect-clientid.h b/src/detect-mqtt-connect-clientid.h index e1a9b966a6..691573c8d2 100644 --- a/src/detect-mqtt-connect-clientid.h +++ b/src/detect-mqtt-connect-clientid.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-connect-flags.h b/src/detect-mqtt-connect-flags.h index 261dbb015a..2c55880604 100644 --- a/src/detect-mqtt-connect-flags.h +++ b/src/detect-mqtt-connect-flags.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-connect-password.h b/src/detect-mqtt-connect-password.h index 6f7ca35179..c4b12d9462 100644 --- a/src/detect-mqtt-connect-password.h +++ b/src/detect-mqtt-connect-password.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-connect-protocol-string.h b/src/detect-mqtt-connect-protocol-string.h index 3bbb21ab10..0ab324db58 100644 --- a/src/detect-mqtt-connect-protocol-string.h +++ b/src/detect-mqtt-connect-protocol-string.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-connect-username.h b/src/detect-mqtt-connect-username.h index 6dad2ee903..9ae55277d7 100644 --- a/src/detect-mqtt-connect-username.h +++ b/src/detect-mqtt-connect-username.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-connect-willmessage.h b/src/detect-mqtt-connect-willmessage.h index 0b490cc64a..4f62f33712 100644 --- a/src/detect-mqtt-connect-willmessage.h +++ b/src/detect-mqtt-connect-willmessage.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-connect-willtopic.h b/src/detect-mqtt-connect-willtopic.h index d018342a62..fa571c1a1c 100644 --- a/src/detect-mqtt-connect-willtopic.h +++ b/src/detect-mqtt-connect-willtopic.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-flags.h b/src/detect-mqtt-flags.h index 1486dcf2b6..1f792b36e9 100644 --- a/src/detect-mqtt-flags.h +++ b/src/detect-mqtt-flags.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-protocol-version.h b/src/detect-mqtt-protocol-version.h index a069e42a45..7f8cac2883 100644 --- a/src/detect-mqtt-protocol-version.h +++ b/src/detect-mqtt-protocol-version.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-publish-message.h b/src/detect-mqtt-publish-message.h index eea362fdc8..e5b5f0db35 100644 --- a/src/detect-mqtt-publish-message.h +++ b/src/detect-mqtt-publish-message.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-publish-topic.h b/src/detect-mqtt-publish-topic.h index 674ca8955c..aa8225c922 100644 --- a/src/detect-mqtt-publish-topic.h +++ b/src/detect-mqtt-publish-topic.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-qos.h b/src/detect-mqtt-qos.h index fda801ab12..b96f630ebb 100644 --- a/src/detect-mqtt-qos.h +++ b/src/detect-mqtt-qos.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-reason-code.h b/src/detect-mqtt-reason-code.h index c8819ad526..ba7f0146bd 100644 --- a/src/detect-mqtt-reason-code.h +++ b/src/detect-mqtt-reason-code.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-subscribe-topic.h b/src/detect-mqtt-subscribe-topic.h index 1bb3aa5c5f..868188af47 100644 --- a/src/detect-mqtt-subscribe-topic.h +++ b/src/detect-mqtt-subscribe-topic.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-type.h b/src/detect-mqtt-type.h index be7b971e34..7139e183de 100644 --- a/src/detect-mqtt-type.h +++ b/src/detect-mqtt-type.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-mqtt-unsubscribe-topic.h b/src/detect-mqtt-unsubscribe-topic.h index d9b5993e82..18e51c33c4 100644 --- a/src/detect-mqtt-unsubscribe-topic.h +++ b/src/detect-mqtt-unsubscribe-topic.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-msg.h b/src/detect-msg.h index a21d511035..822c2a3550 100644 --- a/src/detect-msg.h +++ b/src/detect-msg.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-nfs-procedure.h b/src/detect-nfs-procedure.h index e7b2256778..a823e1d1ae 100644 --- a/src/detect-nfs-procedure.h +++ b/src/detect-nfs-procedure.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-nfs-version.h b/src/detect-nfs-version.h index 84eda94611..4b4daa5753 100644 --- a/src/detect-nfs-version.h +++ b/src/detect-nfs-version.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-noalert.h b/src/detect-noalert.h index abe39efcb9..2af04c8233 100644 --- a/src/detect-noalert.h +++ b/src/detect-noalert.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-nocase.h b/src/detect-nocase.h index 4ba6723eb7..06fffcfb23 100644 --- a/src/detect-nocase.h +++ b/src/detect-nocase.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-offset.h b/src/detect-offset.h index 76befe17de..a3f3e0012e 100644 --- a/src/detect-offset.h +++ b/src/detect-offset.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-parse.h b/src/detect-parse.h index 900771a3a9..0a993a794f 100644 --- a/src/detect-parse.h +++ b/src/detect-parse.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-pcre.h b/src/detect-pcre.h index 9ac14ab90a..74131ba7db 100644 --- a/src/detect-pcre.h +++ b/src/detect-pcre.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-pkt-data.h b/src/detect-pkt-data.h index fbaf8b98e6..5c7e5f70e2 100644 --- a/src/detect-pkt-data.h +++ b/src/detect-pkt-data.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-pktvar.h b/src/detect-pktvar.h index ecd0243904..b40b6cdd52 100644 --- a/src/detect-pktvar.h +++ b/src/detect-pktvar.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-prefilter.h b/src/detect-prefilter.h index afc64db43f..01cca2e0b0 100644 --- a/src/detect-prefilter.h +++ b/src/detect-prefilter.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-priority.h b/src/detect-priority.h index 0ec877e521..96e52b6a73 100644 --- a/src/detect-priority.h +++ b/src/detect-priority.h @@ -24,11 +24,10 @@ * 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 */ diff --git a/src/detect-quic-cyu-hash.h b/src/detect-quic-cyu-hash.h index 579f1ca92d..c98739e49a 100644 --- a/src/detect-quic-cyu-hash.h +++ b/src/detect-quic-cyu-hash.h @@ -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 */ diff --git a/src/detect-quic-cyu-string.h b/src/detect-quic-cyu-string.h index b521d4faba..33e1439be7 100644 --- a/src/detect-quic-cyu-string.h +++ b/src/detect-quic-cyu-string.h @@ -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 */ diff --git a/src/detect-quic-sni.h b/src/detect-quic-sni.h index 13e590d2c7..7fcccc6d08 100644 --- a/src/detect-quic-sni.h +++ b/src/detect-quic-sni.h @@ -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 */ diff --git a/src/detect-quic-ua.h b/src/detect-quic-ua.h index bf6e063ac4..40614dbf12 100644 --- a/src/detect-quic-ua.h +++ b/src/detect-quic-ua.h @@ -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 */ diff --git a/src/detect-quic-version.h b/src/detect-quic-version.h index c9e3e19c89..61467d7e08 100644 --- a/src/detect-quic-version.h +++ b/src/detect-quic-version.h @@ -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 */ diff --git a/src/detect-rawbytes.h b/src/detect-rawbytes.h index 8716e56a31..243e3fea89 100644 --- a/src/detect-rawbytes.h +++ b/src/detect-rawbytes.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-reference.h b/src/detect-reference.h index ddf9233987..c2c68f768b 100644 --- a/src/detect-reference.h +++ b/src/detect-reference.h @@ -21,9 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-replace.h b/src/detect-replace.h index 4944420527..b30fb523ff 100644 --- a/src/detect-replace.h +++ b/src/detect-replace.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#ifndef __DETECT_REPLACE_H__ -#define __DETECT_REPLACE_H__ +#ifndef SURICATA_DETECT_REPLACE_H +#define SURICATA_DETECT_REPLACE_H #include "detect-content.h" diff --git a/src/detect-requires.h b/src/detect-requires.h index 70f1dc43b8..cf625ab32e 100644 --- a/src/detect-requires.h +++ b/src/detect-requires.h @@ -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 */ diff --git a/src/detect-rev.h b/src/detect-rev.h index 24ae202f12..50e0c3a3b9 100644 --- a/src/detect-rev.h +++ b/src/detect-rev.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-rfb-name.h b/src/detect-rfb-name.h index 0627eeda22..70a8a60b91 100644 --- a/src/detect-rfb-name.h +++ b/src/detect-rfb-name.h @@ -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 */ diff --git a/src/detect-rfb-secresult.h b/src/detect-rfb-secresult.h index d3e296d8e4..74c70c748e 100644 --- a/src/detect-rfb-secresult.h +++ b/src/detect-rfb-secresult.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-rfb-sectype.h b/src/detect-rfb-sectype.h index 15a1f801de..e2860a3558 100644 --- a/src/detect-rfb-sectype.h +++ b/src/detect-rfb-sectype.h @@ -21,9 +21,9 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/detect-rpc.h b/src/detect-rpc.h index 4b4e60b160..851c757a7c 100644 --- a/src/detect-rpc.h +++ b/src/detect-rpc.h @@ -21,8 +21,8 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-sameip.h b/src/detect-sameip.h index ef6b54b605..0dfee45d42 100644 --- a/src/detect-sameip.h +++ b/src/detect-sameip.h @@ -21,10 +21,10 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/detect-sid.h b/src/detect-sid.h index f7389d105d..076ec35245 100644 --- a/src/detect-sid.h +++ b/src/detect-sid.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-sip-method.h b/src/detect-sip-method.h index 512c752acf..acc7d85200 100644 --- a/src/detect-sip-method.h +++ b/src/detect-sip-method.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-sip-protocol.h b/src/detect-sip-protocol.h index ca8f228d35..e4ac75be80 100644 --- a/src/detect-sip-protocol.h +++ b/src/detect-sip-protocol.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-sip-request-line.h b/src/detect-sip-request-line.h index 88efffa28c..01e2438520 100644 --- a/src/detect-sip-request-line.h +++ b/src/detect-sip-request-line.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-sip-response-line.h b/src/detect-sip-response-line.h index b9dcc9a8f4..8541140021 100644 --- a/src/detect-sip-response-line.h +++ b/src/detect-sip-response-line.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-sip-stat-code.h b/src/detect-sip-stat-code.h index 21a49575f2..31cacdaa7a 100644 --- a/src/detect-sip-stat-code.h +++ b/src/detect-sip-stat-code.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-sip-stat-msg.h b/src/detect-sip-stat-msg.h index 29b2e21515..9d35fb3733 100644 --- a/src/detect-sip-stat-msg.h +++ b/src/detect-sip-stat-msg.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-sip-uri.h b/src/detect-sip-uri.h index 1614205fe3..4e9f3eee81 100644 --- a/src/detect-sip-uri.h +++ b/src/detect-sip-uri.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/detect-smb-ntlmssp.h b/src/detect-smb-ntlmssp.h index a3eaf212a9..46342d5975 100644 --- a/src/detect-smb-ntlmssp.h +++ b/src/detect-smb-ntlmssp.h @@ -21,10 +21,10 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/detect-smb-share.h b/src/detect-smb-share.h index a5e5be93c9..a80df8d39c 100644 --- a/src/detect-smb-share.h +++ b/src/detect-smb-share.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-smb-version.h b/src/detect-smb-version.h index 11bdb1feae..4d4e12b737 100644 --- a/src/detect-smb-version.h +++ b/src/detect-smb-version.h @@ -15,11 +15,11 @@ * 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 diff --git a/src/detect-snmp-community.h b/src/detect-snmp-community.h index 11de2abbf9..082d9c1970 100644 --- a/src/detect-snmp-community.h +++ b/src/detect-snmp-community.h @@ -21,10 +21,9 @@ * \author FirstName LastName */ -#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 */ diff --git a/src/detect-snmp-pdu_type.h b/src/detect-snmp-pdu_type.h index 5197885a58..a01dc98d45 100644 --- a/src/detect-snmp-pdu_type.h +++ b/src/detect-snmp-pdu_type.h @@ -21,10 +21,9 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/detect-snmp-usm.h b/src/detect-snmp-usm.h index 9f202e13d2..9c86dad807 100644 --- a/src/detect-snmp-usm.h +++ b/src/detect-snmp-usm.h @@ -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 */ diff --git a/src/detect-snmp-version.h b/src/detect-snmp-version.h index 3c8d5915d8..cd71b59a24 100644 --- a/src/detect-snmp-version.h +++ b/src/detect-snmp-version.h @@ -21,10 +21,9 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/detect-ssh-hassh-server-string.h b/src/detect-ssh-hassh-server-string.h index 4c2adbb097..925582a4a2 100644 --- a/src/detect-ssh-hassh-server-string.h +++ b/src/detect-ssh-hassh-server-string.h @@ -21,10 +21,10 @@ * \author Malakhatko Vadym */ -#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 */ diff --git a/src/detect-ssh-hassh-server.h b/src/detect-ssh-hassh-server.h index 6be1055ae1..12bd96d7a0 100644 --- a/src/detect-ssh-hassh-server.h +++ b/src/detect-ssh-hassh-server.h @@ -21,11 +21,10 @@ * \author Malakhatko Vadym */ -#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 */ diff --git a/src/detect-ssh-hassh-string.h b/src/detect-ssh-hassh-string.h index b3cebcd709..b72a8acf80 100644 --- a/src/detect-ssh-hassh-string.h +++ b/src/detect-ssh-hassh-string.h @@ -21,10 +21,10 @@ * \author Vadym Malakhatko */ -#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 */ diff --git a/src/detect-ssh-hassh.h b/src/detect-ssh-hassh.h index 07eb091258..fdf314400b 100644 --- a/src/detect-ssh-hassh.h +++ b/src/detect-ssh-hassh.h @@ -21,10 +21,10 @@ * \author Malakhatko Vadym */ -#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 */ diff --git a/src/detect-ssh-proto-version.h b/src/detect-ssh-proto-version.h index a4c8eddbbe..eade10a716 100644 --- a/src/detect-ssh-proto-version.h +++ b/src/detect-ssh-proto-version.h @@ -21,8 +21,8 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-ssh-proto.h b/src/detect-ssh-proto.h index b04476e3c8..e97b80eb29 100644 --- a/src/detect-ssh-proto.h +++ b/src/detect-ssh-proto.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-ssh-software-version.h b/src/detect-ssh-software-version.h index 7cf3111677..6ed97e6f22 100644 --- a/src/detect-ssh-software-version.h +++ b/src/detect-ssh-software-version.h @@ -21,8 +21,8 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/detect-ssh-software.h b/src/detect-ssh-software.h index a741b87316..79e77cca48 100644 --- a/src/detect-ssh-software.h +++ b/src/detect-ssh-software.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-tag.h b/src/detect-tag.h index 0a03584b61..fa0c3aa4aa 100644 --- a/src/detect-tag.h +++ b/src/detect-tag.h @@ -22,8 +22,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-target.h b/src/detect-target.h index 8c4e5c215e..486dd2e713 100644 --- a/src/detect-target.h +++ b/src/detect-target.h @@ -21,9 +21,9 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/detect-tcp-ack.h b/src/detect-tcp-ack.h index e1bb7c710c..396f0369fe 100644 --- a/src/detect-tcp-ack.h +++ b/src/detect-tcp-ack.h @@ -21,8 +21,8 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/detect-tcp-flags.h b/src/detect-tcp-flags.h index e5920b9c55..6fb7e6b0b7 100644 --- a/src/detect-tcp-flags.h +++ b/src/detect-tcp-flags.h @@ -21,9 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-tcp-seq.h b/src/detect-tcp-seq.h index 688b6c2c39..a6e88d7242 100644 --- a/src/detect-tcp-seq.h +++ b/src/detect-tcp-seq.h @@ -21,8 +21,8 @@ * \author Brian Rectanus */ -#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 */ diff --git a/src/detect-tcp-window.h b/src/detect-tcp-window.h index 51f85398db..7178f5ea79 100644 --- a/src/detect-tcp-window.h +++ b/src/detect-tcp-window.h @@ -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 */ diff --git a/src/detect-template-rust-buffer.h b/src/detect-template-rust-buffer.h index 5e24a97f19..3713ac4c4c 100644 --- a/src/detect-template-rust-buffer.h +++ b/src/detect-template-rust-buffer.h @@ -21,9 +21,9 @@ * \author FirstName LastName */ -#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 */ diff --git a/src/detect-template.h b/src/detect-template.h index 2d72c84aab..9d510804a3 100644 --- a/src/detect-template.h +++ b/src/detect-template.h @@ -21,8 +21,8 @@ * \author XXX Yourname */ -#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 */ diff --git a/src/detect-threshold.h b/src/detect-threshold.h index 751c0e1ac7..2648feb0e4 100644 --- a/src/detect-threshold.h +++ b/src/detect-threshold.h @@ -21,9 +21,8 @@ * \author Breno Silva */ -#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 */ diff --git a/src/detect-tls-cert-fingerprint.h b/src/detect-tls-cert-fingerprint.h index 9e39e0706b..077ea3e657 100644 --- a/src/detect-tls-cert-fingerprint.h +++ b/src/detect-tls-cert-fingerprint.h @@ -21,10 +21,10 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-cert-issuer.h b/src/detect-tls-cert-issuer.h index fdfda510da..6414c88add 100644 --- a/src/detect-tls-cert-issuer.h +++ b/src/detect-tls-cert-issuer.h @@ -21,10 +21,9 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-cert-serial.h b/src/detect-tls-cert-serial.h index 9fe018e908..d3fe355cbd 100644 --- a/src/detect-tls-cert-serial.h +++ b/src/detect-tls-cert-serial.h @@ -21,10 +21,10 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-cert-subject.h b/src/detect-tls-cert-subject.h index 23f3e77859..ba16e11bf2 100644 --- a/src/detect-tls-cert-subject.h +++ b/src/detect-tls-cert-subject.h @@ -21,10 +21,9 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-cert-validity.h b/src/detect-tls-cert-validity.h index 256be6b4b2..f0e6d7efe7 100644 --- a/src/detect-tls-cert-validity.h +++ b/src/detect-tls-cert-validity.h @@ -21,8 +21,8 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-certs.h b/src/detect-tls-certs.h index 1dde64ddd7..08fd7d8582 100644 --- a/src/detect-tls-certs.h +++ b/src/detect-tls-certs.h @@ -21,10 +21,10 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-ja3-hash.h b/src/detect-tls-ja3-hash.h index 556896d4b4..b9f62f159e 100644 --- a/src/detect-tls-ja3-hash.h +++ b/src/detect-tls-ja3-hash.h @@ -21,10 +21,10 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-ja3-string.h b/src/detect-tls-ja3-string.h index b4a4d5e0ac..0d8ffdc4a0 100644 --- a/src/detect-tls-ja3-string.h +++ b/src/detect-tls-ja3-string.h @@ -21,10 +21,10 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-ja3s-hash.h b/src/detect-tls-ja3s-hash.h index 2185463008..407ffd2c68 100644 --- a/src/detect-tls-ja3s-hash.h +++ b/src/detect-tls-ja3s-hash.h @@ -21,10 +21,10 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-ja3s-string.h b/src/detect-tls-ja3s-string.h index 25a57aabda..76badcf75a 100644 --- a/src/detect-tls-ja3s-string.h +++ b/src/detect-tls-ja3s-string.h @@ -21,10 +21,10 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-random.h b/src/detect-tls-random.h index 4460a05749..41787a4423 100644 --- a/src/detect-tls-random.h +++ b/src/detect-tls-random.h @@ -15,11 +15,11 @@ * 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 */ diff --git a/src/detect-tls-sni.h b/src/detect-tls-sni.h index 0ecf1024e9..7da1be860f 100644 --- a/src/detect-tls-sni.h +++ b/src/detect-tls-sni.h @@ -21,9 +21,9 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/detect-tls-version.h b/src/detect-tls-version.h index fa808f3940..eabb6b57ae 100644 --- a/src/detect-tls-version.h +++ b/src/detect-tls-version.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-tls.h b/src/detect-tls.h index 70d58d56c1..b47e2a1e09 100644 --- a/src/detect-tls.h +++ b/src/detect-tls.h @@ -31,8 +31,8 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/detect-tos.h b/src/detect-tos.h index ef6fea690c..3aa99495d1 100644 --- a/src/detect-tos.h +++ b/src/detect-tos.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/detect-transform-casechange.h b/src/detect-transform-casechange.h index db6275b915..383786ac2f 100644 --- a/src/detect-transform-casechange.h +++ b/src/detect-transform-casechange.h @@ -21,11 +21,11 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/detect-transform-compress-whitespace.h b/src/detect-transform-compress-whitespace.h index 800d9a7272..f7824bde43 100644 --- a/src/detect-transform-compress-whitespace.h +++ b/src/detect-transform-compress-whitespace.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-transform-dotprefix.h b/src/detect-transform-dotprefix.h index 3512689b64..2062055d8d 100644 --- a/src/detect-transform-dotprefix.h +++ b/src/detect-transform-dotprefix.h @@ -21,10 +21,10 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/detect-transform-header-lowercase.h b/src/detect-transform-header-lowercase.h index aca7f874a4..55f194a86b 100644 --- a/src/detect-transform-header-lowercase.h +++ b/src/detect-transform-header-lowercase.h @@ -21,10 +21,10 @@ * \author Philippe Antoine */ -#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 */ diff --git a/src/detect-transform-md5.h b/src/detect-transform-md5.h index a65bb387f2..284c66ac63 100644 --- a/src/detect-transform-md5.h +++ b/src/detect-transform-md5.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-transform-pcrexform.h b/src/detect-transform-pcrexform.h index 0a807d751b..2735cd3279 100644 --- a/src/detect-transform-pcrexform.h +++ b/src/detect-transform-pcrexform.h @@ -21,10 +21,10 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/detect-transform-sha256.h b/src/detect-transform-sha256.h index e8b4f0b3b0..536b896bbb 100644 --- a/src/detect-transform-sha256.h +++ b/src/detect-transform-sha256.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-transform-strip-pseudo-headers.h b/src/detect-transform-strip-pseudo-headers.h index c2016d438f..a0f9ebae31 100644 --- a/src/detect-transform-strip-pseudo-headers.h +++ b/src/detect-transform-strip-pseudo-headers.h @@ -21,10 +21,10 @@ * \author Philippe Antoine */ -#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 */ diff --git a/src/detect-transform-strip-whitespace.h b/src/detect-transform-strip-whitespace.h index 274f24100c..53b2922e8d 100644 --- a/src/detect-transform-strip-whitespace.h +++ b/src/detect-transform-strip-whitespace.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-transform-urldecode.h b/src/detect-transform-urldecode.h index 79f886f94d..cd7267485e 100644 --- a/src/detect-transform-urldecode.h +++ b/src/detect-transform-urldecode.h @@ -21,10 +21,10 @@ * \author Philippe Antoine */ -#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 */ diff --git a/src/detect-transform-xor.h b/src/detect-transform-xor.h index 0c585167f9..3ac2e344df 100644 --- a/src/detect-transform-xor.h +++ b/src/detect-transform-xor.h @@ -21,10 +21,10 @@ * \author Philippe Antoine */ -#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 */ diff --git a/src/detect-uricontent.h b/src/detect-uricontent.h index 289afff33a..869e4e5b17 100644 --- a/src/detect-uricontent.h +++ b/src/detect-uricontent.h @@ -22,10 +22,10 @@ * \author Gurvinder Singh */ -#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 */ diff --git a/src/detect-within.h b/src/detect-within.h index 7ccaf2648a..4df9737a65 100644 --- a/src/detect-within.h +++ b/src/detect-within.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect-xbits.h b/src/detect-xbits.h index 516bfdcfd1..07d662ea51 100644 --- a/src/detect-xbits.h +++ b/src/detect-xbits.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/detect.h b/src/detect.h index 2027affa39..886fe1db2e 100644 --- a/src/detect.h +++ b/src/detect.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/device-storage.h b/src/device-storage.h index 441b92b82e..31339b09ed 100644 --- a/src/device-storage.h +++ b/src/device-storage.h @@ -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 */ diff --git a/src/feature.h b/src/feature.h index 6549c5bbea..035fb3997b 100644 --- a/src/feature.h +++ b/src/feature.h @@ -21,8 +21,8 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/flow-bit.h b/src/flow-bit.h index 2362d51807..e10c58dafd 100644 --- a/src/flow-bit.h +++ b/src/flow-bit.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/flow-bypass.h b/src/flow-bypass.h index 58ca766636..1a700dd23d 100644 --- a/src/flow-bypass.h +++ b/src/flow-bypass.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#ifndef __FLOW_BYPASS_H__ -#define __FLOW_BYPASS_H__ +#ifndef SURICATA_FLOW_BYPASS_H +#define SURICATA_FLOW_BYPASS_H #include "flow.h" diff --git a/src/flow-hash.h b/src/flow-hash.h index 201eb64145..0f1d9bf113 100644 --- a/src/flow-hash.h +++ b/src/flow-hash.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/flow-manager.h b/src/flow-manager.h index 7cdd017000..23e4ced6cd 100644 --- a/src/flow-manager.h +++ b/src/flow-manager.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/flow-private.h b/src/flow-private.h index d3899f6dfb..bd7aac7364 100644 --- a/src/flow-private.h +++ b/src/flow-private.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/flow-queue.h b/src/flow-queue.h index 0523546ce8..2d26869d65 100644 --- a/src/flow-queue.h +++ b/src/flow-queue.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/flow-spare-pool.h b/src/flow-spare-pool.h index cf9a4bdd55..0fdf723ac3 100644 --- a/src/flow-spare-pool.h +++ b/src/flow-spare-pool.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/flow-storage.h b/src/flow-storage.h index 6fd8beef32..6788c06c96 100644 --- a/src/flow-storage.h +++ b/src/flow-storage.h @@ -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 */ diff --git a/src/flow-timeout.h b/src/flow-timeout.h index 882f4e63b2..7ca895e728 100644 --- a/src/flow-timeout.h +++ b/src/flow-timeout.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/flow-util.h b/src/flow-util.h index 3d0d978b5a..2d813bd9ee 100644 --- a/src/flow-util.h +++ b/src/flow-util.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/flow-var.h b/src/flow-var.h index f0bcf3c0c3..4768490e68 100644 --- a/src/flow-var.h +++ b/src/flow-var.h @@ -22,8 +22,8 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/flow-worker.h b/src/flow-worker.h index 9187602dec..951878eb06 100644 --- a/src/flow-worker.h +++ b/src/flow-worker.h @@ -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 */ diff --git a/src/flow.h b/src/flow.h index 418becfc29..7066965c51 100644 --- a/src/flow.h +++ b/src/flow.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/host-bit.h b/src/host-bit.h index bcd9c2d3db..2c57660d50 100644 --- a/src/host-bit.h +++ b/src/host-bit.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/host-queue.h b/src/host-queue.h index 2edd169d22..bd6ed8f880 100644 --- a/src/host-queue.h +++ b/src/host-queue.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/host-storage.h b/src/host-storage.h index e315b33f63..64356e4313 100644 --- a/src/host-storage.h +++ b/src/host-storage.h @@ -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 */ diff --git a/src/host-timeout.h b/src/host-timeout.h index 044c44d970..545d65fb31 100644 --- a/src/host-timeout.h +++ b/src/host-timeout.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#ifndef __HOST_TIMEOUT_H__ -#define __HOST_TIMEOUT_H__ +#ifndef SURICATA_HOST_TIMEOUT_H +#define SURICATA_HOST_TIMEOUT_H uint32_t HostTimeoutHash(SCTime_t ts); diff --git a/src/host.h b/src/host.h index f4f248b5ee..ac83474fb9 100644 --- a/src/host.h +++ b/src/host.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/ippair-bit.h b/src/ippair-bit.h index 478bc11a63..4f363eecad 100644 --- a/src/ippair-bit.h +++ b/src/ippair-bit.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/ippair-queue.h b/src/ippair-queue.h index cc3814b34f..59a23f8859 100644 --- a/src/ippair-queue.h +++ b/src/ippair-queue.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/ippair-storage.h b/src/ippair-storage.h index 1d5ba7d2ea..e8d686d113 100644 --- a/src/ippair-storage.h +++ b/src/ippair-storage.h @@ -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 */ diff --git a/src/ippair-timeout.h b/src/ippair-timeout.h index 0a127f9143..9370ef3d17 100644 --- a/src/ippair-timeout.h +++ b/src/ippair-timeout.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#ifndef __IPPAIR_TIMEOUT_H__ -#define __IPPAIR_TIMEOUT_H__ +#ifndef SURICATA_IPPAIR_TIMEOUT_H +#define SURICATA_IPPAIR_TIMEOUT_H uint32_t IPPairTimeoutHash(SCTime_t ts); diff --git a/src/ippair.h b/src/ippair.h index 3eef45ad8f..e12b0656ca 100644 --- a/src/ippair.h +++ b/src/ippair.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/log-cf-common.h b/src/log-cf-common.h index 61d2d55af8..078a5064e9 100644 --- a/src/log-cf-common.h +++ b/src/log-cf-common.h @@ -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 */ diff --git a/src/log-httplog.h b/src/log-httplog.h index 580191fb99..9423358efc 100644 --- a/src/log-httplog.h +++ b/src/log-httplog.h @@ -21,11 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/log-pcap.h b/src/log-pcap.h index 731a365b85..d72848d8f8 100644 --- a/src/log-pcap.h +++ b/src/log-pcap.h @@ -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 */ diff --git a/src/log-stats.h b/src/log-stats.h index f7f536c6dd..84f7b02168 100644 --- a/src/log-stats.h +++ b/src/log-stats.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#ifndef __LOG_STATS_H__ -#define __LOG_STATS_H__ +#ifndef SURICATA_LOG_STATS_H +#define SURICATA_LOG_STATS_H void LogStatsLogRegister(void); diff --git a/src/log-tcp-data.h b/src/log-tcp-data.h index 608dbef309..6c4371793e 100644 --- a/src/log-tcp-data.h +++ b/src/log-tcp-data.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/log-tlslog.h b/src/log-tlslog.h index 87c2fbcf5d..fb01562842 100644 --- a/src/log-tlslog.h +++ b/src/log-tlslog.h @@ -22,8 +22,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/log-tlsstore.h b/src/log-tlsstore.h index c80975bee1..46d052ed96 100644 --- a/src/log-tlsstore.h +++ b/src/log-tlsstore.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/output-eve-stream.h b/src/output-eve-stream.h index a2808b8734..02de059d25 100644 --- a/src/output-eve-stream.h +++ b/src/output-eve-stream.h @@ -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 */ diff --git a/src/output-eve-syslog.h b/src/output-eve-syslog.h index 03d5f3ed80..59529f65b2 100644 --- a/src/output-eve-syslog.h +++ b/src/output-eve-syslog.h @@ -21,9 +21,9 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/output-file.h b/src/output-file.h index 13735b282d..d59d8318b4 100644 --- a/src/output-file.h +++ b/src/output-file.h @@ -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 */ diff --git a/src/output-filedata.h b/src/output-filedata.h index 58764aa81e..316d998dd7 100644 --- a/src/output-filedata.h +++ b/src/output-filedata.h @@ -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 */ diff --git a/src/output-filestore.h b/src/output-filestore.h index ed3b3d80d6..10ae7c833b 100644 --- a/src/output-filestore.h +++ b/src/output-filestore.h @@ -15,10 +15,10 @@ * 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 */ diff --git a/src/output-flow.h b/src/output-flow.h index 2fa26660fe..da9ecf98e9 100644 --- a/src/output-flow.h +++ b/src/output-flow.h @@ -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 */ diff --git a/src/output-json-alert.h b/src/output-json-alert.h index 6a65cc3d27..c963eda09f 100644 --- a/src/output-json-alert.h +++ b/src/output-json-alert.h @@ -24,13 +24,12 @@ * */ -#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 */ diff --git a/src/output-json-anomaly.h b/src/output-json-anomaly.h index 4ca32b21ec..2d88bce3d8 100644 --- a/src/output-json-anomaly.h +++ b/src/output-json-anomaly.h @@ -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); diff --git a/src/output-json-bittorrent-dht.h b/src/output-json-bittorrent-dht.h index 8927f4d159..9396f5a5e8 100644 --- a/src/output-json-bittorrent-dht.h +++ b/src/output-json-bittorrent-dht.h @@ -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 */ diff --git a/src/output-json-dcerpc.h b/src/output-json-dcerpc.h index c139ed066c..9e1a152915 100644 --- a/src/output-json-dcerpc.h +++ b/src/output-json-dcerpc.h @@ -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 */ diff --git a/src/output-json-dhcp.h b/src/output-json-dhcp.h index 682347c713..a889b1f25e 100644 --- a/src/output-json-dhcp.h +++ b/src/output-json-dhcp.h @@ -21,9 +21,9 @@ * \author Jason Ish */ -#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 */ diff --git a/src/output-json-dnp3-objects.h b/src/output-json-dnp3-objects.h index debe115689..fd668d3504 100644 --- a/src/output-json-dnp3-objects.h +++ b/src/output-json-dnp3-objects.h @@ -15,12 +15,12 @@ * 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 */ diff --git a/src/output-json-dnp3.h b/src/output-json-dnp3.h index 6f81026780..064421a0b1 100644 --- a/src/output-json-dnp3.h +++ b/src/output-json-dnp3.h @@ -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 */ diff --git a/src/output-json-dns.h b/src/output-json-dns.h index f46cad0110..1fe11427b3 100644 --- a/src/output-json-dns.h +++ b/src/output-json-dns.h @@ -21,11 +21,11 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-json-drop.h b/src/output-json-drop.h index 6415e523f7..a40527af01 100644 --- a/src/output-json-drop.h +++ b/src/output-json-drop.h @@ -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 */ diff --git a/src/output-json-email-common.h b/src/output-json-email-common.h index e225f28822..8331782189 100644 --- a/src/output-json-email-common.h +++ b/src/output-json-email-common.h @@ -21,8 +21,8 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-json-file.h b/src/output-json-file.h index bdd6a86ba9..e2eeeccb2f 100644 --- a/src/output-json-file.h +++ b/src/output-json-file.h @@ -21,8 +21,8 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-json-flow.h b/src/output-json-flow.h index 871968ac5e..e334315e56 100644 --- a/src/output-json-flow.h +++ b/src/output-json-flow.h @@ -21,11 +21,11 @@ * Victor Julien */ -#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 */ diff --git a/src/output-json-frame.h b/src/output-json-frame.h index 009e7b6426..c6883f2626 100644 --- a/src/output-json-frame.h +++ b/src/output-json-frame.h @@ -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 */ diff --git a/src/output-json-ftp.h b/src/output-json-ftp.h index 704defd958..b87eebe2cc 100644 --- a/src/output-json-ftp.h +++ b/src/output-json-ftp.h @@ -21,10 +21,10 @@ * \author Jeff Lucovsky */ -#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 */ diff --git a/src/output-json-http.h b/src/output-json-http.h index cb358a4b31..eb077d1756 100644 --- a/src/output-json-http.h +++ b/src/output-json-http.h @@ -21,8 +21,8 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-json-http2.h b/src/output-json-http2.h index 88ba420ab2..2b30fd7901 100644 --- a/src/output-json-http2.h +++ b/src/output-json-http2.h @@ -21,9 +21,9 @@ * \author Philippe Antoine */ -#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 */ diff --git a/src/output-json-ike.h b/src/output-json-ike.h index af5188b19e..b4cbb602e4 100644 --- a/src/output-json-ike.h +++ b/src/output-json-ike.h @@ -21,11 +21,11 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/output-json-krb5.h b/src/output-json-krb5.h index 87f5b79136..33c7f95677 100644 --- a/src/output-json-krb5.h +++ b/src/output-json-krb5.h @@ -21,9 +21,9 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/output-json-metadata.h b/src/output-json-metadata.h index 5db22cf507..a1aeb2525e 100644 --- a/src/output-json-metadata.h +++ b/src/output-json-metadata.h @@ -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 */ diff --git a/src/output-json-modbus.h b/src/output-json-modbus.h index 2b07e4eb2d..4c104964a2 100644 --- a/src/output-json-modbus.h +++ b/src/output-json-modbus.h @@ -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 */ diff --git a/src/output-json-mqtt.h b/src/output-json-mqtt.h index 42d66f4868..31dfab4c7d 100644 --- a/src/output-json-mqtt.h +++ b/src/output-json-mqtt.h @@ -21,10 +21,10 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/output-json-netflow.h b/src/output-json-netflow.h index 738c497fd8..c3fbefa9cd 100644 --- a/src/output-json-netflow.h +++ b/src/output-json-netflow.h @@ -21,8 +21,8 @@ * Victor Julien */ -#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); diff --git a/src/output-json-nfs.h b/src/output-json-nfs.h index b2022ea533..5d8903e1f3 100644 --- a/src/output-json-nfs.h +++ b/src/output-json-nfs.h @@ -21,12 +21,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/output-json-pgsql.h b/src/output-json-pgsql.h index 7d2e826135..78eca152d6 100644 --- a/src/output-json-pgsql.h +++ b/src/output-json-pgsql.h @@ -21,9 +21,9 @@ * \author Juliana Fajardini */ -#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 */ diff --git a/src/output-json-quic.h b/src/output-json-quic.h index 48e38185f2..a93a4dff02 100644 --- a/src/output-json-quic.h +++ b/src/output-json-quic.h @@ -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 */ diff --git a/src/output-json-rdp.h b/src/output-json-rdp.h index 5dc9237691..9a400c9a2d 100644 --- a/src/output-json-rdp.h +++ b/src/output-json-rdp.h @@ -21,9 +21,9 @@ * \author Zach Kelly */ -#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 */ diff --git a/src/output-json-rfb.h b/src/output-json-rfb.h index 7e4e48ebd4..4411963b9b 100644 --- a/src/output-json-rfb.h +++ b/src/output-json-rfb.h @@ -21,9 +21,9 @@ * \author Frank Honza */ -#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 */ diff --git a/src/output-json-sip.h b/src/output-json-sip.h index 0d2c53fa50..1d47e5ada2 100644 --- a/src/output-json-sip.h +++ b/src/output-json-sip.h @@ -21,9 +21,9 @@ * \author Giuseppe Longo */ -#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 */ diff --git a/src/output-json-smb.h b/src/output-json-smb.h index da15e813f8..bfb1f0ff16 100644 --- a/src/output-json-smb.h +++ b/src/output-json-smb.h @@ -21,10 +21,10 @@ * \author Victor Julien */ -#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 */ diff --git a/src/output-json-smtp.h b/src/output-json-smtp.h index 9c95f616b3..51fca1ef1e 100644 --- a/src/output-json-smtp.h +++ b/src/output-json-smtp.h @@ -21,10 +21,10 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-json-snmp.h b/src/output-json-snmp.h index 4c88db3231..fa40b0c2f0 100644 --- a/src/output-json-snmp.h +++ b/src/output-json-snmp.h @@ -21,9 +21,9 @@ * \author Pierre Chifflier */ -#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 */ diff --git a/src/output-json-ssh.h b/src/output-json-ssh.h index d0f9d3fc7d..74f24b053b 100644 --- a/src/output-json-ssh.h +++ b/src/output-json-ssh.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/output-json-stats.h b/src/output-json-stats.h index b569e30b64..9647f72916 100644 --- a/src/output-json-stats.h +++ b/src/output-json-stats.h @@ -21,8 +21,8 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-json-template.h b/src/output-json-template.h index d27b8d7c0e..5a91af5932 100644 --- a/src/output-json-template.h +++ b/src/output-json-template.h @@ -21,9 +21,9 @@ * \author FirstName LastName */ -#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 */ diff --git a/src/output-json-tftp.h b/src/output-json-tftp.h index 3db4ba06cd..40bbf7c4d4 100644 --- a/src/output-json-tftp.h +++ b/src/output-json-tftp.h @@ -21,9 +21,9 @@ * \author Clément Galland */ -#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 */ diff --git a/src/output-json-tls.h b/src/output-json-tls.h index 42f706b91d..bd73e2fc96 100644 --- a/src/output-json-tls.h +++ b/src/output-json-tls.h @@ -21,8 +21,8 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-json.h b/src/output-json.h index 6fe6c5898d..961e1204c5 100644 --- a/src/output-json.h +++ b/src/output-json.h @@ -21,8 +21,8 @@ * \author Tom DeCanio */ -#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 */ diff --git a/src/output-lua.h b/src/output-lua.h index c8c5ebbf45..6ef9165aec 100644 --- a/src/output-lua.h +++ b/src/output-lua.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/output-packet.h b/src/output-packet.h index 1e468669f1..4e8d2a65fd 100644 --- a/src/output-packet.h +++ b/src/output-packet.h @@ -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 */ diff --git a/src/output-stats.h b/src/output-stats.h index f6fc6a8b27..56ad2cb78f 100644 --- a/src/output-stats.h +++ b/src/output-stats.h @@ -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 */ diff --git a/src/output-streaming.h b/src/output-streaming.h index 07c3722d8e..91c89f1941 100644 --- a/src/output-streaming.h +++ b/src/output-streaming.h @@ -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 */ diff --git a/src/output-tx.h b/src/output-tx.h index 88c12ff25f..cf7ffe7ff7 100644 --- a/src/output-tx.h +++ b/src/output-tx.h @@ -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 */ diff --git a/src/output.h b/src/output.h index 815b2f20ed..76b432a926 100644 --- a/src/output.h +++ b/src/output.h @@ -21,8 +21,8 @@ * \author Endace Technology Limited, Jason Ish */ -#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 */ diff --git a/src/packet-queue.h b/src/packet-queue.h index 4089870643..09cf0ab2db 100644 --- a/src/packet-queue.h +++ b/src/packet-queue.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/packet.h b/src/packet.h index 0ef2c5d3ab..0b03a59631 100644 --- a/src/packet.h +++ b/src/packet.h @@ -15,8 +15,8 @@ * 02110-1301, USA. */ -#ifndef __PACKET_H__ -#define __PACKET_H__ +#ifndef SURICATA_PACKET_H +#define SURICATA_PACKET_H #include "decode.h" diff --git a/src/pkt-var.h b/src/pkt-var.h index 0a261c9ffa..6acd4f468d 100644 --- a/src/pkt-var.h +++ b/src/pkt-var.h @@ -21,13 +21,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/reputation.h b/src/reputation.h index 3ed94d9851..23bc023338 100644 --- a/src/reputation.h +++ b/src/reputation.h @@ -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 */ diff --git a/src/respond-reject-libnet11.h b/src/respond-reject-libnet11.h index d6d5c2516c..d0337e41eb 100644 --- a/src/respond-reject-libnet11.h +++ b/src/respond-reject-libnet11.h @@ -22,8 +22,8 @@ * \author William Metcalf */ -#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 */ diff --git a/src/respond-reject.h b/src/respond-reject.h index 0df165591c..4dce7262bf 100644 --- a/src/respond-reject.h +++ b/src/respond-reject.h @@ -21,9 +21,8 @@ * \author William Metcalf */ -#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 */ diff --git a/src/runmode-af-packet.h b/src/runmode-af-packet.h index ccaa2c6ae8..b913c53d7e 100644 --- a/src/runmode-af-packet.h +++ b/src/runmode-af-packet.h @@ -20,8 +20,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/runmode-af-xdp.h b/src/runmode-af-xdp.h index faa1c7a65d..9828e8fb27 100644 --- a/src/runmode-af-xdp.h +++ b/src/runmode-af-xdp.h @@ -21,12 +21,12 @@ * \author Richard McConnell */ -#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 */ diff --git a/src/runmode-dpdk.h b/src/runmode-dpdk.h index 152c1d6878..2f96459283 100644 --- a/src/runmode-dpdk.h +++ b/src/runmode-dpdk.h @@ -20,8 +20,8 @@ * \author Lukas Sismis */ -#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 */ diff --git a/src/runmode-erf-dag.h b/src/runmode-erf-dag.h index c4b2a59cee..58f4e144d5 100644 --- a/src/runmode-erf-dag.h +++ b/src/runmode-erf-dag.h @@ -20,8 +20,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/runmode-erf-file.h b/src/runmode-erf-file.h index 54a8ba8972..c760c745fe 100644 --- a/src/runmode-erf-file.h +++ b/src/runmode-erf-file.h @@ -20,12 +20,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/runmode-ipfw.h b/src/runmode-ipfw.h index 5c8345b174..a4d613950f 100644 --- a/src/runmode-ipfw.h +++ b/src/runmode-ipfw.h @@ -20,12 +20,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/runmode-napatech.h b/src/runmode-napatech.h index d77133adda..5a264429d1 100644 --- a/src/runmode-napatech.h +++ b/src/runmode-napatech.h @@ -22,9 +22,8 @@ * \author Matt Keeler */ - -#ifndef __RUNMODE_NAPATECH_H__ -#define __RUNMODE_NAPATECH_H__ +#ifndef SURICATA_RUNMODE_NAPATECH_H +#define SURICATA_RUNMODE_NAPATECH_H #ifdef HAVE_NAPATECH #include @@ -41,5 +40,4 @@ uint16_t NapatechGetNumLastStream(void); bool NapatechIsAutoConfigEnabled(void); bool NapatechUseHWBypass(void); - -#endif /* __RUNMODE_NAPATECH_H__ */ +#endif /* SURICATA_RUNMODE_NAPATECH_H */ diff --git a/src/runmode-netmap.h b/src/runmode-netmap.h index 6ba9445b08..16551e2c89 100644 --- a/src/runmode-netmap.h +++ b/src/runmode-netmap.h @@ -20,8 +20,8 @@ * \author Aleksey Katargin */ -#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 */ diff --git a/src/runmode-nflog.h b/src/runmode-nflog.h index 034a074cb9..38598873c9 100644 --- a/src/runmode-nflog.h +++ b/src/runmode-nflog.h @@ -20,10 +20,10 @@ * * \author Giuseppe Longo */ -#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 */ diff --git a/src/runmode-nfq.h b/src/runmode-nfq.h index 6ad8801466..5a7b4349cc 100644 --- a/src/runmode-nfq.h +++ b/src/runmode-nfq.h @@ -20,12 +20,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/runmode-pcap-file.h b/src/runmode-pcap-file.h index 52cab02228..54fbad72a9 100644 --- a/src/runmode-pcap-file.h +++ b/src/runmode-pcap-file.h @@ -20,12 +20,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/runmode-pcap.h b/src/runmode-pcap.h index b68c6ddcfc..54a96c5d3f 100644 --- a/src/runmode-pcap.h +++ b/src/runmode-pcap.h @@ -20,12 +20,12 @@ * \author Victor Julien */ -#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 */ diff --git a/src/runmode-pfring.h b/src/runmode-pfring.h index 316c82f74a..dbdc60091f 100644 --- a/src/runmode-pfring.h +++ b/src/runmode-pfring.h @@ -20,8 +20,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/runmode-unittests.h b/src/runmode-unittests.h index 928e22bd5e..f1a2dab340 100644 --- a/src/runmode-unittests.h +++ b/src/runmode-unittests.h @@ -20,11 +20,10 @@ * \author Eric Leblond */ - -#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 */ diff --git a/src/runmode-unix-socket.h b/src/runmode-unix-socket.h index af0651f591..8ea432f57d 100644 --- a/src/runmode-unix-socket.h +++ b/src/runmode-unix-socket.h @@ -20,8 +20,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/runmode-windivert.h b/src/runmode-windivert.h index 5071fcf7a8..e98d311ee2 100644 --- a/src/runmode-windivert.h +++ b/src/runmode-windivert.h @@ -22,11 +22,11 @@ * */ -#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 diff --git a/src/runmodes.h b/src/runmodes.h index 668896dc17..af39fe1376 100644 --- a/src/runmodes.h +++ b/src/runmodes.h @@ -20,8 +20,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/rust-context.h b/src/rust-context.h index ba99ac6b72..bbb0253ec6 100644 --- a/src/rust-context.h +++ b/src/rust-context.h @@ -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 */ diff --git a/src/rust.h b/src/rust.h index 8ab174f9ec..03cff24c8d 100644 --- a/src/rust.h +++ b/src/rust.h @@ -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 */ diff --git a/src/source-af-packet.h b/src/source-af-packet.h index d91d0cb252..6785f2fb52 100644 --- a/src/source-af-packet.h +++ b/src/source-af-packet.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/source-af-xdp.h b/src/source-af-xdp.h index 3c78a639bc..70a56a13fa 100644 --- a/src/source-af-xdp.h +++ b/src/source-af-xdp.h @@ -21,8 +21,8 @@ * \author Richard McConnell */ -#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 */ diff --git a/src/source-dpdk.h b/src/source-dpdk.h index b962d866d4..3187793e2c 100644 --- a/src/source-dpdk.h +++ b/src/source-dpdk.h @@ -21,8 +21,8 @@ * \author Lukas Sismis */ -#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 */ diff --git a/src/source-erf-dag.h b/src/source-erf-dag.h index e712798b87..6a169c084e 100644 --- a/src/source-erf-dag.h +++ b/src/source-erf-dag.h @@ -22,11 +22,10 @@ * \author Jason MacLulich */ -#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 */ diff --git a/src/source-erf-file.h b/src/source-erf-file.h index fc56f74385..4ea4e12a44 100644 --- a/src/source-erf-file.h +++ b/src/source-erf-file.h @@ -21,10 +21,10 @@ * \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 */ diff --git a/src/source-ipfw.h b/src/source-ipfw.h index 94c560a4ba..d74b73e526 100644 --- a/src/source-ipfw.h +++ b/src/source-ipfw.h @@ -22,8 +22,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/source-napatech.h b/src/source-napatech.h index c638f89dae..4a874ae37b 100644 --- a/src/source-napatech.h +++ b/src/source-napatech.h @@ -21,8 +21,8 @@ * \author nPulse Technologies, LLC. * \author Matt Keeler */ -#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 */ diff --git a/src/source-netmap.h b/src/source-netmap.h index b60d544d5c..810752aa38 100644 --- a/src/source-netmap.h +++ b/src/source-netmap.h @@ -22,8 +22,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/source-nflog.h b/src/source-nflog.h index 98dd9edf20..805d6ccbaf 100644 --- a/src/source-nflog.h +++ b/src/source-nflog.h @@ -21,8 +21,8 @@ * \author Giuseppe Longo */ -#ifndef __SOURCE_NFLOG_H__ -#define __SOURCE_NFLOG_H__ +#ifndef SURICATA_SOURCE_NFLOG_H +#define SURICATA_SOURCE_NFLOG_H #ifdef HAVE_NFLOG #include @@ -63,4 +63,4 @@ typedef struct NFLOGPacketVars_ void TmModuleReceiveNFLOGRegister(void); void TmModuleDecodeNFLOGRegister(void); -#endif /* __SOURCE_NFLOG_H__ */ +#endif /* SURICATA_SOURCE_NFLOG_H */ diff --git a/src/source-nfq-prototypes.h b/src/source-nfq-prototypes.h index eef25884b7..4067be78b4 100644 --- a/src/source-nfq-prototypes.h +++ b/src/source-nfq-prototypes.h @@ -21,12 +21,11 @@ * \author Victor Julien */ -#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 */ diff --git a/src/source-nfq.h b/src/source-nfq.h index b60e6d9cc5..66ea0ba16f 100644 --- a/src/source-nfq.h +++ b/src/source-nfq.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/source-pcap-file-directory-helper.h b/src/source-pcap-file-directory-helper.h index 6e32c044d8..b1230b85e9 100644 --- a/src/source-pcap-file-directory-helper.h +++ b/src/source-pcap-file-directory-helper.h @@ -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 */ diff --git a/src/source-pcap-file-helper.h b/src/source-pcap-file-helper.h index 7db83b1559..ec5444887f 100644 --- a/src/source-pcap-file-helper.h +++ b/src/source-pcap-file-helper.h @@ -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 */ diff --git a/src/source-pcap-file.h b/src/source-pcap-file.h index 30a3c2ec69..afc77787f6 100644 --- a/src/source-pcap-file.h +++ b/src/source-pcap-file.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/source-pcap.h b/src/source-pcap.h index 5ac36f9bac..51f68aa6b8 100644 --- a/src/source-pcap.h +++ b/src/source-pcap.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/source-pfring.h b/src/source-pfring.h index 6b170ee78d..742e0ac6cb 100644 --- a/src/source-pfring.h +++ b/src/source-pfring.h @@ -21,8 +21,8 @@ * \author William Metcalf */ -#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 */ diff --git a/src/source-windivert-prototypes.h b/src/source-windivert-prototypes.h index acb0d7f8ab..138226b587 100644 --- a/src/source-windivert-prototypes.h +++ b/src/source-windivert-prototypes.h @@ -21,11 +21,11 @@ * \author Jacob Masen-Smith */ -#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 */ diff --git a/src/source-windivert.h b/src/source-windivert.h index 71574993ec..a8f022c2de 100644 --- a/src/source-windivert.h +++ b/src/source-windivert.h @@ -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 diff --git a/src/stream-tcp-cache.h b/src/stream-tcp-cache.h index fc67bc82eb..47bc19daf0 100644 --- a/src/stream-tcp-cache.h +++ b/src/stream-tcp-cache.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/stream-tcp-inline.h b/src/stream-tcp-inline.h index 515c6fd650..95f46aec9e 100644 --- a/src/stream-tcp-inline.h +++ b/src/stream-tcp-inline.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/stream-tcp-list.h b/src/stream-tcp-list.h index 5612354a86..c003bac07e 100644 --- a/src/stream-tcp-list.h +++ b/src/stream-tcp-list.h @@ -21,12 +21,11 @@ * \author Victor Julien */ -#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 */ diff --git a/src/stream-tcp-private.h b/src/stream-tcp-private.h index 619398deb7..7321f941b7 100644 --- a/src/stream-tcp-private.h +++ b/src/stream-tcp-private.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/stream-tcp-reassemble.h b/src/stream-tcp-reassemble.h index 6f761fc0b4..b71be74b7f 100644 --- a/src/stream-tcp-reassemble.h +++ b/src/stream-tcp-reassemble.h @@ -22,8 +22,8 @@ * \author Gurvinder Singh */ -#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 */ diff --git a/src/stream-tcp-sack.h b/src/stream-tcp-sack.h index 84e7cb1bdf..789b5912d9 100644 --- a/src/stream-tcp-sack.h +++ b/src/stream-tcp-sack.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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*/ diff --git a/src/stream-tcp-util.h b/src/stream-tcp-util.h index fe05537e33..4b699a41a3 100644 --- a/src/stream-tcp-util.h +++ b/src/stream-tcp-util.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/stream-tcp.h b/src/stream-tcp.h index ff8a0998cb..07c443e9d1 100644 --- a/src/stream-tcp.h +++ b/src/stream-tcp.h @@ -22,8 +22,8 @@ * \author Gurvinder Singh */ -#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 */ diff --git a/src/stream.h b/src/stream.h index 4821dc9981..a132606a41 100644 --- a/src/stream.h +++ b/src/stream.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/suricata-common.h b/src/suricata-common.h index 23bf6335ea..30fa7998e0 100644 --- a/src/suricata-common.h +++ b/src/suricata-common.h @@ -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 */ diff --git a/src/suricata-plugin.h b/src/suricata-plugin.h index 3296b51397..cb2c667eae 100644 --- a/src/suricata-plugin.h +++ b/src/suricata-plugin.h @@ -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 #include diff --git a/src/suricata.h b/src/suricata.h index 9d275edc5d..fe95974e11 100644 --- a/src/suricata.h +++ b/src/suricata.h @@ -61,8 +61,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/threads-debug.h b/src/threads-debug.h index 2946d9140f..cff56a0a47 100644 --- a/src/threads-debug.h +++ b/src/threads-debug.h @@ -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 */ diff --git a/src/threads-profile.h b/src/threads-profile.h index 43606ae982..5e6c374e3b 100644 --- a/src/threads-profile.h +++ b/src/threads-profile.h @@ -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" diff --git a/src/threads.h b/src/threads.h index a9942b9746..e2b0daa07c 100644 --- a/src/threads.h +++ b/src/threads.h @@ -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 */ diff --git a/src/threadvars.h b/src/threadvars.h index ea448c0949..cebcdb4e3a 100644 --- a/src/threadvars.h +++ b/src/threadvars.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/tm-modules.h b/src/tm-modules.h index 0e7df648c6..5788e66f58 100644 --- a/src/tm-modules.h +++ b/src/tm-modules.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/tm-queuehandlers.h b/src/tm-queuehandlers.h index eb0081bba6..6820d8d666 100644 --- a/src/tm-queuehandlers.h +++ b/src/tm-queuehandlers.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/tm-queues.h b/src/tm-queues.h index a203b66623..ef0490cc92 100644 --- a/src/tm-queues.h +++ b/src/tm-queues.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h index 47b501c078..fa9a731b0d 100644 --- a/src/tm-threads-common.h +++ b/src/tm-threads-common.h @@ -22,8 +22,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/tm-threads.h b/src/tm-threads.h index 4ca55f9bc7..f98a42fe61 100644 --- a/src/tm-threads.h +++ b/src/tm-threads.h @@ -22,8 +22,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/tmqh-flow.h b/src/tmqh-flow.h index 3cec7a165f..e3513d0998 100644 --- a/src/tmqh-flow.h +++ b/src/tmqh-flow.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/tmqh-packetpool.h b/src/tmqh-packetpool.h index 74074f9533..8d274c9e12 100644 --- a/src/tmqh-packetpool.h +++ b/src/tmqh-packetpool.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/tmqh-simple.h b/src/tmqh-simple.h index d80de50852..1a4677a575 100644 --- a/src/tmqh-simple.h +++ b/src/tmqh-simple.h @@ -21,9 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-action.h b/src/util-action.h index 6c96ba08b6..fbd5155e4b 100644 --- a/src/util-action.h +++ b/src/util-action.h @@ -21,8 +21,8 @@ * \author Pablo Rincon */ -#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 */ diff --git a/src/util-affinity.h b/src/util-affinity.h index ef3c556498..2fa4509ffa 100644 --- a/src/util-affinity.h +++ b/src/util-affinity.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/util-atomic.h b/src/util-atomic.h index 5f23571430..84f1aa078e 100644 --- a/src/util-atomic.h +++ b/src/util-atomic.h @@ -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 @@ -393,5 +392,4 @@ void SCAtomicRegisterTests(void); -#endif /* __UTIL_ATOMIC_H__ */ - +#endif /* SURICATA_UTIL_ATOMIC_H */ diff --git a/src/util-base64.h b/src/util-base64.h index 53cc14c9c4..744b849d87 100644 --- a/src/util-base64.h +++ b/src/util-base64.h @@ -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" diff --git a/src/util-bloomfilter-counting.h b/src/util-bloomfilter-counting.h index bdb0cfa09c..1614de1ac7 100644 --- a/src/util-bloomfilter-counting.h +++ b/src/util-bloomfilter-counting.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-bloomfilter.h b/src/util-bloomfilter.h index b6dee868a5..2eecdf3d7d 100644 --- a/src/util-bloomfilter.h +++ b/src/util-bloomfilter.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-bpf.h b/src/util-bpf.h index 8196077f8a..5291ba7f7d 100644 --- a/src/util-bpf.h +++ b/src/util-bpf.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/util-buffer.h b/src/util-buffer.h index 3a88c8e96b..a396cc71ff 100644 --- a/src/util-buffer.h +++ b/src/util-buffer.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-byte.h b/src/util-byte.h index ae3e1d2a69..e0f0a67c27 100644 --- a/src/util-byte.h +++ b/src/util-byte.h @@ -21,8 +21,8 @@ * \author Brian Rectanus */ -#ifndef __UTIL_BYTE_H__ -#define __UTIL_BYTE_H__ +#ifndef SURICATA_UTIL_BYTE_H +#define SURICATA_UTIL_BYTE_H #include @@ -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 */ diff --git a/src/util-checksum.h b/src/util-checksum.h index c7b056bdd8..7305f49dd8 100644 --- a/src/util-checksum.h +++ b/src/util-checksum.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#ifndef __UTIL_CHECKSUM_H__ -#define __UTIL_CHECKSUM_H__ +#ifndef SURICATA_UTIL_CHECKSUM_H +#define SURICATA_UTIL_CHECKSUM_H #include "decode.h" diff --git a/src/util-cidr.h b/src/util-cidr.h index 745f67823c..157d0f2945 100644 --- a/src/util-cidr.h +++ b/src/util-cidr.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-classification-config.h b/src/util-classification-config.h index 9ac00c85d0..a5d8026ca3 100644 --- a/src/util-classification-config.h +++ b/src/util-classification-config.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-clock.h b/src/util-clock.h index cb6c17623f..2d4d0d6356 100644 --- a/src/util-clock.h +++ b/src/util-clock.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#ifndef __UTIL_CLOCK_H__ -#define __UTIL_CLOCK_H__ +#ifndef SURICATA_UTIL_CLOCK_H +#define SURICATA_UTIL_CLOCK_H #include @@ -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 */ diff --git a/src/util-conf.h b/src/util-conf.h index 1006c850cf..30fa5f4e46 100644 --- a/src/util-conf.h +++ b/src/util-conf.h @@ -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 */ diff --git a/src/util-config.h b/src/util-config.h index 92017d5021..49f4ec80b1 100644 --- a/src/util-config.h +++ b/src/util-config.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#ifndef __UTIL_CONFIG_H__ -#define __UTIL_CONFIG_H__ +#ifndef SURICATA_UTIL_CONFIG_H +#define SURICATA_UTIL_CONFIG_H enum ConfigAction { CONFIG_ACTION_SET = 1, diff --git a/src/util-coredump-config.h b/src/util-coredump-config.h index 168ffc9b04..c5e01f4d3e 100644 --- a/src/util-coredump-config.h +++ b/src/util-coredump-config.h @@ -21,12 +21,12 @@ * \author Eileen Donlon */ -#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 */ diff --git a/src/util-cpu.h b/src/util-cpu.h index e0b651f329..4799490ee0 100644 --- a/src/util-cpu.h +++ b/src/util-cpu.h @@ -21,8 +21,8 @@ * \author Pablo Rincon Crespo */ -#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 */ diff --git a/src/util-daemon.h b/src/util-daemon.h index 424d7093ea..ff5e73c8fe 100644 --- a/src/util-daemon.h +++ b/src/util-daemon.h @@ -21,8 +21,8 @@ * \author Gerardo Iglesias Galvan */ -#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 */ diff --git a/src/util-datalink.h b/src/util-datalink.h index 8f25bd7034..024dabe9f8 100644 --- a/src/util-datalink.h +++ b/src/util-datalink.h @@ -15,11 +15,11 @@ * 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 */ diff --git a/src/util-debug-filters.h b/src/util-debug-filters.h index 26c9ec9c88..5007f7b967 100644 --- a/src/util-debug-filters.h +++ b/src/util-debug-filters.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-debug.h b/src/util-debug.h index 296cf89651..cb22e90973 100644 --- a/src/util-debug.h +++ b/src/util-debug.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-device.h b/src/util-device.h index d5a2d46caf..8e5cedbbd0 100644 --- a/src/util-device.h +++ b/src/util-device.h @@ -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 @@ -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 */ diff --git a/src/util-ebpf.h b/src/util-ebpf.h index bf1768a69d..55c1fd608a 100644 --- a/src/util-ebpf.h +++ b/src/util-ebpf.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#ifndef __UTIL_EBPF_H__ -#define __UTIL_EBPF_H__ +#ifndef SURICATA_UTIL_EBPF_H +#define SURICATA_UTIL_EBPF_H #include "flow-bypass.h" diff --git a/src/util-enum.h b/src/util-enum.h index ea88fc4b44..557bf4632e 100644 --- a/src/util-enum.h +++ b/src/util-enum.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-error.h b/src/util-error.h index f1bc80dd7c..b345d75ef4 100644 --- a/src/util-error.h +++ b/src/util-error.h @@ -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 */ diff --git a/src/util-exception-policy.h b/src/util-exception-policy.h index 7b27e13211..012888fce3 100644 --- a/src/util-exception-policy.h +++ b/src/util-exception-policy.h @@ -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" diff --git a/src/util-file-decompression.h b/src/util-file-decompression.h index 043d683191..e62f6a5e4d 100644 --- a/src/util-file-decompression.h +++ b/src/util-file-decompression.h @@ -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 */ diff --git a/src/util-file-swf-decompression.h b/src/util-file-swf-decompression.h index 65ac74add1..be46aec9b8 100644 --- a/src/util-file-swf-decompression.h +++ b/src/util-file-swf-decompression.h @@ -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 */ diff --git a/src/util-file.h b/src/util-file.h index 55d91192fe..784d5de398 100644 --- a/src/util-file.h +++ b/src/util-file.h @@ -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 */ diff --git a/src/util-fmemopen.h b/src/util-fmemopen.h index 4b558eaf98..ce3e25f933 100644 --- a/src/util-fmemopen.h +++ b/src/util-fmemopen.h @@ -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 #include #include @@ -52,4 +52,4 @@ FILE *SCFmemopen(void *, size_t, const char *); #define SCFmemopen fmemopen #endif -#endif /* __FMEMOPEN_H__ */ +#endif /* SURICATA_FMEMOPEN_H */ diff --git a/src/util-hash-lookup3.h b/src/util-hash-lookup3.h index 7ef4cf5d06..62d3d14270 100644 --- a/src/util-hash-lookup3.h +++ b/src/util-hash-lookup3.h @@ -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 */ diff --git a/src/util-hash-string.h b/src/util-hash-string.h index 7153af800d..9d1eaa0769 100644 --- a/src/util-hash-string.h +++ b/src/util-hash-string.h @@ -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 */ diff --git a/src/util-hash.h b/src/util-hash.h index f161118874..1f25cfdf07 100644 --- a/src/util-hash.h +++ b/src/util-hash.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-hashlist.h b/src/util-hashlist.h index bca74c9871..cfbc0287df 100644 --- a/src/util-hashlist.h +++ b/src/util-hashlist.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-host-info.h b/src/util-host-info.h index b3a5e47a30..100b56801c 100644 --- a/src/util-host-info.h +++ b/src/util-host-info.h @@ -21,9 +21,9 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/util-host-os-info.h b/src/util-host-os-info.h index e83f470e95..d597ed3345 100644 --- a/src/util-host-os-info.h +++ b/src/util-host-os-info.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-hyperscan.h b/src/util-hyperscan.h index 67bcabf49d..661055a260 100644 --- a/src/util-hyperscan.h +++ b/src/util-hyperscan.h @@ -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 */ diff --git a/src/util-ip.h b/src/util-ip.h index d0bcc884f1..c5ba35b562 100644 --- a/src/util-ip.h +++ b/src/util-ip.h @@ -22,8 +22,8 @@ * \author Duarte Silva */ -#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 */ diff --git a/src/util-ja3.h b/src/util-ja3.h index 5a0f8c508e..e9d192ddbe 100644 --- a/src/util-ja3.h +++ b/src/util-ja3.h @@ -21,8 +21,8 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/util-landlock.h b/src/util-landlock.h index 5c090435c0..9d6c61dccb 100644 --- a/src/util-landlock.h +++ b/src/util-landlock.h @@ -21,11 +21,11 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/util-log-redis.h b/src/util-log-redis.h index 12e87dee4a..f53669a195 100644 --- a/src/util-log-redis.h +++ b/src/util-log-redis.h @@ -21,8 +21,8 @@ * \author Paulo Pacheco */ -#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 @@ -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 */ diff --git a/src/util-logopenfile.h b/src/util-logopenfile.h index bbb5211cda..e225be4890 100644 --- a/src/util-logopenfile.h +++ b/src/util-logopenfile.h @@ -21,8 +21,8 @@ * \author Mike Pomraning */ -#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 */ diff --git a/src/util-lua-common.h b/src/util-lua-common.h index 2e0df28751..c7a23a0430 100644 --- a/src/util-lua-common.h +++ b/src/util-lua-common.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-lua-dnp3-objects.h b/src/util-lua-dnp3-objects.h index 6575695a26..98bf2cdb56 100644 --- a/src/util-lua-dnp3-objects.h +++ b/src/util-lua-dnp3-objects.h @@ -15,10 +15,10 @@ * 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 */ diff --git a/src/util-lua-dnp3.h b/src/util-lua-dnp3.h index 3430e41b22..4b656599f0 100644 --- a/src/util-lua-dnp3.h +++ b/src/util-lua-dnp3.h @@ -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 */ diff --git a/src/util-lua-dns.h b/src/util-lua-dns.h index 582fdea757..f9bdc0b290 100644 --- a/src/util-lua-dns.h +++ b/src/util-lua-dns.h @@ -21,8 +21,8 @@ * \author Eric Leblond */ -#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 diff --git a/src/util-lua-hassh.h b/src/util-lua-hassh.h index 96e8ae6efd..733233542e 100644 --- a/src/util-lua-hassh.h +++ b/src/util-lua-hassh.h @@ -21,8 +21,8 @@ * \author Vadym Malakhatko */ -#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 */ diff --git a/src/util-lua-http.h b/src/util-lua-http.h index 8a75ec53e7..1e44c8599f 100644 --- a/src/util-lua-http.h +++ b/src/util-lua-http.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-lua-ja3.h b/src/util-lua-ja3.h index 4bad867a4a..84deb160a7 100644 --- a/src/util-lua-ja3.h +++ b/src/util-lua-ja3.h @@ -21,8 +21,8 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/util-lua-smtp.h b/src/util-lua-smtp.h index 26750b8fbf..6c695051c3 100644 --- a/src/util-lua-smtp.h +++ b/src/util-lua-smtp.h @@ -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 */ diff --git a/src/util-lua-ssh.h b/src/util-lua-ssh.h index aa6b6d7042..88f9972175 100644 --- a/src/util-lua-ssh.h +++ b/src/util-lua-ssh.h @@ -21,8 +21,8 @@ * \author Mats Klepsland */ -#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 */ diff --git a/src/util-lua-tls.h b/src/util-lua-tls.h index 57a27b5500..3e4c08d435 100644 --- a/src/util-lua-tls.h +++ b/src/util-lua-tls.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-lua.h b/src/util-lua.h index 471692526c..ef15d93652 100644 --- a/src/util-lua.h +++ b/src/util-lua.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-luajit.h b/src/util-luajit.h index b90cef431b..83964f6fab 100644 --- a/src/util-luajit.h +++ b/src/util-luajit.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-macset.h b/src/util-macset.h index 1b17255593..82a3527733 100644 --- a/src/util-macset.h +++ b/src/util-macset.h @@ -21,8 +21,8 @@ * \author Sascha Steinbiss */ -#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 */ diff --git a/src/util-magic.h b/src/util-magic.h index 86202dc5a6..d120fec78a 100644 --- a/src/util-magic.h +++ b/src/util-magic.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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); diff --git a/src/util-mem.h b/src/util-mem.h index 56a7b22c78..8ddd2725fb 100644 --- a/src/util-mem.h +++ b/src/util-mem.h @@ -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 */ diff --git a/src/util-memcmp.h b/src/util-memcmp.h index 47bfc98c9a..f9fc75357c 100644 --- a/src/util-memcmp.h +++ b/src/util-memcmp.h @@ -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 */ diff --git a/src/util-memcpy.h b/src/util-memcpy.h index 67e5ce7add..6d1d5e68fc 100644 --- a/src/util-memcpy.h +++ b/src/util-memcpy.h @@ -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 */ diff --git a/src/util-memrchr.h b/src/util-memrchr.h index c3b5c8d893..0a5ddfb85d 100644 --- a/src/util-memrchr.h +++ b/src/util-memrchr.h @@ -20,11 +20,11 @@ * */ -#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 */ diff --git a/src/util-misc.h b/src/util-misc.h index a3d398d92f..ac23b9777f 100644 --- a/src/util-misc.h +++ b/src/util-misc.h @@ -21,9 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-mpm-ac-ks.h b/src/util-mpm-ac-ks.h index 4979f84241..f840d5bb90 100644 --- a/src/util-mpm-ac-ks.h +++ b/src/util-mpm-ac-ks.h @@ -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 */ diff --git a/src/util-mpm-ac.h b/src/util-mpm-ac.h index 3e8ec9db5b..f6cbe512b7 100644 --- a/src/util-mpm-ac.h +++ b/src/util-mpm-ac.h @@ -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 */ diff --git a/src/util-mpm-hs.h b/src/util-mpm-hs.h index 4778ab8501..09deb5ff99 100644 --- a/src/util-mpm-hs.h +++ b/src/util-mpm-hs.h @@ -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 */ diff --git a/src/util-mpm.h b/src/util-mpm.h index 96cbeadb21..c3b12d8a1a 100644 --- a/src/util-mpm.h +++ b/src/util-mpm.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-napatech.h b/src/util-napatech.h index 45d4ddf678..0cc0f7c2e0 100644 --- a/src/util-napatech.h +++ b/src/util-napatech.h @@ -20,8 +20,8 @@ * \author Phil Young * */ -#ifndef __UTIL_NAPATECH_H__ -#define __UTIL_NAPATECH_H__ +#ifndef SURICATA_UTIL_NAPATECH_H +#define SURICATA_UTIL_NAPATECH_H #ifdef HAVE_NAPATECH #include @@ -118,4 +118,4 @@ int NapatechIsBypassSupported(void); #endif /* NAPATECH_ENABLE_BYPASS */ #endif /* HAVE_NAPATECH */ -#endif /* __UTIL_NAPATECH_H__ */ +#endif /* SURICATA_UTIL_NAPATECH_H */ diff --git a/src/util-optimize.h b/src/util-optimize.h index bde35ddd81..3db8c16e71 100644 --- a/src/util-optimize.h +++ b/src/util-optimize.h @@ -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 */ diff --git a/src/util-pages.h b/src/util-pages.h index 0376391477..238b90f6b9 100644 --- a/src/util-pages.h +++ b/src/util-pages.h @@ -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 */ diff --git a/src/util-path.h b/src/util-path.h index 141b6fc247..fee58eabd3 100644 --- a/src/util-path.h +++ b/src/util-path.h @@ -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 */ diff --git a/src/util-pidfile.h b/src/util-pidfile.h index ef071f4e84..07a3e65ee3 100644 --- a/src/util-pidfile.h +++ b/src/util-pidfile.h @@ -22,12 +22,11 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-plugin.h b/src/util-plugin.h index c958f2d79c..7b5531c816 100644 --- a/src/util-plugin.h +++ b/src/util-plugin.h @@ -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 */ diff --git a/src/util-pool-thread.h b/src/util-pool-thread.h index 44b76e75e2..7d6ad1f1a5 100644 --- a/src/util-pool-thread.h +++ b/src/util-pool-thread.h @@ -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 */ /** * @} diff --git a/src/util-pool.h b/src/util-pool.h index cb82ff6da0..a2cc68d531 100644 --- a/src/util-pool.h +++ b/src/util-pool.h @@ -27,8 +27,8 @@ * \author Victor Julien */ -#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 */ /** * @} diff --git a/src/util-port-interval-tree.h b/src/util-port-interval-tree.h index 0eda61b72a..d84c3527bb 100644 --- a/src/util-port-interval-tree.h +++ b/src/util-port-interval-tree.h @@ -21,9 +21,9 @@ * \author Shivani Bhardwaj */ -#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 */ diff --git a/src/util-prefilter.h b/src/util-prefilter.h index 67c24d6c9d..51a65c55b4 100644 --- a/src/util-prefilter.h +++ b/src/util-prefilter.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-print.h b/src/util-print.h index 249ec20f73..debb8953bc 100644 --- a/src/util-print.h +++ b/src/util-print.h @@ -21,10 +21,8 @@ * \author Victor Julien */ - - -#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 */ diff --git a/src/util-profiling-locks.h b/src/util-profiling-locks.h index 08d745a721..9a973d30a7 100644 --- a/src/util-profiling-locks.h +++ b/src/util-profiling-locks.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-profiling.h b/src/util-profiling.h index 6450bc8cef..21b60a3c19 100644 --- a/src/util-profiling.h +++ b/src/util-profiling.h @@ -22,8 +22,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-proto-name.h b/src/util-proto-name.h index bc5037395a..23b1984463 100644 --- a/src/util-proto-name.h +++ b/src/util-proto-name.h @@ -21,8 +21,8 @@ * \author Gurvinder Singh */ -#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 */ diff --git a/src/util-radix-tree.h b/src/util-radix-tree.h index c43e14eb01..240c269073 100644 --- a/src/util-radix-tree.h +++ b/src/util-radix-tree.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-random.h b/src/util-random.h index 6376c05a3a..aa846854e8 100644 --- a/src/util-random.h +++ b/src/util-random.h @@ -21,10 +21,9 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-reference-config.h b/src/util-reference-config.h index 5334fd7c42..c21c51622b 100644 --- a/src/util-reference-config.h +++ b/src/util-reference-config.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-rohash.h b/src/util-rohash.h index 3b044274a5..ee530f6cab 100644 --- a/src/util-rohash.h +++ b/src/util-rohash.h @@ -21,9 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-rule-vars.h b/src/util-rule-vars.h index a5be2fa3a3..0e198b745b 100644 --- a/src/util-rule-vars.h +++ b/src/util-rule-vars.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-runmodes.h b/src/util-runmodes.h index 419f9f9511..d1e4c80208 100644 --- a/src/util-runmodes.h +++ b/src/util-runmodes.h @@ -20,8 +20,8 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/util-running-modes.h b/src/util-running-modes.h index ca3bc8c28d..83a52d90a9 100644 --- a/src/util-running-modes.h +++ b/src/util-running-modes.h @@ -20,10 +20,10 @@ * \author Eric Leblond */ -#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 */ diff --git a/src/util-signal.h b/src/util-signal.h index 1d5ba3973e..7061b6bb73 100644 --- a/src/util-signal.h +++ b/src/util-signal.h @@ -21,8 +21,8 @@ * \author Anoop Saldanha */ -#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 */ diff --git a/src/util-spm-bm.h b/src/util-spm-bm.h index 6c0afbc3d7..42e4c90ec4 100644 --- a/src/util-spm-bm.h +++ b/src/util-spm-bm.h @@ -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 */ diff --git a/src/util-spm-bs.h b/src/util-spm-bs.h index ddd9302390..87f028ab63 100644 --- a/src/util-spm-bs.h +++ b/src/util-spm-bs.h @@ -22,8 +22,8 @@ * \author Pablo Rincon Crespo */ -#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 */ diff --git a/src/util-spm-bs2bm.h b/src/util-spm-bs2bm.h index 74df96aae1..c502d5314c 100644 --- a/src/util-spm-bs2bm.h +++ b/src/util-spm-bs2bm.h @@ -21,8 +21,8 @@ * \author Pablo Rincon Crespo */ -#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 */ diff --git a/src/util-spm-hs.h b/src/util-spm-hs.h index e362198819..170e9d2588 100644 --- a/src/util-spm-hs.h +++ b/src/util-spm-hs.h @@ -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 */ diff --git a/src/util-spm.h b/src/util-spm.h index 9893dcd422..2daeab85c7 100644 --- a/src/util-spm.h +++ b/src/util-spm.h @@ -21,8 +21,8 @@ * \author Pablo Rincon Crespo */ -#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 */ diff --git a/src/util-storage.h b/src/util-storage.h index 6866874f7d..84860e622c 100644 --- a/src/util-storage.h +++ b/src/util-storage.h @@ -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, diff --git a/src/util-streaming-buffer.h b/src/util-streaming-buffer.h index 98ee6f67ca..bfd441045b 100644 --- a/src/util-streaming-buffer.h +++ b/src/util-streaming-buffer.h @@ -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 */ diff --git a/src/util-thash.h b/src/util-thash.h index 9618d5c064..f45b6e8431 100644 --- a/src/util-thash.h +++ b/src/util-thash.h @@ -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 */ diff --git a/src/util-threshold-config.h b/src/util-threshold-config.h index ff0eadcf31..2a100a6c32 100644 --- a/src/util-threshold-config.h +++ b/src/util-threshold-config.h @@ -21,8 +21,8 @@ * \author Breno Silva Pinto */ -#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 */ diff --git a/src/util-time.h b/src/util-time.h index b0f7207b3c..a2a915039f 100644 --- a/src/util-time.h +++ b/src/util-time.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/util-unittest-helper.h b/src/util-unittest-helper.h index b3b6d18aa4..ed6a023d10 100644 --- a/src/util-unittest-helper.h +++ b/src/util-unittest-helper.h @@ -21,8 +21,8 @@ * \author Pablo Rincon Crespo */ -#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 */ diff --git a/src/util-unittest.h b/src/util-unittest.h index 80d666304d..749ce21c93 100644 --- a/src/util-unittest.h +++ b/src/util-unittest.h @@ -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 */ /** * @} diff --git a/src/util-validate.h b/src/util-validate.h index c0dac20b78..f892c7aecc 100644 --- a/src/util-validate.h +++ b/src/util-validate.h @@ -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 @@ -105,5 +104,4 @@ #endif /* DEBUG_VALIDATE */ -#endif /* __UTIL_VALIDATE_H__ */ - +#endif /* SURICATA_UTIL_VALIDATE_H */ diff --git a/src/util-var-name.h b/src/util-var-name.h index 5f21ea3fa4..dc50050043 100644 --- a/src/util-var-name.h +++ b/src/util-var-name.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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); diff --git a/src/util-var.h b/src/util-var.h index ce491ecdcd..c8e7d5af6d 100644 --- a/src/util-var.h +++ b/src/util-var.h @@ -21,8 +21,8 @@ * \author Victor Julien */ -#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 */ diff --git a/src/win32-misc.h b/src/win32-misc.h index adecd05e5f..4baf46f39d 100644 --- a/src/win32-misc.h +++ b/src/win32-misc.h @@ -21,8 +21,8 @@ * \author Jan Jezek */ -#ifndef __WIN32_MISC_H__ -#define __WIN32_MISC_H__ +#ifndef SURICATA_WIN32_MISC_H +#define SURICATA_WIN32_MISC_H #include diff --git a/src/win32-service.h b/src/win32-service.h index 6be80171e0..24785d7556 100644 --- a/src/win32-service.h +++ b/src/win32-service.h @@ -21,8 +21,8 @@ * \author Ondrej Slanina */ -#ifndef __WIN32_SERVICE_H__ -#define __WIN32_SERVICE_H__ +#ifndef SURICATA_WIN32_SERVICE_H +#define SURICATA_WIN32_SERVICE_H #ifdef OS_WIN32 int SCRunningAsService(void); diff --git a/src/win32-syscall.h b/src/win32-syscall.h index beb164df19..a61e23fdd7 100644 --- a/src/win32-syscall.h +++ b/src/win32-syscall.h @@ -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 @@ -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 diff --git a/src/win32-syslog.h b/src/win32-syslog.h index 78aa06671f..058856c1b4 100644 --- a/src/win32-syslog.h +++ b/src/win32-syslog.h @@ -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 */ -- 2.47.2