Skip to content

Commit 896e7ca

Browse files
jasonishjasonish
committed
detect: rename DetectAppLayerMpmRegister2 to DetectAppLayerMpmRegister
The old DetectAppLayerMpmRegister has not been around since 4.1.x. Rename the v2 of this function to a versionless function as there is no documentation referring to what the 2 means.
1 parent 2fe2d82 commit 896e7ca

File tree

73 files changed

+142
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+142
-142
lines changed

‎doc/userguide/devguide/extending/app-layer/transactions.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Rule Matching
6868

6969
Transaction progress is also used for certain keywords to know what is the minimum state before we can expect a match: until that, Suricata won't even try to look for the patterns.
7070

71-
As seen in ``DetectAppLayerMpmRegister2`` that has ``int progress`` as parameter, and ``DetectAppLayerInspectEngineRegister2``, which expects ``int tx_min_progress``, for instance. In the code snippet,
71+
As seen in ``DetectAppLayerMpmRegister`` that has ``int progress`` as parameter, and ``DetectAppLayerInspectEngineRegister2``, which expects ``int tx_min_progress``, for instance. In the code snippet,
7272
``HTTP2StateDataClient``, ``HTTP2StateDataServer`` and ``0`` are the values passed to the functions - in the last
7373
example, for ``FTPDATA``,
7474
the existence of a transaction implies that a file is being transferred. Hence the ``0`` value.
@@ -80,10 +80,10 @@ the existence of a transaction implies that a file is being transferred. Hence t
8080
{
8181
.
8282
.
83-
DetectAppLayerMpmRegister2("file_data", SIG_FLAG_TOSERVER, 2,
83+
DetectAppLayerMpmRegister("file_data", SIG_FLAG_TOSERVER, 2,
8484
PrefilterMpmFiledataRegister, NULL,
8585
ALPROTO_HTTP2, HTTP2StateDataClient);
86-
DetectAppLayerMpmRegister2("file_data", SIG_FLAG_TOCLIENT, 2,
86+
DetectAppLayerMpmRegister("file_data", SIG_FLAG_TOCLIENT, 2,
8787
PrefilterMpmFiledataRegister, NULL,
8888
ALPROTO_HTTP2, HTTP2StateDataServer);
8989
.

‎src/detect-dce-stub-data.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,29 +129,29 @@ void DetectDceStubDataRegister(void)
129129
ALPROTO_SMB, SIG_FLAG_TOSERVER, 0,
130130
DetectEngineInspectBufferGeneric,
131131
GetSMBData);
132-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
132+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
133133
PrefilterGenericMpmRegister, GetSMBData,
134134
ALPROTO_SMB, 0);
135135
DetectAppLayerInspectEngineRegister2(BUFFER_NAME,
136136
ALPROTO_SMB, SIG_FLAG_TOCLIENT, 0,
137137
DetectEngineInspectBufferGeneric,
138138
GetSMBData);
139-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2,
139+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2,
140140
PrefilterGenericMpmRegister, GetSMBData,
141141
ALPROTO_SMB, 0);
142142

143143
DetectAppLayerInspectEngineRegister2(BUFFER_NAME,
144144
ALPROTO_DCERPC, SIG_FLAG_TOSERVER, 0,
145145
DetectEngineInspectBufferGeneric,
146146
GetDCEData);
147-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
147+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
148148
PrefilterGenericMpmRegister, GetDCEData,
149149
ALPROTO_DCERPC, 0);
150150
DetectAppLayerInspectEngineRegister2(BUFFER_NAME,
151151
ALPROTO_DCERPC, SIG_FLAG_TOCLIENT, 0,
152152
DetectEngineInspectBufferGeneric,
153153
GetDCEData);
154-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2,
154+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2,
155155
PrefilterGenericMpmRegister, GetDCEData,
156156
ALPROTO_DCERPC, 0);
157157

