aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app-layer: standardize includes with iwyu

Browse Source 
Ticket: 945
pull/16363/head
Philippe Antoine 1 month ago committed by Victor Julien
parent 70fd139e3d
commit 999582b149
29 changed files with 162 additions and 132 deletions
Show Stats Download Patch File Download Diff File

29
src/app-layer-detect-proto.c
Unescape Escape View File

@ -23,24 +23,13 @@
*/
#include "suricata-common.h"
#include "decode.h"
#include "threads.h"
#include "threadvars.h"
#include "tm-threads.h"
#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"
#include "detect-engine-mpm.h"
#include "detect-engine-state.h"
#include "util-print.h"
#include "util-pool.h"
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "util-validate.h"
#include "flow.h"
@ -48,13 +37,9 @@
#include "flow-private.h"
#include "stream-tcp-private.h"
#include "stream-tcp-reassemble.h"
#include "stream-tcp.h"
#include "stream.h"
#include "app-layer.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "app-layer-detect-proto.h"
#include "app-layer-expectation.h"
@ -62,8 +47,10 @@
#include "util-memcmp.h"
#include "util-spm.h"
#include "util-debug.h"
#include "runmodes.h"
#include "rust.h"
#include "suricata.h"
#include "util-mpm.h"
#include "util-prefilter.h"
typedef struct AppLayerProtoDetectProbingParserElement_ {
AppProto alproto;
@ -2191,6 +2178,14 @@ void AppLayerRegisterExpectationProto(uint8_t proto, AppProto alproto)
#include "app-layer-htp.h"
#include "detect-engine-alert.h"
#include "app-layer-parser.h"
#include "counters.h"
#include "decode.h"
#include "detect-engine-build.h"
#include "detect-parse.h"
#include "detect-engine.h"
#include "util-unittest.h"
#include "util-unittest-helper.h"
static AppLayerProtoDetectCtx alpd_ctx_ut;

9
src/app-layer-dnp3.c
Unescape Escape View File

@ -23,13 +23,10 @@
#include "suricata-common.h"
#include "suricata.h"
#include "util-unittest.h"
#include "util-byte.h"
#include "util-spm-bs.h"
#include "util-enum.h"
#include "app-layer.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "app-layer-detect-proto.h"
@ -37,6 +34,10 @@
#include "app-layer-dnp3.h"
#include "app-layer-dnp3-objects.h"
#include "conf.h"
#include "rust.h"
#include "util-debug.h"
#include "util-validate.h"
#define DNP3_DEFAULT_PORT "20000"
@ -1694,6 +1695,8 @@ void RegisterDNP3Parsers(void)
#include "flow-util.h"
#include "stream-tcp.h"
#include "util-unittest.h"
#include "threads.h"
/**
* \brief Utility function to fix CRCs when mangling a frame.

3
src/app-layer-events.c
Unescape Escape View File

@ -23,9 +23,10 @@
*/
#include "suricata-common.h"
#include "rust.h"
#include "app-layer-events.h"
#include "util-enum.h"
#include "detect.h"
#include "util-debug.h"
int SCAppLayerGetEventIdByName(const char *event_name, SCEnumCharMap *table, uint8_t *event_id)
{

4
src/app-layer-expectation.c
Unescape Escape View File

@ -59,8 +59,8 @@
#include "flow-storage.h"
#include "app-layer-expectation.h"
#include "util-print.h"
#include "ippair.h"
#include "util-debug.h"
static SCIPPairStorageId g_ippair_expectation_id = { .id = -1 };
static SCFlowStorageId g_flow_expectation_id = { .id = -1 };

3
src/app-layer-frames.c
Unescape Escape View File

@ -23,13 +23,14 @@
*/
#include "suricata-common.h"
#include "util-print.h"
#include "flow.h"
#include "stream-tcp.h"
#include "rust.h"
#include "app-layer-frames.h"
#include "app-layer-parser.h"
#include "util-debug.h"
#include "util-validate.h"
struct FrameConfig {
SC_ATOMIC_DECLARE(uint64_t, types);

2
src/app-layer-frames.h
Unescape Escape View File

@ -24,6 +24,8 @@
#ifndef SURICATA_APP_LAYER_FRAMES_H
#define SURICATA_APP_LAYER_FRAMES_H
#include "decode.h"
/** special value for matching any type */
#define FRAME_ANY_TYPE 62
/** max 63 to fit the 64 bit per protocol space */

10
src/app-layer-ftp.c
Unescape Escape View File

@ -28,7 +28,6 @@
#include "suricata-common.h"
#include "app-layer-ftp.h"
#include "app-layer.h"
#include "app-layer-parser.h"
#include "app-layer-expectation.h"
#include "app-layer-detect-proto.h"
@ -36,9 +35,15 @@
#include "rust.h"
#include "util-misc.h"
#include "util-mpm.h"
#include "util-validate.h"
#include "app-layer-protos.h"
#include "flow-storage.h"
#include "flow.h"
#include "util-debug.h"
#include "util-error.h"
#include "util-prefilter.h"
#include "util-streaming-buffer.h"
typedef struct FTPThreadCtx_ {
MpmThreadCtx *ftp_mpm_thread_ctx;
@ -424,7 +429,6 @@ static uint32_t CopyCommandLine(uint8_t **dest, FtpLineState *line)
return line->len + 1;
}
#include "util-print.h"
/**
* \brief This function is called to retrieve a ftp request

3
src/app-layer-htp-body.c
Unescape Escape View File

@ -31,7 +31,8 @@
#include "app-layer-htp-mem.h"
#include "app-layer-htp-body.h"
#include "util-streaming-buffer.h"
#include "util-print.h"
#include "rust.h"
#include "util-debug.h"
extern StreamingBufferConfig htp_sbcfg;

5
src/app-layer-htp-file.c
Unescape Escape View File

@ -29,6 +29,10 @@
#include "app-layer-htp-range.h"
#include "app-layer-events.h"
#include "util-validate.h"
#include "rust.h"
#include "util-debug.h"
#include "util-file.h"
#include "util-streaming-buffer.h"
extern StreamingBufferConfig htp_sbcfg;
@ -323,6 +327,7 @@ end:
}
#ifdef UNITTESTS
#include "app-layer-protos.h"
#include "stream-tcp.h"
#include "app-layer-parser.h"
#include "util-unittest-helper.h"

1
src/app-layer-htp-mem.c
Unescape Escape View File

@ -35,6 +35,7 @@
#include "conf.h"
#include "util-misc.h"
#include "util-debug.h"
#include "util-error.h"
SC_ATOMIC_DECLARE(uint64_t, htp_config_memcap);
SC_ATOMIC_DECLARE(uint64_t, htp_memuse);

2
src/app-layer-htp-range.c
Unescape Escape View File

@ -30,6 +30,8 @@
#include "util-hash-lookup3.h" //hashlittle_safe
#include "util-validate.h" //DEBUG_VALIDATE_BUG_ON
#include "util-byte.h" //StringParseUint32
#include "conf.h"
#include "util-debug.h"
typedef struct ContainerTHashTable {
THashTableContext *ht;

3
src/app-layer-htp-xff.c
Unescape Escape View File

@ -31,6 +31,9 @@
#include "util-misc.h"
#include "util-unittest.h"
#include "app-layer-protos.h"
#include "htp/htp_rs.h"
#include "util-debug.h"
/** Default XFF header name */
#define XFF_DEFAULT "X-Forwarded-For"

28
src/app-layer-htp.c
Unescape Escape View File

@ -36,23 +36,17 @@
#include "suricata.h"
#include "suricata-common.h"
#include "conf.h"
#include "decode.h"
#include "util-print.h"
#include "util-byte.h"
#include "stream-tcp.h"
#include "app-layer-protos.h"
#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-xff.h"
#include "app-layer-htp-range.h"
#include "app-layer-htp-mem.h"
#include "app-layer-events.h"
@ -61,18 +55,18 @@
#include "util-file-decompression.h"
#include "util-misc.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"
#include "util-memcmp.h"
#include "util-random.h"
#include "util-validate.h"
#include "flow.h"
#include "rust.h"
#include "stream-tcp-reassemble.h"
#include "util-enum.h"
#include "util-radix4-tree.h"
#include "util-radix6-tree.h"
//#define PRINT
@ -2697,6 +2691,16 @@ void RegisterHTPParsers(void)
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "app-layer-htp-xff.h"
#include "counters.h"
#include "detect-engine.h"
#include "detect-engine-build.h"
#include "detect-parse.h"
#include "flow-util.h"
#include "stream-tcp.h"
#include "util-print.h"
#include "util-unittest.h"
#include "util-unittest-helper.h"
static HTPCfgRec cfglist_backup;

7
src/app-layer-http2.c
Unescape Escape View File

@ -24,17 +24,18 @@
*/
#include "suricata-common.h"
#include "stream.h"
#include "conf.h"
#include "util-unittest.h"
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "app-layer-htp.h"
#include "app-layer-http2.h"
#include "app-layer-protos.h"
#include "htp/htp_rs.h"
#include "rust-bindings.h"
#include "rust.h"
#include "util-streaming-buffer.h"
static int HTTP2RegisterPatternsForProtocolDetection(void)
{

20
src/app-layer-ike.c
Unescape Escape View File

@ -26,17 +26,20 @@
*/
#include "suricata-common.h"
#include "stream.h"
#include "conf.h"
#include "util-unittest.h"
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "app-layer-ike.h"
#include "rust.h"
#ifdef UNITTESTS
#include "app-layer-parser.h"
#include "app-layer-protos.h"
#include "flow.h"
#include "util-unittest.h"
#include "stream-tcp.h"
#include "util-unittest-helper.h"
#include "flow-util.h"
#endif
void RegisterIKEParsers(void)
{
SCRegisterIkeParser();
@ -46,9 +49,6 @@ void RegisterIKEParsers(void)
}
#ifdef UNITTESTS
#include "stream-tcp.h"
#include "util-unittest-helper.h"
#include "flow-util.h"
static int IkeParserTest(void)
{

7
src/app-layer-imap.c
Unescape Escape View File

@ -22,9 +22,14 @@
*
*/
#include "app-layer.h"
#include "suricata-common.h"
#include "app-layer-detect-proto.h"
#include "app-layer-imap.h"
#include "app-layer-protos.h"
#include "rust.h"
#include "stream-tcp-private.h"
#include "stream-tcp-reassemble.h"
#include "util-debug.h"
static AppProto ImapClientProbingParser(
const Flow *f, uint8_t direction, const uint8_t *input, uint32_t len, uint8_t *rdir)

39
src/app-layer-modbus.c
Unescape Escape View File

@ -38,10 +38,32 @@
#include "util-debug.h"
#include "app-layer-parser.h"
#include "app-layer-modbus.h"
#include "rust.h"
#ifdef UNITTESTS
#include "app-layer-parser.h"
#include "app-layer-protos.h"
#include "counters.h"
#include "decode.h"
#include "flow.h"
#include "threadvars.h"
#include "detect.h"
#include "detect-engine.h"
#include "detect-parse.h"
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "flow-util.h"
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "stream-tcp.h"
#include "stream-tcp-private.h"
#endif
void ModbusParserRegisterTests(void);
/**
@ -59,21 +81,6 @@ void RegisterModbusParsers(void)
/* UNITTESTS */
#ifdef UNITTESTS
#include "detect.h"
#include "detect-engine.h"
#include "detect-parse.h"
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "flow-util.h"
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "stream-tcp.h"
#include "stream-tcp-private.h"
#include "rust.h"
/* Modbus default stream reassembly depth */
#define MODBUS_CONFIG_DEFAULT_STREAM_DEPTH 0

6
src/app-layer-nfs-tcp.c
Unescape Escape View File

@ -27,18 +27,16 @@
*/
#include "suricata-common.h"
#include "stream.h"
#include "conf.h"
#include "util-unittest.h"
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "app-layer-nfs-tcp.h"
#include "rust.h"
#include "rust-bindings.h"
#include "util-streaming-buffer.h"
static StreamingBufferConfig sbcfg = STREAMING_BUFFER_CONFIG_INITIALIZER;
static SuricataFileContext sfc = { &sbcfg };

19
src/app-layer-nfs-udp.c
Unescape Escape View File

@ -24,18 +24,16 @@
*/
#include "suricata-common.h"
#include "stream.h"
#include "conf.h"
#include "util-unittest.h"
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "app-layer-nfs-udp.h"
#include "util-enum.h"
#include "rust.h"
#include "rust-bindings.h"
#include "util-streaming-buffer.h"
/* Enum of app-layer events for an echo protocol. Normally you might
* have events for errors in parsing data, like unexpected data being
@ -65,17 +63,4 @@ void RegisterNFSUDPParsers(void)
SCNfsInit(&sfc);
SCRegisterNfsUdpParser();
#ifdef UNITTESTS
AppLayerParserRegisterProtocolUnittests(IPPROTO_UDP, ALPROTO_NFS,
NFSUDPParserRegisterTests);
#endif
}
#ifdef UNITTESTS
#endif
void NFSUDPParserRegisterTests(void)
{
#ifdef UNITTESTS
#endif
}

12
src/app-layer-parser.c
Unescape Escape View File

@ -56,6 +56,18 @@
#include "app-layer-ike.h"
#include "app-layer-http2.h"
#include "app-layer-imap.h"
#include "conf.h"
#include "decode.h"
#include "detect.h"
#include "rust-bindings.h"
#include "rust.h"
#include "stream-tcp-reassemble.h"
#include "suricata.h"
#include "threadvars.h"
#include "util-debug.h"
#include "util-exception-policy.h"
#include "util-file.h"
#include "util-var.h"
struct AppLayerParserThreadCtx_ {
void *(*alproto_local_storage)[FLOW_PROTO_MAX];

2
src/app-layer-protos.c
Unescape Escape View File

@ -26,6 +26,8 @@
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "rust.h"
#include "util-debug.h"
#include "util-validate.h"
AppProto g_alproto_max = ALPROTO_MAX_STATIC;
#define ARRAY_CAP_STEP 16

3
src/app-layer-register.c
Unescape Escape View File

@ -25,14 +25,13 @@
#include "suricata-common.h"
#include "suricata.h"
#include "stream.h"
#include "conf.h"
#include "rust.h"
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "app-layer-register.h"
#include "util-debug.h"
static const char * IpProtoToString(int ip_proto);

19
src/app-layer-smb.c
Unescape Escape View File

@ -22,18 +22,21 @@
*/
#include "suricata-common.h"
#include "suricata.h"
#include "app-layer-protos.h"
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "util-unittest.h"
#include "rust.h"
#include "app-layer-smb.h"
#include "util-misc.h"
#include "rust-bindings.h"
#include "util-streaming-buffer.h"
#ifdef UNITTESTS
#include "stream-tcp.h"
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "flow.h"
#endif
static StreamingBufferConfig sbcfg = STREAMING_BUFFER_CONFIG_INITIALIZER;
static SuricataFileContext sfc = { &sbcfg };
@ -53,8 +56,6 @@ void RegisterSMBParsers(void)
}
#ifdef UNITTESTS
#include "stream-tcp.h"
#include "util-unittest-helper.h"
/** \test multi transactions and cleanup */
static int SMBParserTxCleanupTest(void)

22
src/app-layer-smtp.c
Unescape Escape View File

@ -21,13 +21,8 @@
* \author Anoop Saldanha <anoopsaldanha@gmail.com>
*/
#include "suricata.h"
#include "suricata-common.h"
#include "decode.h"
#include "stream-tcp.h"
#include "app-layer.h"
#include "app-layer-detect-proto.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
@ -42,18 +37,19 @@
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "util-memcmp.h"
#include "flow-util.h"
#include "detect-engine.h"
#include "detect-engine-state.h"
#include "detect-engine-build.h"
#include "detect-parse.h"
#include "conf.h"
#include "util-mem.h"
#include "util-misc.h"
#include "util-validate.h"
#include "detect.h"
#include "flow.h"
#include "rust.h"
#include "stream-tcp-reassemble.h"
#include "util-prefilter.h"
/* content-limit default value */
#define FILEDATA_CONTENT_LIMIT 100000
@ -2193,6 +2189,14 @@ void SMTPParserCleanup(void)
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "counters.h"
#include "decode.h"
#include "detect-engine.h"
#include "detect-engine-build.h"
#include "detect-parse.h"
#include "flow-util.h"
#include "stream-tcp.h"
#include "suricata.h"
static void SMTPTestInitConfig(void)
{

1
src/app-layer-smtp.h
Unescape Escape View File

@ -26,7 +26,6 @@
#include "rust.h"
#include "app-layer-parser.h"
#include "app-layer-frames.h"
#include "util-streaming-buffer.h"
/* Limit till the data would be buffered in current line */

17
src/app-layer-ssh.c
Unescape Escape View File

@ -27,15 +27,6 @@
#include "suricata-common.h"
#include "decode.h"
#include "threads.h"
#include "util-print.h"
#include "util-pool.h"
#include "stream-tcp-private.h"
#include "stream-tcp-reassemble.h"
#include "stream-tcp.h"
#include "stream.h"
#include "app-layer-detect-proto.h"
#include "app-layer-protos.h"
@ -45,13 +36,12 @@
#include "conf.h"
#include "util-spm.h"
#include "util-unittest.h"
#include "util-debug.h"
#include "flow-private.h"
#include "util-byte.h"
#include "util-memcmp.h"
#include "rust-bindings.h"
#include "suricata.h"
/* HASSH fingerprints are disabled by default */
#define SSH_CONFIG_DEFAULT_HASSH false
@ -138,6 +128,9 @@ void RegisterSSHParsers(void)
#include "flow-util.h"
#include "stream-tcp-util.h"
#include "util-unittest-helper.h"
#include "stream-tcp-private.h"
#include "stream-tcp-reassemble.h"
#include "stream-tcp.h"
static int SSHParserTestUtilCheck(const char *protoexp, const char *softexp, void *tx, uint8_t flags) {
const uint8_t *protocol = NULL;

4
src/app-layer-ssl.c
Unescape Escape View File

@ -25,9 +25,7 @@
*/
#include "suricata-common.h"
#include "decode.h"
#include "app-layer.h"
#include "app-layer-detect-proto.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
@ -43,6 +41,8 @@
#include "util-ja3.h"
#include "util-enum.h"
#include "util-validate.h"
#include "rust.h"
#include "suricata.h"
static SCEnumCharMap tls_state_client_table[] = {
{

4
src/app-layer-tftp.c
Unescape Escape View File

@ -28,11 +28,13 @@
#include "suricata-common.h"
#include "suricata.h"
#include "app-layer.h"
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "app-layer-tftp.h"
#include "app-layer-protos.h"
#include "rust.h"
#include "util-debug.h"
/* The default port to probe if not provided in the configuration file. */
#define TFTP_DEFAULT_PORT "69"

10
src/app-layer.c
Unescape Escape View File

@ -37,7 +37,6 @@
#include "app-layer-events.h"
#include "stream-tcp-reassemble.h"
#include "stream-tcp-private.h"
#include "stream-tcp-inline.h"
#include "stream-tcp.h"
#include "flow.h"
#include "flow-util.h"
@ -47,9 +46,13 @@
#include "util-print.h"
#include "util-profiling.h"
#include "util-validate.h"
#include "decode-events.h"
#include "app-layer-htp-mem.h"
#include "util-exception-policy.h"
#include "counters.h"
#include "decode-tcp.h"
#include "host.h"
#include "packet-queue.h"
#include "util-exception-policy-types.h"
extern bool g_stats_eps_per_app_proto_errors;
/**
@ -1396,9 +1399,6 @@ void AppLayerDeSetupCounters(void)
/***** Unittests *****/
#ifdef UNITTESTS
#include "pkt-var.h"
#include "stream-tcp-util.h"
#include "stream.h"
#include "util-unittest.h"
#define TEST_START \

Write Preview
Loading…
Cancel
Save