Skip to content

src: rework includes as per cppclean #7563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
catenacyber wants to merge 2 commits into from
Closed

src: rework includes as per cppclean #7563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03579a7
src: rework includes as per cppclean
catenacyber Jun 20, 2022
5c78ffc
fixup wip compile everywhere
catenacyber Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/alert-fastlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

#include "detect-parse.h"
#include "detect-engine.h"
#include "detect-engine-build.h"
#include "detect-engine-mpm.h"
#include "detect-reference.h"
#include "util-classification-config.h"
Expand Down
5 changes: 0 additions & 5 deletions src/app-layer-dcerpc-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
#ifndef __APP_LAYER_DCERPC_COMMON_H__
#define __APP_LAYER_DCERPC_COMMON_H__

#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "flow.h"
#include "queue.h"
#include "util-byte.h"

void RegisterDCERPCParsers(void);
void DCERPCParserTests(void);
Expand Down
1 change: 1 addition & 0 deletions src/app-layer-detect-proto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

#include "detect.h"
#include "detect-engine-port.h"
#include "detect-engine-build.h"
#include "detect-parse.h"
#include "detect-engine.h"
#include "detect-content.h"
Expand Down
3 changes: 3 additions & 0 deletions src/app-layer-dnp3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
*/

#include "suricata-common.h"
#include "suricata.h"
#include "stream.h"
#include "util-byte.h"
#include "util-unittest.h"
#include "util-hashlist.h"

#include "util-print.h"
#include "util-spm-bs.h"
#include "util-enum.h"

#include "app-layer.h"
#include "app-layer-protos.h"
Expand Down
3 changes: 0 additions & 3 deletions src/app-layer-dnp3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
#ifndef __APP_LAYER_DNP3_H__
#define __APP_LAYER_DNP3_H__

#include "detect-engine-state.h"
#include "util-hashlist.h"
#include "util-byte.h"
#include "rust.h"

/**
Expand Down
5 changes: 1 addition & 4 deletions src/app-layer-enip-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
#ifndef __APP_LAYER_ENIP_COMMON_H__
#define __APP_LAYER_ENIP_COMMON_H__

#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "flow.h"
#include "queue.h"
#include "rust.h"

// EtherNet/IP commands
#define NOP 0x0000
Expand Down
3 changes: 0 additions & 3 deletions src/app-layer-enip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
#ifndef __APP_LAYER_ENIP_H__
#define __APP_LAYER_ENIP_H__

#include "decode.h"
#include "detect-engine-state.h"
#include "queue.h"

void RegisterENIPUDPParsers(void);
void RegisterENIPTCPParsers(void);
Expand Down
1 change: 1 addition & 0 deletions src/app-layer-frames.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include "stream-tcp.h"
#include "app-layer-frames.h"
#include "app-layer-parser.h"

static void FrameDebug(const char *prefix, const Frames *frames, const Frame *frame)
{
Expand Down
5 changes: 0 additions & 5 deletions src/app-layer-frames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,7 @@
#ifndef __APP_LAYER_FRAMES_H__
#define __APP_LAYER_FRAMES_H__

#include "app-layer-events.h"
#include "detect-engine-state.h"
#include "util-file.h"
#include "stream-tcp-private.h"
#include "rust.h"
#include "app-layer-parser.h"

typedef int64_t FrameId;

Expand Down
1 change: 1 addition & 0 deletions src/app-layer-ftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#include "app-layer-parser.h"
#include "app-layer-ftp.h"
#include "app-layer-expectation.h"
#include "app-layer-detect-proto.h"

#include "util-spm.h"
#include "util-mpm.h"
Expand Down
1 change: 1 addition & 0 deletions src/app-layer-htp-body.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "app-layer-parser.h"
#include "app-layer-htp.h"
#include "app-layer-htp-body.h"
#include "app-layer-htp-mem.h"

#include "util-spm.h"
#include "util-debug.h"
Expand Down
1 change: 1 addition & 0 deletions src/app-layer-htp-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "app-layer-parser.h"
#include "app-layer-htp.h"
#include "app-layer-htp-file.h"
#include "app-layer-htp-range.h"

#include "util-spm.h"
#include "util-debug.h"
Expand Down
1 change: 0 additions & 1 deletion src/app-layer-htp-libhtp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#ifndef __APP_LAYER_HTP_LIBHTP__H__
#define __APP_LAYER_HTP_LIBHTP__H__

#include "suricata.h"
#include "suricata-common.h"

bstr *SCHTPGenerateNormalizedUri(htp_tx_t *tx, htp_uri_t *uri, int uri_include_all);
Expand Down
1 change: 0 additions & 1 deletion src/app-layer-htp-mem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* 02110-1301, USA.
*/

