From: Jeff Lucovsky <jlucovsky@oisf.net>
Date: Mon, 10 Jul 2023 14:41:08 +0000 (-0400)
Subject: detect/file: Remove centralized proto definition
X-Git-Tag: suricata-7.0.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59fea84956c0c6ae1792ff0e5bfcb9ea741242e3;p=thirdparty%2Fsuricata.git

detect/file: Remove centralized proto definition

Issue: 4145

Remove centralized protocol definitions for file handling in favor of
consolidated file access handling.
---

diff --git a/src/detect-engine-file.c b/src/detect-engine-file.c
index 1738c94589..e7fd9e0c4a 100644
--- a/src/detect-engine-file.c
+++ b/src/detect-engine-file.c
@@ -49,30 +49,6 @@
 #include "util-profiling.h"
 #include "util-validate.h"
 
-FileAppProto file_protos_ts_static[] = {
-    { ALPROTO_HTTP1, HTP_REQUEST_BODY },
-    { ALPROTO_SMTP, 0 },
-    { ALPROTO_FTP, 0 },
-    { ALPROTO_FTPDATA, 0 },
-    { ALPROTO_SMB, 0 },
-    { ALPROTO_NFS, 0 },
-    { ALPROTO_HTTP2, HTTP2StateDataClient },
-    { ALPROTO_UNKNOWN, 0 },
-};
-
-FileAppProto file_protos_tc_static[] = {
-    { ALPROTO_HTTP1, HTP_RESPONSE_BODY },
-    { ALPROTO_FTP, 0 },
-    { ALPROTO_FTPDATA, 0 },
-    { ALPROTO_SMB, 0 },
-    { ALPROTO_NFS, 0 },
-    { ALPROTO_HTTP2, HTTP2StateDataServer },
-    { ALPROTO_UNKNOWN, 0 },
-};
-
-FileAppProto *file_protos_ts = file_protos_ts_static;
-FileAppProto *file_protos_tc = file_protos_tc_static;
-
 /**
  *  \brief Inspect the file inspecting keywords.
  *
diff --git a/src/detect-engine-file.h b/src/detect-engine-file.h
index 2f731087ea..3705a8f6e6 100644
--- a/src/detect-engine-file.h
+++ b/src/detect-engine-file.h
@@ -28,12 +28,4 @@ uint8_t DetectFileInspectGeneric(DetectEngineCtx *de_ctx, DetectEngineThreadCtx
         const struct DetectEngineAppInspectionEngine_ *engine, const Signature *s, Flow *f,
         uint8_t flags, void *_alstate, void *tx, uint64_t tx_id);
 
-typedef struct FileAppProto {
-    AppProto alproto;
-    int progress;
-} FileAppProto;
-
-extern FileAppProto *file_protos_ts;
-extern FileAppProto *file_protos_tc;
-
 #endif /* __DETECT_ENGINE_FILE_H__ */