http: include htp-libhtp.h from header

Instead of C files requiring it.
In preparation of libhtp rust, to minimize the final commit.

diff --git a/src/app-layer-htp-file.c b/src/app-layer-htp-file.c
index d191ff04432bb33709550ad969aaf21566af034e..03f9a405816a66f3e4017693d2c8dde8916aebf4 100644 (file)
--- a/src/app-layer-htp-file.c
+++ b/src/app-layer-htp-file.c
@@ -26,7 +26,6 @@
 
 #include "suricata-common.h"
 #include "app-layer-htp-file.h"
-#include "app-layer-htp-libhtp.h"
 #include "app-layer-htp-range.h"
 #include "app-layer-events.h"
 #include "util-validate.h"

diff --git a/src/app-layer-htp-xff.c b/src/app-layer-htp-xff.c
index b823f899051349ef8e60d48cba5d9f388030333a..4c0265212a5a5b98880bcba50398712670deb08b 100644 (file)
--- a/src/app-layer-htp-xff.c
+++ b/src/app-layer-htp-xff.c
@@ -27,7 +27,6 @@
 
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "app-layer-htp-xff.h"
 
 #ifndef HAVE_MEMRCHR

diff --git a/src/app-layer-htp.h b/src/app-layer-htp.h
index 55ff9c9b9fce60dd68e5826601a206bc768e6b40..0400818149179bd8cab499632059a7b2a5e2a823 100644 (file)
--- a/src/app-layer-htp.h
+++ b/src/app-layer-htp.h
@@ -37,6 +37,10 @@
 #include "app-layer-frames.h"
 
 #include <htp/htp.h>
+// Temporary include directly app-layer-htp-libhtp.h
+// This helps libhtp.rs transition by making small steps
+// app-layer-htp-libhtp.h will be removed with libhtp.rs final merge
+#include "app-layer-htp-libhtp.h"
 
 /* default request body limit */
 #define HTP_CONFIG_DEFAULT_REQUEST_BODY_LIMIT           4096U

diff --git a/src/app-layer-http2.c b/src/app-layer-http2.c
index f5e148008e670816648e773a2709341782174267..1a12fd15829e6f965fe2de04d4b8367b3e2dec6f 100644 (file)
--- a/src/app-layer-http2.c
+++ b/src/app-layer-http2.c
@@ -33,7 +33,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "app-layer-http2.h"
 #include "rust.h"
 

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index 2281dafb6c42256a09233756cf246c2ae32b4ed7..17df5d83e604d9871a2c919437042340b5dc010c 100644 (file)
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -40,7 +40,6 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "app-layer-smtp.h"
 
 #include "flow.h"

diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c
index 798a29ab66a5dfc6b4549b7856c932d9efb44e63..2c75a33552468303b9966f451c8f56f35613d268 100644 (file)
--- a/src/detect-http-client-body.c
+++ b/src/detect-http-client-body.c
@@ -58,7 +58,6 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-client-body.h"
 #include "stream-tcp.h"
 #include "util-profiling.h"

diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index a3c0db88facf4e19c9953c88e4ee99283ceaf1d6..f390ce828476b86f1145d45fc3af1a8df7f3cc45 100644 (file)
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -57,7 +57,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-cookie.h"
 #include "stream-tcp.h"
 

diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c
index 4e7bccf3c09ae2dfff7a4b39a5ffd6fde0b58e4f..96678d86359030059e69957c34569a8c6dcb1d6c 100644 (file)
--- a/src/detect-http-header-names.c
+++ b/src/detect-http-header-names.c
@@ -60,7 +60,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 

diff --git a/src/detect-http-header.c b/src/detect-http-header.c
index f0b4d59f700a371e609b582ef8940a7e355cf25f..c6104bd38f457b4b0ace7e642d602095069ee8d9 100644 (file)
--- a/src/detect-http-header.c
+++ b/src/detect-http-header.c
@@ -54,7 +54,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-header.h"
 #include "detect-http-header-common.h"
 

diff --git a/src/detect-http-host.c b/src/detect-http-host.c
index 9f6fe9d962b61ff6b6a6e55381c303c7781e5918..ed061b3921b6d2d556cb328867f63cf771ba2592 100644 (file)
--- a/src/detect-http-host.c
+++ b/src/detect-http-host.c
@@ -55,7 +55,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "stream-tcp.h"
 #include "detect-http-host.h"
 

diff --git a/src/detect-http-method.c b/src/detect-http-method.c
index 2d2e1809a45ed9269953fe1f060fff4fda53805f..9fb7af37e6440b958c36ba9b3d29af1b60d828c1 100644 (file)
--- a/src/detect-http-method.c
+++ b/src/detect-http-method.c
@@ -55,7 +55,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-method.h"
 #include "stream-tcp.h"
 

diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c
index 6ef48b9b011add1f465fbd8f1a0460792b3639e9..8f50693be0ccd5d024f7e8b4ec79572cbdef4848 100644 (file)
--- a/src/detect-http-protocol.c
+++ b/src/detect-http-protocol.c
@@ -60,7 +60,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 