#include "stream-tcp-reassemble.h"

void HTPParseMemcap(void);
void *HTPMalloc(size_t size);
Expand Down
3 changes: 1 addition & 2 deletions src/app-layer-htp-range.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
#define __APP_LAYER_HTP_RANGE_H__

#include "suricata-common.h"
#include "app-layer-parser.h"

#include "util-thash.h"
#include "rust-bindings.h"
#include "rust.h"

void HttpRangeContainersInit(void);
void HttpRangeContainersDestroy(void);
Expand Down
5 changes: 5 additions & 0 deletions src/app-layer-htp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,28 @@
#include "app-layer-parser.h"

#include "app-layer.h"
#include "app-layer-detect-proto.h"
#include "app-layer-frames.h"
#include "app-layer-htp.h"
#include "app-layer-htp-body.h"
#include "app-layer-htp-file.h"
#include "app-layer-htp-libhtp.h"
#include "app-layer-htp-xff.h"
#include "app-layer-htp-range.h"
#include "app-layer-htp-mem.h"

#include "util-spm.h"
#include "util-debug.h"
#include "util-time.h"
#include "util-misc.h"
#include "util-enum.h"

#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "flow-util.h"

#include "detect-engine.h"
#include "detect-engine-build.h"
#include "detect-engine-state.h"
#include "detect-parse.h"

Expand Down
5 changes: 1 addition & 4 deletions src/app-layer-htp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,10 @@
#ifndef __APP_LAYER_HTP_H__
#define __APP_LAYER_HTP_H__

#include "util-radix-tree.h"
#include "util-file.h"
#include "app-layer-htp-mem.h"
#include "detect-engine-state.h"
#include "util-streaming-buffer.h"
#include "app-layer-htp-range.h"
#include "rust.h"
#include "app-layer-frames.h"

#include <htp/htp.h>

Expand Down
1 change: 1 addition & 0 deletions src/app-layer-modbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

#include "app-layer-parser.h"
#include "app-layer-modbus.h"
#include "detect-engine-build.h"

void ModbusParserRegisterTests(void);

Expand Down
5 changes: 0 additions & 5 deletions src/app-layer-nbss.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
#ifndef __APP_LAYER_NBSS_H__
Copy link
Member

@victorjulien victorjulien Jun 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this file can be removed instead? Should have been removed as part of the smb to rust work years ago I think

Copy link
Contributor Author

@catenacyber catenacyber Jun 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh and so are decode-null.h and util-vector.h :-)

#define __APP_LAYER_NBSS_H__

#include "suricata-common.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "flow.h"
#include "stream.h"