‎src/detect-dnp3.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,15 +555,15 @@ static void DetectDNP3DataRegister(void)
555555
ALPROTO_DNP3, SIG_FLAG_TOSERVER, 0,
556556
DetectEngineInspectBufferGeneric,
557557
GetDNP3Data);
558-
DetectAppLayerMpmRegister2("dnp3_data", SIG_FLAG_TOSERVER, 2,
558+
DetectAppLayerMpmRegister("dnp3_data", SIG_FLAG_TOSERVER, 2,
559559
PrefilterGenericMpmRegister, GetDNP3Data,
560560
ALPROTO_DNP3, 0);
561561

562562
DetectAppLayerInspectEngineRegister2("dnp3_data",
563563
ALPROTO_DNP3, SIG_FLAG_TOCLIENT, 0,
564564
DetectEngineInspectBufferGeneric,
565565
GetDNP3Data);
566-
DetectAppLayerMpmRegister2("dnp3_data", SIG_FLAG_TOCLIENT, 2,
566+
DetectAppLayerMpmRegister("dnp3_data", SIG_FLAG_TOCLIENT, 2,
567567
PrefilterGenericMpmRegister, GetDNP3Data,
568568
ALPROTO_DNP3, 0);
569569

‎src/detect-dns-query.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void DetectDnsQueryRegister (void)
211211
sigmatch_table[DETECT_AL_DNS_QUERY].flags |= SIGMATCH_NOOPT;
212212
sigmatch_table[DETECT_AL_DNS_QUERY].flags |= SIGMATCH_INFO_STICKY_BUFFER;
213213

214-
DetectAppLayerMpmRegister2("dns_query", SIG_FLAG_TOSERVER, 2,
214+
DetectAppLayerMpmRegister("dns_query", SIG_FLAG_TOSERVER, 2,
215215
PrefilterMpmDnsQueryRegister, NULL,
216216
ALPROTO_DNS, 1);
217217

‎src/detect-engine-mpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int g_mpm_list_cnt[DETECT_BUFFER_MPM_TYPE_SIZE] = { 0, 0, 0 };
8686
*
8787
* \note to be used at start up / registration only. Errors are fatal.
8888
*/
89-
void DetectAppLayerMpmRegister2(const char *name, int direction, int priority,
89+
void DetectAppLayerMpmRegister(const char *name, int direction, int priority,
9090
PrefilterRegisterFunc PrefilterRegister, InspectionBufferGetDataPtr GetData,
9191
AppProto alproto, int tx_min_progress)
9292
{

‎src/detect-engine-mpm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ typedef int (*PrefilterRegisterFunc)(DetectEngineCtx *de_ctx, SigGroupHead *sgh,
9090
* \note direction must be set to either toserver or toclient.
9191
* If both are needed, register the keyword twice.
9292
*/
93-
void DetectAppLayerMpmRegister2(const char *name, int direction, int priority,
93+
void DetectAppLayerMpmRegister(const char *name, int direction, int priority,
9494
PrefilterRegisterFunc PrefilterRegister, InspectionBufferGetDataPtr GetData,
9595
AppProto alproto, int tx_min_progress);
9696
void DetectAppLayerMpmRegisterByParentId(

‎src/detect-http-client-body.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ void DetectHttpClientBodyRegister(void)
106106
DetectAppLayerInspectEngineRegister2("http_client_body", ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
107107
HTP_REQUEST_BODY, DetectEngineInspectBufferHttpBody, NULL);
108108

109-
DetectAppLayerMpmRegister2("http_client_body", SIG_FLAG_TOSERVER, 2,
109+
DetectAppLayerMpmRegister("http_client_body", SIG_FLAG_TOSERVER, 2,
110110
PrefilterMpmHttpRequestBodyRegister, NULL, ALPROTO_HTTP1, HTP_REQUEST_BODY);
111111

112112
DetectAppLayerInspectEngineRegister2("http_client_body", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
113113
HTTP2StateDataClient, DetectEngineInspectFiledata, NULL);
114-
DetectAppLayerMpmRegister2("http_client_body", SIG_FLAG_TOSERVER, 2,
114+
DetectAppLayerMpmRegister("http_client_body", SIG_FLAG_TOSERVER, 2,
115115
PrefilterMpmFiledataRegister, NULL, ALPROTO_HTTP2, HTTP2StateDataClient);
116116

117117
DetectBufferTypeSetDescriptionByName("http_client_body",

‎src/detect-http-cookie.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,19 @@ void DetectHttpCookieRegister(void)
111111
DetectAppLayerInspectEngineRegister2("http_cookie", ALPROTO_HTTP1, SIG_FLAG_TOCLIENT,
112112
HTP_REQUEST_HEADERS, DetectEngineInspectBufferGeneric, GetResponseData);
113113

114-
DetectAppLayerMpmRegister2("http_cookie", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
114+
DetectAppLayerMpmRegister("http_cookie", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
115115
GetRequestData, ALPROTO_HTTP1, HTP_REQUEST_HEADERS);
116-
DetectAppLayerMpmRegister2("http_cookie", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
116+
DetectAppLayerMpmRegister("http_cookie", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
117117
GetResponseData, ALPROTO_HTTP1, HTP_REQUEST_HEADERS);
118118

119119
DetectAppLayerInspectEngineRegister2("http_cookie", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
120120
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetRequestData2);
121121
DetectAppLayerInspectEngineRegister2("http_cookie", ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
122122
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetResponseData2);
123123

124-
DetectAppLayerMpmRegister2("http_cookie", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
124+
DetectAppLayerMpmRegister("http_cookie", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
125125
GetRequestData2, ALPROTO_HTTP2, HTTP2StateDataClient);
126-
DetectAppLayerMpmRegister2("http_cookie", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
126+
DetectAppLayerMpmRegister("http_cookie", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
127127
GetResponseData2, ALPROTO_HTTP2, HTTP2StateDataServer);
128128

129129
DetectBufferTypeSetDescriptionByName("http_cookie",

‎src/detect-http-header-names.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ void DetectHttpHeaderNamesRegister(void)
219219
sigmatch_table[DETECT_AL_HTTP_HEADER_NAMES].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER;
220220

221221
/* http1 */
222-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
222+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
223223
GetBuffer1ForTX, ALPROTO_HTTP1, HTP_REQUEST_HEADERS);
224-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
224+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
225225
GetBuffer1ForTX, ALPROTO_HTTP1, HTP_RESPONSE_HEADERS);
226226

227227
DetectAppLayerInspectEngineRegister2(BUFFER_NAME, ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
@@ -230,9 +230,9 @@ void DetectHttpHeaderNamesRegister(void)
230230
HTP_RESPONSE_HEADERS, DetectEngineInspectBufferGeneric, GetBuffer1ForTX);
231231

232232
/* http2 */
233-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
233+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
234234
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateDataClient);
235-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
235+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
236236
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateDataServer);
237237

238238
DetectAppLayerInspectEngineRegister2(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOSERVER,

‎src/detect-http-header.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -436,24 +436,24 @@ void DetectHttpHeaderRegister(void)
436436

437437
DetectAppLayerInspectEngineRegister2("http_header", ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
438438
HTP_REQUEST_HEADERS, DetectEngineInspectBufferHttpHeader, NULL);
439-
DetectAppLayerMpmRegister2("http_header", SIG_FLAG_TOSERVER, 2,
439+
DetectAppLayerMpmRegister("http_header", SIG_FLAG_TOSERVER, 2,
440440
PrefilterMpmHttpHeaderRequestRegister, NULL, ALPROTO_HTTP1,
441441
0); /* not used, registered twice: HEADERS/TRAILER */
442442

443443
DetectAppLayerInspectEngineRegister2("http_header", ALPROTO_HTTP1, SIG_FLAG_TOCLIENT,
444444
HTP_RESPONSE_HEADERS, DetectEngineInspectBufferHttpHeader, NULL);
445-
DetectAppLayerMpmRegister2("http_header", SIG_FLAG_TOCLIENT, 2,
445+
DetectAppLayerMpmRegister("http_header", SIG_FLAG_TOCLIENT, 2,
446446
PrefilterMpmHttpHeaderResponseRegister, NULL, ALPROTO_HTTP1,
447447
0); /* not used, registered twice: HEADERS/TRAILER */
448448

449449
DetectAppLayerInspectEngineRegister2("http_header", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
450450
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);
451-
DetectAppLayerMpmRegister2("http_header", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
451+
DetectAppLayerMpmRegister("http_header", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
452452
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateDataClient);
453453

454454
DetectAppLayerInspectEngineRegister2("http_header", ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
455455
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);
456-
DetectAppLayerMpmRegister2("http_header", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
456+
DetectAppLayerMpmRegister("http_header", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
457457
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateDataServer);
458458

459459
DetectBufferTypeSetDescriptionByName("http_header",
@@ -739,11 +739,11 @@ void DetectHttpRequestHeaderRegister(void)
739739
sigmatch_table[DETECT_HTTP_REQUEST_HEADER].flags |=
740740
SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER;
741741

742-
DetectAppLayerMpmRegister2("http_request_header", SIG_FLAG_TOSERVER, 2,
742+
DetectAppLayerMpmRegister("http_request_header", SIG_FLAG_TOSERVER, 2,
743743
PrefilterMpmHttp2HeaderRegister, NULL, ALPROTO_HTTP2, HTTP2StateOpen);
744744
DetectAppLayerInspectEngineRegister2("http_request_header", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
745745
HTTP2StateOpen, DetectEngineInspectHttp2Header, NULL);
746-
DetectAppLayerMpmRegister2("http_request_header", SIG_FLAG_TOSERVER, 2,
746+
DetectAppLayerMpmRegister("http_request_header", SIG_FLAG_TOSERVER, 2,
747747
PrefilterMpmHttp1HeaderRegister, NULL, ALPROTO_HTTP1, 0);
748748
DetectAppLayerInspectEngineRegister2("http_request_header", ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
749749
HTP_REQUEST_HEADERS, DetectEngineInspectHttp1Header, NULL);
@@ -774,11 +774,11 @@ void DetectHttpResponseHeaderRegister(void)
774774
sigmatch_table[DETECT_HTTP_RESPONSE_HEADER].flags |=
775775
SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER;
776776

777-
DetectAppLayerMpmRegister2("http_response_header", SIG_FLAG_TOCLIENT, 2,
777+
DetectAppLayerMpmRegister("http_response_header", SIG_FLAG_TOCLIENT, 2,
778778
PrefilterMpmHttp2HeaderRegister, NULL, ALPROTO_HTTP2, HTTP2StateOpen);
779779
DetectAppLayerInspectEngineRegister2("http_response_header", ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
780780
HTTP2StateOpen, DetectEngineInspectHttp2Header, NULL);
781-
DetectAppLayerMpmRegister2("http_response_header", SIG_FLAG_TOCLIENT, 2,
781+
DetectAppLayerMpmRegister("http_response_header", SIG_FLAG_TOCLIENT, 2,
782782
PrefilterMpmHttp1HeaderRegister, NULL, ALPROTO_HTTP1, 0);
783783
DetectAppLayerInspectEngineRegister2("http_response_header", ALPROTO_HTTP1, SIG_FLAG_TOCLIENT,
784784
HTP_RESPONSE_HEADERS, DetectEngineInspectHttp1Header, NULL);

‎src/detect-http-headers-stub.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,15 @@ static void DetectHttpHeadersRegisterStub(void)
186186
sigmatch_table[KEYWORD_ID].flags |= SIGMATCH_NOOPT | SIGMATCH_INFO_STICKY_BUFFER;
187187

188188
#ifdef KEYWORD_TOSERVER
189-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
189+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
190190
GetRequestData, ALPROTO_HTTP1, HTP_REQUEST_HEADERS);
191-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
191+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
192192
GetRequestData2, ALPROTO_HTTP2, HTTP2StateDataClient);
193193
#endif
194194
#ifdef KEYWORD_TOCLIENT
195-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
195+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
196196
GetResponseData, ALPROTO_HTTP1, HTP_RESPONSE_HEADERS);
197-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
197+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
198198
GetResponseData2, ALPROTO_HTTP2, HTTP2StateDataServer);
199199
#endif
200200
#ifdef KEYWORD_TOSERVER

‎src/detect-http-host.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ void DetectHttpHHRegister(void)
108108
DetectAppLayerInspectEngineRegister2("http_host", ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
109109
HTP_REQUEST_HEADERS, DetectEngineInspectBufferGeneric, GetData);
110110

111-
DetectAppLayerMpmRegister2("http_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
111+
DetectAppLayerMpmRegister("http_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
112112
GetData, ALPROTO_HTTP1, HTP_REQUEST_HEADERS);
113113

114114
DetectAppLayerInspectEngineRegister2("http_host", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
115115
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
116116

117-
DetectAppLayerMpmRegister2("http_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
117+
DetectAppLayerMpmRegister("http_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
118118
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
119119

120120
DetectBufferTypeRegisterValidateCallback("http_host",
@@ -143,13 +143,13 @@ void DetectHttpHHRegister(void)
143143
DetectAppLayerInspectEngineRegister2("http_raw_host", ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
144144
HTP_REQUEST_HEADERS, DetectEngineInspectBufferGeneric, GetRawData);
145145

146-
DetectAppLayerMpmRegister2("http_raw_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
146+
DetectAppLayerMpmRegister("http_raw_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
147147
GetRawData, ALPROTO_HTTP1, HTP_REQUEST_HEADERS);
148148

149149
DetectAppLayerInspectEngineRegister2("http_raw_host", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
150150
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetRawData2);
151151

152-
DetectAppLayerMpmRegister2("http_raw_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
152+
DetectAppLayerMpmRegister("http_raw_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
153153
GetRawData2, ALPROTO_HTTP2, HTTP2StateDataClient);
154154

155155
DetectBufferTypeSetDescriptionByName("http_raw_host",

‎src/detect-http-method.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ void DetectHttpMethodRegister(void)
100100
DetectAppLayerInspectEngineRegister2("http_method", ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
101101
HTP_REQUEST_LINE, DetectEngineInspectBufferGeneric, GetData);
102102

103-
DetectAppLayerMpmRegister2("http_method", SIG_FLAG_TOSERVER, 4, PrefilterGenericMpmRegister,
103+
DetectAppLayerMpmRegister("http_method", SIG_FLAG_TOSERVER, 4, PrefilterGenericMpmRegister,
104104
GetData, ALPROTO_HTTP1, HTP_REQUEST_LINE);
105105

106106
DetectAppLayerInspectEngineRegister2("http_method", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
107107
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
108108

109-
DetectAppLayerMpmRegister2("http_method", SIG_FLAG_TOSERVER, 4, PrefilterGenericMpmRegister,
109+
DetectAppLayerMpmRegister("http_method", SIG_FLAG_TOSERVER, 4, PrefilterGenericMpmRegister,
110110
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
111111

112112
DetectBufferTypeSetDescriptionByName("http_method",

‎src/detect-http-protocol.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ void DetectHttpProtocolRegister(void)
140140
sigmatch_table[DETECT_AL_HTTP_PROTOCOL].Setup = DetectHttpProtocolSetup;
141141
sigmatch_table[DETECT_AL_HTTP_PROTOCOL].flags |= SIGMATCH_INFO_STICKY_BUFFER | SIGMATCH_NOOPT;
142142

143-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
143+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
144144
GetData, ALPROTO_HTTP1, HTP_REQUEST_LINE);
145-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
145+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
146146
GetData, ALPROTO_HTTP1, HTP_RESPONSE_LINE);
147147
DetectAppLayerInspectEngineRegister2(BUFFER_NAME, ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
148148
HTP_REQUEST_LINE, DetectEngineInspectBufferGeneric, GetData);
@@ -151,11 +151,11 @@ void DetectHttpProtocolRegister(void)
151151

152152
DetectAppLayerInspectEngineRegister2(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
153153
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
154-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
154+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
155155
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
156156
DetectAppLayerInspectEngineRegister2(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
157157
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetData2);
158-
DetectAppLayerMpmRegister2(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
158+
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
159159
GetData2, ALPROTO_HTTP2, HTTP2StateDataServer);
160160

161161
DetectBufferTypeSetDescriptionByName(BUFFER_NAME,

0 commit comments

Comments
 (0)