http: minor cleanups for detect

In preparation of libhtp rust

Mainly adding some const

diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index 7397edf079552298edd34af26a1a667671cfb54c..865a88d8a1e2cf8a7467cdd166355f350b7c44e8 100644 (file)
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -181,7 +181,7 @@ static InspectionBuffer *GetRequestData(DetectEngineThreadCtx *det_ctx,
         if (htp_tx_request_headers(tx) == NULL)
             return NULL;
 
-        htp_header_t *h = (htp_header_t *)htp_tx_request_header(tx, "Cookie");
+        const htp_header_t *h = htp_tx_request_header(tx, "Cookie");
         if (h == NULL || htp_header_value(h) == NULL) {
             SCLogDebug("HTTP cookie header not present in this request");
             return NULL;
@@ -208,7 +208,7 @@ static InspectionBuffer *GetResponseData(DetectEngineThreadCtx *det_ctx,
         if (htp_tx_response_headers(tx) == NULL)
             return NULL;
 
-        htp_header_t *h = (htp_header_t *)htp_tx_response_header(tx, "Set-Cookie");
+        const htp_header_t *h = htp_tx_response_header(tx, "Set-Cookie");
         if (h == NULL || htp_header_value(h) == NULL) {
             SCLogDebug("HTTP cookie header not present in this request");
             return NULL;

diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c
index eb941434c77e4c52430ca918730d27f8ea9b7257..fa2f1c4be28b50143ff3dc3b4ea28cf1fea3faf3 100644 (file)
--- a/src/detect-http-header-names.c
+++ b/src/detect-http-header-names.c
@@ -105,7 +105,7 @@ static uint8_t *GetBufferForTX(
     size_t i = 0;
     size_t no_of_headers = htp_headers_size(headers);
     for (; i < no_of_headers; i++) {
-        htp_header_t *h = htp_headers_get_index(headers, i);
+        const htp_header_t *h = htp_headers_get_index(headers, i);
         size_t size = htp_header_name_len(h) + 2; // for \r\n
         if (i == 0)
             size += 2;

diff --git a/src/detect-http-header.c b/src/detect-http-header.c
index f031a3790fc3bfda04a335c385fd40acb0d6847f..14cfdc8703adae9e387865469acbb032683fcbe1 100644 (file)
--- a/src/detect-http-header.c
+++ b/src/detect-http-header.c
@@ -97,7 +97,7 @@ static uint8_t *GetBufferForTX(
     size_t i = 0;
     size_t no_of_headers = htp_headers_size(headers);
     for (; i < no_of_headers; i++) {
-        htp_header_t *h = htp_headers_get_index(headers, i);
+        const htp_header_t *h = htp_headers_get_index(headers, i);
         size_t size1 = htp_header_name_len(h);
         size_t size2 = htp_header_value_len(h);
 
@@ -575,7 +575,7 @@ static InspectionBuffer *GetHttp1HeaderData(DetectEngineThreadCtx *det_ctx,
             hdr_td->cap = no_of_headers;
         }
         for (size_t i = 0; i < no_of_headers; i++) {
-            htp_header_t *h = htp_headers_get_index(headers, i);
+            const htp_header_t *h = htp_headers_get_index(headers, i);
             size_t size1 = htp_header_name_len(h);
             size_t size2 = htp_header_value_len(h);
             size_t size = size1 + size2 + 2;

diff --git a/src/detect-http-host.c b/src/detect-http-host.c
index 0df8911eeb49dbbbcca6aef10205662ba3b8a281..a86625d8afaeb1ba2edd0fed5ea0231b127288c7 100644 (file)
--- a/src/detect-http-host.c
+++ b/src/detect-http-host.c
@@ -352,7 +352,7 @@ static InspectionBuffer *GetRawData(DetectEngineThreadCtx *det_ctx,
             if (htp_tx_request_headers(tx) == NULL)
                 return NULL;
 
-            htp_header_t *h = (htp_header_t *)htp_tx_request_header(tx, "Host");
+            const htp_header_t *h = htp_tx_request_header(tx, "Host");
             if (h == NULL || htp_header_value(h) == NULL)
                 return NULL;
 

diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c
index 8f50693be0ccd5d024f7e8b4ec79572cbdef4848..0c2d9cb71b62dd9e5ce4b6008beb573cb37add1a 100644 (file)
--- a/src/detect-http-protocol.c
+++ b/src/detect-http-protocol.c
@@ -87,7 +87,7 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        bstr *str = NULL;
+        const bstr *str = NULL;
         htp_tx_t *tx = (htp_tx_t *)txv;
 
         if (flow_flags & STREAM_TOSERVER)

diff --git a/src/detect-http-start.c b/src/detect-http-start.c
index 098b866eb0c758c1855dad429f43ce1233b1a776..9d1c539e607d9d817497fe9898cbf2507fe68ba4 100644 (file)
--- a/src/detect-http-start.c
+++ b/src/detect-http-start.c
@@ -85,7 +85,7 @@ static uint8_t *GetBufferForTX(
         return NULL;
     }
 
-    bstr *line = NULL;
+    const bstr *line = NULL;
     htp_table_t *headers;
     if (flags & STREAM_TOSERVER) {
         if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_HTTP1, tx, flags) <=
@@ -117,7 +117,7 @@ static uint8_t *GetBufferForTX(
     size_t i = 0;
     size_t no_of_headers = htp_headers_size(headers);
     for (; i < no_of_headers; i++) {
-        htp_header_t *h = htp_headers_get_index(headers, i);
+        const htp_header_t *h = htp_headers_get_index(headers, i);
         size_t size1 = htp_header_name_len(h);
         size_t size2 = htp_header_value_len(h);
         size_t size = size1 + size2 + 4;

diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c
index a643bf913fb521634d08a4b614580e5e76e9db02..2a539d69df3f46bc19516d4a6707ab2596be1b4e 100644 (file)
--- a/src/detect-http-ua.c
+++ b/src/detect-http-ua.c
@@ -165,7 +165,7 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
         if (htp_tx_request_headers(tx) == NULL)
             return NULL;
 
-        htp_header_t *h = (htp_header_t *)htp_tx_request_header(tx, "User-Agent");
+        const htp_header_t *h = htp_tx_request_header(tx, "User-Agent");
         if (h == NULL || htp_header_value(h) == NULL) {
             SCLogDebug("HTTP UA header not present in this request");
             return NULL;