/*
http://ubiqx.org/cifs/rfc-draft/rfc1002.html#s4.3
Expand Down
1 change: 1 addition & 0 deletions src/app-layer-nfs-udp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "app-layer-parser.h"

#include "app-layer-nfs-udp.h"
#include "util-enum.h"

#include "rust.h"

Expand Down
1 change: 1 addition & 0 deletions src/app-layer-parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "stream-tcp-reassemble.h"

#include "app-layer.h"
#include "app-layer-detect-proto.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "app-layer-smb.h"
Expand Down
3 changes: 0 additions & 3 deletions src/app-layer-parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
#define __APP_LAYER_PARSER_H__

#include "app-layer-events.h"
#include "app-layer-frames.h"
#include "detect-engine-state.h"
#include "util-file.h"
#include "stream-tcp-private.h"
#include "rust.h"
#include "util-config.h"

Expand Down
1 change: 1 addition & 0 deletions src/app-layer-register.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/

#include "suricata-common.h"
#include "suricata.h"
#include "stream.h"
#include "conf.h"

Expand Down
2 changes: 2 additions & 0 deletions src/app-layer-smtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "app-layer-parser.h"
#include "app-layer-smtp.h"

#include "util-enum.h"
#include "util-mpm.h"
#include "util-debug.h"
#include "util-print.h"
Expand All @@ -49,6 +50,7 @@

#include "detect-engine.h"
#include "detect-engine-state.h"
#include "detect-engine-build.h"
#include "detect-parse.h"

#include "decode-events.h"
Expand Down
2 changes: 0 additions & 2 deletions src/app-layer-smtp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
#ifndef __APP_LAYER_SMTP_H__
#define __APP_LAYER_SMTP_H__

#include "decode-events.h"
#include "util-decode-mime.h"
#include "queue.h"
#include "util-streaming-buffer.h"
#include "rust.h"

Expand Down
1 change: 1 addition & 0 deletions src/app-layer-ssh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "stream-tcp.h"
#include "stream.h"

#include "app-layer-detect-proto.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "app-layer-ssh.h"
Expand Down
2 changes: 2 additions & 0 deletions src/app-layer-ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "stream.h"

#include "app-layer.h"
#include "app-layer-detect-proto.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "app-layer-frames.h"
Expand All @@ -50,6 +51,7 @@
#include "util-pool.h"
#include "util-byte.h"
#include "util-ja3.h"
#include "util-enum.h"
#include "flow-util.h"
#include "flow-private.h"
#include "util-validate.h"
Expand Down
5 changes: 1 addition & 4 deletions src/app-layer-ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@
#ifndef __APP_LAYER_SSL_H__
#define __APP_LAYER_SSL_H__

#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "decode-events.h"
#include "util-ja3.h"
#include "queue.h"
#include "rust.h"

enum TlsFrameTypes {
TLS_FRAME_PDU = 0, /**< whole PDU, so header + data */
Expand Down
2 changes: 2 additions & 0 deletions src/app-layer-template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
*/

#include "suricata-common.h"
#include "suricata.h"
#include "stream.h"
#include "conf.h"
#include "app-layer.h"
Expand All @@ -43,6 +44,7 @@

#include "util-unittest.h"
#include "util-validate.h"
#include "util-enum.h"

/* The default port to probe for echo traffic if not provided in the
* configuration file. */
Expand Down
2 changes: 0 additions & 2 deletions src/app-layer-template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
#ifndef __APP_LAYER_TEMPLATE_H__
#define __APP_LAYER_TEMPLATE_H__

#include "detect-engine-state.h"

#include "queue.h"

#include "rust.h"

Expand Down
1 change: 1 addition & 0 deletions src/app-layer-tftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@


#include "suricata-common.h"
#include "suricata.h"
#include "stream.h"
#include "conf.h"

Expand Down
2 changes: 0 additions & 2 deletions src/app-layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@

#include "stream-tcp-private.h"
#include "stream-tcp-reassemble.h"
#include "stream.h"

#include "util-profiling.h"

#include "rust.h"

Expand Down
2 changes: 0 additions & 2 deletions src/decode-erspan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
#ifndef __DECODE_ERSPAN_H__
#define __DECODE_ERSPAN_H__

#include "decode.h"
#include "threadvars.h"

typedef struct ErspanHdr_ {
uint16_t ver_vlan;
Expand Down
2 changes: 0 additions & 2 deletions src/decode-gre.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#define IPPROTO_GRE 47
#endif

#include "decode.h"
#include "threadvars.h"

typedef struct GREHdr_
{
Expand Down
2 changes: 0 additions & 2 deletions src/decode-icmpv4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
#ifndef __DECODE_ICMPV4_H__
#define __DECODE_ICMPV4_H__

#include "decode.h"
#include "decode-tcp.h"
#include "decode-sctp.h"
#include "decode-udp.h"

#define ICMPV4_HEADER_LEN 8
Expand Down
1 change: 0 additions & 1 deletion src/decode-icmpv6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#define __DECODE_ICMPV6_H__

#include "decode-tcp.h"
#include "decode-sctp.h"
#include "decode-udp.h"
#include "decode-ipv6.h"

Expand Down
2 changes: 0 additions & 2 deletions src/decode-nsh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
#ifndef __DECODE_NSH_H__
#define __DECODE_NSH_H__

#include "decode.h"
#include "threadvars.h"

#define NSH_NEXT_PROTO_UNASSIGNED 0x0
#define NSH_NEXT_PROTO_IPV4 0x1
Expand Down
Loading