From: Philippe Antoine <pantoine@oisf.net>
Date: Tue, 2 Aug 2022 13:55:25 +0000 (+0200)
Subject: http: multipart unused code removal
X-Git-Tag: suricata-8.0.0-beta1~1213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddb3a0c9de91100afe9e46da6a331e7c419efc6a;p=thirdparty%2Fsuricata.git

http: multipart unused code removal
---

diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index b5c0dfd64b..786ec2f4d8 100644
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -492,21 +492,6 @@ void AppLayerHtpEnableResponseBodyCallback(void)
     SCReturn;
 }
 
-/**
- * \brief Sets a flag that informs the HTP app layer that some module in the
- *        engine needs the http request multi part header.
- *
- * \initonly
- */
-static void AppLayerHtpNeedMultipartHeader(void)
-{
-    SCEnter();
-    AppLayerHtpEnableRequestBodyCallback();
-
-    SC_ATOMIC_OR(htp_config_flags, HTP_REQUIRE_REQUEST_MULTIPART);
-    SCReturn;
-}
-
 /**
  * \brief Sets a flag that informs the HTP app layer that some module in the
  *        engine needs the http request file.
@@ -516,7 +501,6 @@ static void AppLayerHtpNeedMultipartHeader(void)
 void AppLayerHtpNeedFileInspection(void)
 {
     SCEnter();
-    AppLayerHtpNeedMultipartHeader();
     AppLayerHtpEnableRequestBodyCallback();
     AppLayerHtpEnableResponseBodyCallback();
 
diff --git a/src/app-layer-htp.h b/src/app-layer-htp.h
index f3a5aedaab..6b37628543 100644
--- a/src/app-layer-htp.h
+++ b/src/app-layer-htp.h
@@ -269,10 +269,7 @@ typedef struct HtpState_ {
 } HtpState;
 
 /** part of the engine needs the request body (e.g. http_client_body keyword) */
-#define HTP_REQUIRE_REQUEST_BODY        (1 << 0)
-/** part of the engine needs the request body multipart header (e.g. filename
- *  and / or fileext keywords) */
-#define HTP_REQUIRE_REQUEST_MULTIPART   (1 << 1)
+#define HTP_REQUIRE_REQUEST_BODY (1 << 0)
 /** part of the engine needs the request file (e.g. log-file module) */
 #define HTP_REQUIRE_REQUEST_FILE        (1 << 2)
 /** part of the engine needs the request body (e.g. file_data keyword) */