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

detect/http: remove unused function parameter

Browse Source 
Will help to use generic DetectEngineInspectBufferGeneric
pull/14721/head
Philippe Antoine 6 months ago committed by Victor Julien
parent 49783fa9f7
commit cd0e4288c4
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
src/detect-http-header-common.c
Unescape Escape View File

@ -96,7 +96,7 @@ int HttpHeaderExpandBuffer(HttpHeaderThreadData *td, HttpHeaderBuffer *buf, size
return 0; return 0;
} }
HttpHeaderBuffer *HttpHeaderGetBufferSpace(DetectEngineThreadCtx *det_ctx, Flow *f, uint8_t flags, HttpHeaderBuffer *HttpHeaderGetBufferSpace(DetectEngineThreadCtx *det_ctx, uint8_t flags,
const int keyword_id, HttpHeaderThreadData **ret_hdr_td) const int keyword_id, HttpHeaderThreadData **ret_hdr_td)
{ {
*ret_hdr_td = NULL; *ret_hdr_td = NULL;

2
src/detect-http-header-common.h
Unescape Escape View File

@ -42,7 +42,7 @@ typedef struct HttpHeaderThreadData_ {
void *HttpHeaderThreadDataInit(void *data); void *HttpHeaderThreadDataInit(void *data);
void HttpHeaderThreadDataFree(void *data); void HttpHeaderThreadDataFree(void *data);
HttpHeaderBuffer *HttpHeaderGetBufferSpace(DetectEngineThreadCtx *det_ctx, Flow *f, uint8_t flags, HttpHeaderBuffer *HttpHeaderGetBufferSpace(DetectEngineThreadCtx *det_ctx, uint8_t flags,
const int keyword_id, HttpHeaderThreadData **ret_hdr_td); const int keyword_id, HttpHeaderThreadData **ret_hdr_td);
int HttpHeaderExpandBuffer(HttpHeaderThreadData *td, HttpHeaderBuffer *buf, size_t size); int HttpHeaderExpandBuffer(HttpHeaderThreadData *td, HttpHeaderBuffer *buf, size_t size);

7
src/detect-http-header-names.c
Unescape Escape View File

@ -76,13 +76,12 @@ static int g_keyword_thread_id = 0;
static HttpHeaderThreadDataConfig g_td_config = { BUFFER_SIZE_STEP }; static HttpHeaderThreadDataConfig g_td_config = { BUFFER_SIZE_STEP };
static uint8_t *GetBufferForTX( static uint8_t *GetBufferForTX(
htp_tx_t *tx, DetectEngineThreadCtx *det_ctx, Flow *f, uint8_t flags, uint32_t *buffer_len) htp_tx_t *tx, DetectEngineThreadCtx *det_ctx, uint8_t flags, uint32_t *buffer_len)
{ {
*buffer_len = 0; *buffer_len = 0;
HttpHeaderThreadData *hdr_td = NULL; HttpHeaderThreadData *hdr_td = NULL;
HttpHeaderBuffer *buf = HttpHeaderBuffer *buf = HttpHeaderGetBufferSpace(det_ctx, flags, g_keyword_thread_id, &hdr_td);
HttpHeaderGetBufferSpace(det_ctx, f, flags, g_keyword_thread_id, &hdr_td);
if (unlikely(buf == NULL)) { if (unlikely(buf == NULL)) {
return NULL; return NULL;
} }
@ -150,7 +149,7 @@ static InspectionBuffer *GetBuffer1ForTX(DetectEngineThreadCtx *det_ctx,
InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id); InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
if (buffer->inspect == NULL) { if (buffer->inspect == NULL) {
uint32_t rawdata_len = 0; uint32_t rawdata_len = 0;
uint8_t *rawdata = GetBufferForTX(txv, det_ctx, f, flow_flags, &rawdata_len); uint8_t *rawdata = GetBufferForTX(txv, det_ctx, flow_flags, &rawdata_len);
if (rawdata_len == 0) if (rawdata_len == 0)
return NULL; return NULL;

9
src/detect-http-header.c
Unescape Escape View File

@ -69,13 +69,12 @@ static int g_keyword_thread_id = 0;
static HttpHeaderThreadDataConfig g_td_config = { BUFFER_SIZE_STEP }; static HttpHeaderThreadDataConfig g_td_config = { BUFFER_SIZE_STEP };
static uint8_t *GetBufferForTX( static uint8_t *GetBufferForTX(
htp_tx_t *tx, DetectEngineThreadCtx *det_ctx, Flow *f, uint8_t flags, uint32_t *buffer_len) htp_tx_t *tx, DetectEngineThreadCtx *det_ctx, uint8_t flags, uint32_t *buffer_len)
{ {
*buffer_len = 0; *buffer_len = 0;
HttpHeaderThreadData *hdr_td = NULL; HttpHeaderThreadData *hdr_td = NULL;
HttpHeaderBuffer *buf = HttpHeaderBuffer *buf = HttpHeaderGetBufferSpace(det_ctx, flags, g_keyword_thread_id, &hdr_td);
HttpHeaderGetBufferSpace(det_ctx, f, flags, g_keyword_thread_id, &hdr_td);
if (unlikely(buf == NULL)) { if (unlikely(buf == NULL)) {
return NULL; return NULL;
} }
@ -186,7 +185,7 @@ static uint8_t DetectEngineInspectBufferHttpHeader(DetectEngineCtx *de_ctx,
} }
uint32_t rawdata_len = 0; uint32_t rawdata_len = 0;
uint8_t *rawdata = GetBufferForTX(txv, det_ctx, f, flags, &rawdata_len); uint8_t *rawdata = GetBufferForTX(txv, det_ctx, flags, &rawdata_len);
if (rawdata_len == 0) { if (rawdata_len == 0) {
SCLogDebug("no data"); SCLogDebug("no data");
if (engine->match_on_null && eof) { if (engine->match_on_null && eof) {
@ -245,7 +244,7 @@ static void PrefilterMpmHttpHeader(DetectEngineThreadCtx *det_ctx, const void *p
InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id); InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
if (buffer->inspect == NULL) { if (buffer->inspect == NULL) {
uint32_t rawdata_len = 0; uint32_t rawdata_len = 0;
uint8_t *rawdata = GetBufferForTX(txv, det_ctx, f, flags, &rawdata_len); uint8_t *rawdata = GetBufferForTX(txv, det_ctx, flags, &rawdata_len);
if (rawdata_len == 0) if (rawdata_len == 0)
return; return;

7
src/detect-http-start.c
Unescape Escape View File

@ -75,13 +75,12 @@ static int g_keyword_thread_id = 0;
static HttpHeaderThreadDataConfig g_td_config = { BUFFER_SIZE_STEP }; static HttpHeaderThreadDataConfig g_td_config = { BUFFER_SIZE_STEP };
static uint8_t *GetBufferForTX( static uint8_t *GetBufferForTX(
htp_tx_t *tx, DetectEngineThreadCtx *det_ctx, Flow *f, uint8_t flags, uint32_t *buffer_len) htp_tx_t *tx, DetectEngineThreadCtx *det_ctx, uint8_t flags, uint32_t *buffer_len)
{ {
*buffer_len = 0; *buffer_len = 0;
HttpHeaderThreadData *hdr_td = NULL; HttpHeaderThreadData *hdr_td = NULL;
HttpHeaderBuffer *buf = HttpHeaderBuffer *buf = HttpHeaderGetBufferSpace(det_ctx, flags, g_keyword_thread_id, &hdr_td);
HttpHeaderGetBufferSpace(det_ctx, f, flags, g_keyword_thread_id, &hdr_td);
if (unlikely(buf == NULL)) { if (unlikely(buf == NULL)) {
return NULL; return NULL;
} }
@ -155,7 +154,7 @@ static InspectionBuffer *GetBuffer1ForTX(DetectEngineThreadCtx *det_ctx,
InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id); InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
if (buffer->inspect == NULL) { if (buffer->inspect == NULL) {
uint32_t rawdata_len = 0; uint32_t rawdata_len = 0;
uint8_t *rawdata = GetBufferForTX(txv, det_ctx, f, flow_flags, &rawdata_len); uint8_t *rawdata = GetBufferForTX(txv, det_ctx, flow_flags, &rawdata_len);
if (rawdata_len == 0) if (rawdata_len == 0)
return NULL; return NULL;

Write Preview
Loading…
Cancel
Save