diff --git a/src/detect-http-raw-header.c b/src/detect-http-raw-header.c
index 95f2a282d291e950a909cc258f2f68ec35905e84..ee5e3c957eae57d81079e58b6eeb6e383e9f2885 100644 (file)
--- a/src/detect-http-raw-header.c
+++ b/src/detect-http-raw-header.c
@@ -51,7 +51,6 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-raw-header.h"
 
 static int DetectHttpRawHeaderSetup(DetectEngineCtx *, Signature *, const char *);

diff --git a/src/detect-http-request-line.c b/src/detect-http-request-line.c
index ffa665752aebfa1987cb0bdc81f6a9b3674be285..60ebd5a3d147f820461959506316f86ce5f5b1c3 100644 (file)
--- a/src/detect-http-request-line.c
+++ b/src/detect-http-request-line.c
@@ -57,7 +57,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "stream-tcp.h"
 #include "detect-http-request-line.h"
 

diff --git a/src/detect-http-response-line.c b/src/detect-http-response-line.c
index ffa02368dee415cd319549362e6a73d92bf770e6..93114822d15e8044e72883a87ba69a20afccad8c 100644 (file)
--- a/src/detect-http-response-line.c
+++ b/src/detect-http-response-line.c
@@ -57,7 +57,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "stream-tcp.h"
 #include "detect-http-response-line.h"
 

diff --git a/src/detect-http-start.c b/src/detect-http-start.c
index d650f77f81ed40a38c42ae1a044d5e1a5f4530f6..fce6f63d9470b05e7dd1b84fc04e04a1d1e393d0 100644 (file)
--- a/src/detect-http-start.c
+++ b/src/detect-http-start.c
@@ -59,7 +59,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-header.h"
 #include "stream-tcp.h"
 

diff --git a/src/detect-http-stat-code.c b/src/detect-http-stat-code.c
index 0b403f9960db67f26f1dd5f3ad1be76b049ed861..82cdde855a728c708a0557818b7853df9ef857e0 100644 (file)
--- a/src/detect-http-stat-code.c
+++ b/src/detect-http-stat-code.c
@@ -58,7 +58,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-stat-code.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp.h"

diff --git a/src/detect-http-stat-msg.c b/src/detect-http-stat-msg.c
index 2e08b8acb854692fe25e7c9edcef37ed50962707..d2a494d42fe21ef1bab11bfe472b000a90f5ad42 100644 (file)
--- a/src/detect-http-stat-msg.c
+++ b/src/detect-http-stat-msg.c
@@ -58,7 +58,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-stat-msg.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp.h"

diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c
index 2972b249dbd377782a1dbd50df85d65bbe729b1f..9fe6236271ff2ef07be9935f925674902813d526 100644 (file)
--- a/src/detect-http-ua.c
+++ b/src/detect-http-ua.c
@@ -56,7 +56,6 @@
 #include "app-layer-parser.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "stream-tcp.h"
 #include "detect-http-ua.h"
 

diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c
index 04b6179fa9bb098c4beca494da07ceb7e1aeafbc..7a23777562f5f314a5e0bcba2fce240ac2460f31 100644 (file)
--- a/src/detect-http-uri.c
+++ b/src/detect-http-uri.c
@@ -53,7 +53,6 @@
 #include "app-layer.h"
 
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "detect-http-uri.h"
 #include "stream-tcp.h"
 

diff --git a/src/detect-lua.c b/src/detect-lua.c
index 60018060de132075287a26a71f11ad8bc5fbc0bc..418e423d6ef1732cac60ce3b99a3237f7998457e 100644 (file)
--- a/src/detect-lua.c
+++ b/src/detect-lua.c
@@ -48,7 +48,6 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 
 #include "stream-tcp.h"
 

diff --git a/src/detect-parse.c b/src/detect-parse.c
index dda086044b48f8c9676f702add8daf6735f0e171..65719286bb25e4af5882738b187f1b5a66cc8990 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -61,7 +61,6 @@
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 
 #include "util-classification-config.h"
 #include "util-unittest.h"

diff --git a/src/log-httplog.c b/src/log-httplog.c
index 7a36834f19bdbb08d1b3b85c7d8cc1372fb952aa..6622fb4009bb7a327492d48dec93d1c9707cd33f 100644 (file)
--- a/src/log-httplog.c
+++ b/src/log-httplog.c
@@ -41,7 +41,6 @@
 #include "output.h"
 #include "log-httplog.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "app-layer.h"
 #include "app-layer-parser.h"
 #include "util-privs.h"

diff --git a/src/output-json-http.c b/src/output-json-http.c
index 24cdfa3cc1c676deb9f753dd1003a9a860680618..9c6630460fbbc7f82c2e69f4c15955faf2a9dff6 100644 (file)
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -39,7 +39,6 @@
 
 #include "output.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "app-layer-htp-file.h"
 #include "app-layer-htp-xff.h"
 #include "app-layer.h"

diff --git a/src/util-lua-http.c b/src/util-lua-http.c
index 2c9ec8bb383f8d3451ed6d4cc479aa690bede940..2eff47861d4ed1b9779021aa37e014ba794f1f49 100644 (file)
--- a/src/util-lua-http.c
+++ b/src/util-lua-http.c
@@ -38,7 +38,6 @@
 
 #include "output.h"
 #include "app-layer-htp.h"
-#include "app-layer-htp-libhtp.h"
 #include "app-layer.h"
 #include "app-layer-parser.h"
 #include "util-privs.h"