detect: detect engine registration cleanup

diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c
index ec31ea4b8505807dc8295ee756c0bb37fcdcbb68..a4207899f426536b5a84b421a6a0ac72ebc0ea67 100644 (file)
--- a/src/detect-app-layer-event.c
+++ b/src/detect-app-layer-event.c
@@ -78,10 +78,10 @@ void DetectAppLayerEventRegister(void)
     sigmatch_table[DETECT_AL_APP_LAYER_EVENT].RegisterTests =
         DetectAppLayerEventRegisterTests;
 
-    DetectAppLayerInspectEngineRegister2("app-layer-events",
+    DetectAppLayerInspectEngineRegister("app-layer-events",
             ALPROTO_UNKNOWN, SIG_FLAG_TOSERVER,
             DetectEngineAptEventInspect);
-    DetectAppLayerInspectEngineRegister2("app-layer-events",
+    DetectAppLayerInspectEngineRegister("app-layer-events",
             ALPROTO_UNKNOWN, SIG_FLAG_TOCLIENT,
             DetectEngineAptEventInspect);
 

diff --git a/src/detect-cipservice.c b/src/detect-cipservice.c
index 8a6d61b9042999f93b6bc6b81e7149a975c5ec58..1074241d5a1c08e6b8a28b7542f0da7591cf94d8 100644 (file)
--- a/src/detect-cipservice.c
+++ b/src/detect-cipservice.c
@@ -59,10 +59,10 @@ void DetectCipServiceRegister(void)
     sigmatch_table[DETECT_CIPSERVICE].RegisterTests
             = DetectCipServiceRegisterTests;
 
-    DetectAppLayerInspectEngineRegister2("cip",
+    DetectAppLayerInspectEngineRegister("cip",
             ALPROTO_ENIP, SIG_FLAG_TOSERVER,
             DetectEngineInspectCIP);
-    DetectAppLayerInspectEngineRegister2("cip",
+    DetectAppLayerInspectEngineRegister("cip",
             ALPROTO_ENIP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectCIP);
 
@@ -321,10 +321,10 @@ void DetectEnipCommandRegister(void)
     sigmatch_table[DETECT_ENIPCOMMAND].RegisterTests
             = DetectEnipCommandRegisterTests;
 
-    DetectAppLayerInspectEngineRegister2("enip",
+    DetectAppLayerInspectEngineRegister("enip",
             ALPROTO_ENIP, SIG_FLAG_TOSERVER,
             DetectEngineInspectENIP);
-    DetectAppLayerInspectEngineRegister2("enip",
+    DetectAppLayerInspectEngineRegister("enip",
             ALPROTO_ENIP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectENIP);
 

diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c
index 6c868a5f212ebdbd8cb838bdcde461a77dcb8043..438c38cb3a0a8df1fdb481ea6d164f2e1189f647 100644 (file)
--- a/src/detect-dnp3.c
+++ b/src/detect-dnp3.c
@@ -549,10 +549,10 @@ static void DetectDNP3DataRegister(void)
     sigmatch_table[DETECT_AL_DNP3DATA].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_DNP3DATA].flags |= SIGMATCH_PAYLOAD;
 
-    DetectAppLayerInspectEngineRegister2("dnp3_data",
+    DetectAppLayerInspectEngineRegister("dnp3_data",
             ALPROTO_DNP3, SIG_FLAG_TOSERVER,
             DetectEngineInspectDNP3Data);
-    DetectAppLayerInspectEngineRegister2("dnp3_data",
+    DetectAppLayerInspectEngineRegister("dnp3_data",
             ALPROTO_DNP3, SIG_FLAG_TOCLIENT,
             DetectEngineInspectDNP3Data);
 
@@ -569,10 +569,10 @@ void DetectDNP3Register(void)
     DetectDNP3ObjRegister();
 
     /* Register the list of func, ind and obj. */
-    DetectAppLayerInspectEngineRegister2("dnp3",
+    DetectAppLayerInspectEngineRegister("dnp3",
             ALPROTO_DNP3, SIG_FLAG_TOSERVER,
             DetectEngineInspectDNP3);
-    DetectAppLayerInspectEngineRegister2("dnp3",
+    DetectAppLayerInspectEngineRegister("dnp3",
             ALPROTO_DNP3, SIG_FLAG_TOCLIENT,
             DetectEngineInspectDNP3);
 

diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index 573f021f9a5ebc1c527b7135a668e02d15e8e618..c8f9690b47b1971119e2172fad5a7352b8d4934e 100644 (file)
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -81,7 +81,7 @@ void DetectDnsQueryRegister (void)
     DetectAppLayerMpmRegister("dns_query", SIG_FLAG_TOSERVER, 2,
             PrefilterTxDnsQueryRegister);
 
-    DetectAppLayerInspectEngineRegister2("dns_query",
+    DetectAppLayerInspectEngineRegister("dns_query",
             ALPROTO_DNS, SIG_FLAG_TOSERVER,
             DetectEngineInspectDnsQueryName);
 
@@ -91,10 +91,10 @@ void DetectDnsQueryRegister (void)
     g_dns_query_buffer_id = DetectBufferTypeGetByName("dns_query");
 
     /* register these generic engines from here for now */
-    DetectAppLayerInspectEngineRegister2("dns_request",
+    DetectAppLayerInspectEngineRegister("dns_request",
             ALPROTO_DNS, SIG_FLAG_TOSERVER,
             DetectEngineInspectDnsRequest);
-    DetectAppLayerInspectEngineRegister2("dns_response",
+    DetectAppLayerInspectEngineRegister("dns_response",
             ALPROTO_DNS, SIG_FLAG_TOCLIENT,
             DetectEngineInspectDnsResponse);
 

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 8fc6fb766c6c3f5bf97e087757200d01a88f24d4..c19d3f0ef85bb3e561dee19aae30717969540b56 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -101,14 +101,16 @@ static uint32_t DetectEngineTentantGetIdFromPcap(const void *ctx, const Packet *
 
 static DetectEngineAppInspectionEngine *g_app_inspect_engines = NULL;
 
-void DetectAppLayerInspectEngineRegister(AppProto alproto,
-        uint32_t dir, int32_t sm_list, InspectEngineFuncPtr Callback)
+void DetectAppLayerInspectEngineRegister(const char *name,
+        AppProto alproto, uint32_t dir, InspectEngineFuncPtr Callback)
 {
-    const int nlists = DetectBufferTypeMaxId();
+    DetectBufferTypeRegister(name);
+    int sm_list = DetectBufferTypeGetByName(name);
+    BUG_ON(sm_list == -1);
 
     if ((alproto >= ALPROTO_FAILED) ||
         (!(dir == SIG_FLAG_TOSERVER || dir == SIG_FLAG_TOCLIENT)) ||
-        (sm_list < DETECT_SM_LIST_MATCH || sm_list >= nlists) ||
+        (sm_list < DETECT_SM_LIST_MATCH) ||
         (Callback == NULL))
     {
         SCLogError(SC_ERR_INVALID_ARGUMENTS, "Invalid arguments");
@@ -144,15 +146,6 @@ void DetectAppLayerInspectEngineRegister(AppProto alproto,
     }
 }
 
-void DetectAppLayerInspectEngineRegister2(const char *name,
-        AppProto alproto, uint32_t dir, InspectEngineFuncPtr Callback)
-{
-    DetectBufferTypeRegister(name);
-    int sm_list = DetectBufferTypeGetByName(name);
-    BUG_ON(sm_list == -1);
-    DetectAppLayerInspectEngineRegister(alproto, dir, sm_list, Callback);
-}
-
 int DetectEngineAppInspectionEngine2Signature(Signature *s)
 {
     const int nlists = DetectBufferTypeMaxId();

diff --git a/src/detect-engine.h b/src/detect-engine.h
index ada68647a9f12a73b62b9269ddefc135b86e9b02..a29db7a5642ac208f8c392ccc25638d2f709880c 100644 (file)
--- a/src/detect-engine.h
+++ b/src/detect-engine.h
@@ -97,16 +97,13 @@ int DetectEngineInspectGenericList(ThreadVars *, const DetectEngineCtx *,
 /**
  * \brief Registers an app inspection engine.
  *
+ * \param name Name of the detection list
  * \param alproto App layer protocol for which we will register the engine.
  * \param direction The direction for the engine: SIG_FLAG_TOSERVER or
  *                  SIG_FLAG_TOCLIENT
- * \param sm_list The SigMatch list against which the engine works.
  * \param Callback The engine callback.
  */
-void DetectAppLayerInspectEngineRegister(AppProto alproto,
-        uint32_t dir, int32_t sm_list, InspectEngineFuncPtr Callback);
-
-void DetectAppLayerInspectEngineRegister2(const char *name,
+void DetectAppLayerInspectEngineRegister(const char *name,
         AppProto alproto, uint32_t dir, InspectEngineFuncPtr Callback);
 
 int DetectEngineAppInspectionEngine2Signature(Signature *s);

diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index e9a4a14b9453a0236bb407770375652ceef11aa4..ef245f91520ab220a7d0a249569b8f49b87981e9 100644 (file)
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -71,10 +71,10 @@ void DetectFiledataRegister(void)
     DetectAppLayerMpmRegister("file_data", SIG_FLAG_TOCLIENT, 2,
             PrefilterTxHttpResponseBodyRegister);
 
-    DetectAppLayerInspectEngineRegister2("file_data",
+    DetectAppLayerInspectEngineRegister("file_data",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectHttpServerBody);
-    DetectAppLayerInspectEngineRegister2("file_data",
+    DetectAppLayerInspectEngineRegister("file_data",
             ALPROTO_SMTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectSMTPFiledata);
 

diff --git a/src/detect-filename.c b/src/detect-filename.c
index 1b59519fb9e4f3e2dc1a683248c0d283f53e29de..67b386b2f76a7c4de6b880a2f07f24cce450ccdd 100644 (file)
--- a/src/detect-filename.c
+++ b/src/detect-filename.c
@@ -72,14 +72,14 @@ void DetectFilenameRegister(void)
     sigmatch_table[DETECT_FILENAME].Free  = DetectFilenameFree;
     sigmatch_table[DETECT_FILENAME].RegisterTests = DetectFilenameRegisterTests;
 
-    DetectAppLayerInspectEngineRegister2("files",
+    DetectAppLayerInspectEngineRegister("files",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectFileInspectHttp);
-    DetectAppLayerInspectEngineRegister2("files",
+    DetectAppLayerInspectEngineRegister("files",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectFileInspectHttp);
 
-    DetectAppLayerInspectEngineRegister2("files",
+    DetectAppLayerInspectEngineRegister("files",
             ALPROTO_SMTP, SIG_FLAG_TOSERVER,
             DetectFileInspectSmtp);
 

diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c
index 9ec6be6d398ee9b4fc19bd77079b2a402d54e350..2273aefbaefd13bbce2e14467a5e48d147b325e1 100644 (file)
--- a/src/detect-http-client-body.c
+++ b/src/detect-http-client-body.c
@@ -84,7 +84,7 @@ void DetectHttpClientBodyRegister(void)
     DetectAppLayerMpmRegister("http_client_body", SIG_FLAG_TOSERVER, 2,
             PrefilterTxHttpRequestBodyRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_client_body",
+    DetectAppLayerInspectEngineRegister("http_client_body",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpClientBody);
 

diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index 1cc61fe8170f9cfe439d84a4154f8f194968e149..2b0baeaa21b972cf0b3124b703bf02cb7150fb79 100644 (file)
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -89,10 +89,10 @@ void DetectHttpCookieRegister(void)
     DetectAppLayerMpmRegister("http_cookie", SIG_FLAG_TOCLIENT, 2,
             PrefilterTxResponseCookieRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_cookie",
+    DetectAppLayerInspectEngineRegister("http_cookie",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpCookie);
-    DetectAppLayerInspectEngineRegister2("http_cookie",
+    DetectAppLayerInspectEngineRegister("http_cookie",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectHttpCookie);
 

diff --git a/src/detect-http-header.c b/src/detect-http-header.c
index 55a248b1429fd67691a104c7a2f6ef8f3e2dc264..b2696463e48c30933d7d17d011638ba94e99af79 100644 (file)
--- a/src/detect-http-header.c
+++ b/src/detect-http-header.c
@@ -88,10 +88,10 @@ void DetectHttpHeaderRegister(void)
     DetectAppLayerMpmRegister("http_header", SIG_FLAG_TOCLIENT, 2,
             PrefilterTxHttpResponseHeadersRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_header",
+    DetectAppLayerInspectEngineRegister("http_header",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpHeader);
-    DetectAppLayerInspectEngineRegister2("http_header",
+    DetectAppLayerInspectEngineRegister("http_header",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectHttpHeader);
 

diff --git a/src/detect-http-hh.c b/src/detect-http-hh.c
index 5e51c7cba90d228c7d7e43c3016cd0dd691cfe7a..7c943d07d64c4fdffacb9a010e6abc5c983d2ac6 100644 (file)
--- a/src/detect-http-hh.c
+++ b/src/detect-http-hh.c
@@ -85,7 +85,7 @@ void DetectHttpHHRegister(void)
     DetectAppLayerMpmRegister("http_host", SIG_FLAG_TOSERVER, 2,
             PrefilterTxHostnameRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_host",
+    DetectAppLayerInspectEngineRegister("http_host",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpHH);
 

diff --git a/src/detect-http-hrh.c b/src/detect-http-hrh.c
index 439eaef785953789dd79d77c2b52531b452155a7..92f504e5667678093ae0a0f04c430780b0926218 100644 (file)
--- a/src/detect-http-hrh.c
+++ b/src/detect-http-hrh.c
@@ -84,7 +84,7 @@ void DetectHttpHRHRegister(void)
     DetectAppLayerMpmRegister("http_raw_host", SIG_FLAG_TOSERVER, 2,
             PrefilterTxHostnameRawRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_raw_host",
+    DetectAppLayerInspectEngineRegister("http_raw_host",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpHRH);
 

diff --git a/src/detect-http-method.c b/src/detect-http-method.c
index 3fa059cb770f4ac2819470c6b71baaae74f87ee0..0cf00f9bcdc479e66ab4efab2d72b50a82796b2a 100644 (file)
--- a/src/detect-http-method.c
+++ b/src/detect-http-method.c
@@ -86,7 +86,7 @@ void DetectHttpMethodRegister(void)
     DetectAppLayerMpmRegister("http_method", SIG_FLAG_TOSERVER, 4,
             PrefilterTxMethodRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_method",
+    DetectAppLayerInspectEngineRegister("http_method",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpMethod);
 

diff --git a/src/detect-http-raw-header.c b/src/detect-http-raw-header.c
index b1a03254d79deb88214cba600d5d8e1375ebeacf..35b9d3ad62863640ffd238111daaf26f00bb5a9f 100644 (file)
--- a/src/detect-http-raw-header.c
+++ b/src/detect-http-raw-header.c
@@ -87,10 +87,10 @@ void DetectHttpRawHeaderRegister(void)
     DetectAppLayerMpmRegister("http_raw_header", SIG_FLAG_TOCLIENT, 2,
             PrefilterTxResponseHeadersRawRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_raw_header",
+    DetectAppLayerInspectEngineRegister("http_raw_header",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpRawHeader);
-    DetectAppLayerInspectEngineRegister2("http_raw_header",
+    DetectAppLayerInspectEngineRegister("http_raw_header",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectHttpRawHeader);
 

diff --git a/src/detect-http-raw-uri.c b/src/detect-http-raw-uri.c
index 29f2c69308c9104312ee041483d35616db7cd5a3..080586e428b7102d26b44cb524903822c532a70e 100644 (file)
--- a/src/detect-http-raw-uri.c
+++ b/src/detect-http-raw-uri.c
@@ -79,7 +79,7 @@ void DetectHttpRawUriRegister(void)
     DetectAppLayerMpmRegister("http_raw_uri", SIG_FLAG_TOSERVER, 2,
             PrefilterTxRawUriRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_raw_uri",
+    DetectAppLayerInspectEngineRegister("http_raw_uri",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpRawUri);
 

diff --git a/src/detect-http-request-line.c b/src/detect-http-request-line.c
index 15516f37beb01efea553330192dbf357c96907b1..7c8cd3082e7e38bfe9cf700bb7541938e1215ca5 100644 (file)
--- a/src/detect-http-request-line.c
+++ b/src/detect-http-request-line.c
@@ -89,7 +89,7 @@ void DetectHttpRequestLineRegister(void)
     DetectAppLayerMpmRegister("http_request_line", SIG_FLAG_TOSERVER, 2,
             PrefilterTxHttpRequestLineRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_request_line",
+    DetectAppLayerInspectEngineRegister("http_request_line",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpRequestLine);
 

diff --git a/src/detect-http-response-line.c b/src/detect-http-response-line.c
index c798e35bb445b4569ad3c033fad66f2e411aa83f..f7dd062faae75b7a7b0347449dbeb2c1c660928b 100644 (file)
--- a/src/detect-http-response-line.c
+++ b/src/detect-http-response-line.c
@@ -89,7 +89,7 @@ void DetectHttpResponseLineRegister(void)
     DetectAppLayerMpmRegister("http_response_line", SIG_FLAG_TOCLIENT, 2,
             PrefilterTxHttpResponseLineRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_response_line",
+    DetectAppLayerInspectEngineRegister("http_response_line",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectHttpResponseLine);
 

diff --git a/src/detect-http-stat-code.c b/src/detect-http-stat-code.c
index 8a3b4d4b6eff3ee590f04e312ec800d97e7661f3..938ce6e5f98ebfdf9afbb13f784997ba5681bd94 100644 (file)
--- a/src/detect-http-stat-code.c
+++ b/src/detect-http-stat-code.c
@@ -88,7 +88,7 @@ void DetectHttpStatCodeRegister (void)
     DetectAppLayerMpmRegister("http_stat_code", SIG_FLAG_TOCLIENT, 4,
             PrefilterTxHttpStatCodeRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_stat_code",
+    DetectAppLayerInspectEngineRegister("http_stat_code",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectHttpStatCode);
 

diff --git a/src/detect-http-stat-msg.c b/src/detect-http-stat-msg.c
index d3a916c2b706b749f3d289d8130855f467eee15f..57dffbf8072163c485274a8ce7fa0f8457e0b4c9 100644 (file)
--- a/src/detect-http-stat-msg.c
+++ b/src/detect-http-stat-msg.c
@@ -88,7 +88,7 @@ void DetectHttpStatMsgRegister (void)
     DetectAppLayerMpmRegister("http_stat_msg", SIG_FLAG_TOCLIENT, 3,
             PrefilterTxHttpStatMsgRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_stat_msg",
+    DetectAppLayerInspectEngineRegister("http_stat_msg",
             ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
             DetectEngineInspectHttpStatMsg);
 

diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c
index 5e0824dab7a70bebc46c1f5a60899694a9d03b64..b154806f39ef82ab2dd67caf3943c349ac44a10e 100644 (file)
--- a/src/detect-http-ua.c
+++ b/src/detect-http-ua.c
@@ -85,7 +85,7 @@ void DetectHttpUARegister(void)
     DetectAppLayerMpmRegister("http_user_agent", SIG_FLAG_TOSERVER, 2,
             PrefilterTxUARegister);
 
-    DetectAppLayerInspectEngineRegister2("http_user_agent",
+    DetectAppLayerInspectEngineRegister("http_user_agent",
             ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpUA);
 

diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c
index 45acf4a7db42ecf975f8626a93e6e19a6de88580..3ae8f866eb5048579ea00266bfe7e3209c791c76 100644 (file)
--- a/src/detect-http-uri.c
+++ b/src/detect-http-uri.c
@@ -81,7 +81,7 @@ void DetectHttpUriRegister (void)
     DetectAppLayerMpmRegister("http_uri", SIG_FLAG_TOSERVER, 2,
             PrefilterTxUriRegister);
 
-    DetectAppLayerInspectEngineRegister2("http_uri", ALPROTO_HTTP, SIG_FLAG_TOSERVER,
+    DetectAppLayerInspectEngineRegister("http_uri", ALPROTO_HTTP, SIG_FLAG_TOSERVER,
             DetectEngineInspectHttpUri);
 
     DetectBufferTypeSetDescriptionByName("http_uri",

diff --git a/src/detect-modbus.c b/src/detect-modbus.c
index 82600c909a29224ad38c5042cc7ee1b1852b06aa..56717c475cda8bb90d701dba15a679a938c2d82f 100644 (file)
--- a/src/detect-modbus.c
+++ b/src/detect-modbus.c
@@ -417,10 +417,10 @@ void DetectModbusRegister(void)
     DetectSetupParseRegexes(PARSE_REGEX_ACCESS,
             &access_parse_regex, &access_parse_regex_study);
 
-    DetectAppLayerInspectEngineRegister2("modbus",
+    DetectAppLayerInspectEngineRegister("modbus",
             ALPROTO_MODBUS, SIG_FLAG_TOSERVER,
             DetectEngineInspectModbus);
-    DetectAppLayerInspectEngineRegister2("modbus",
+    DetectAppLayerInspectEngineRegister("modbus",
             ALPROTO_MODBUS, SIG_FLAG_TOCLIENT,
             DetectEngineInspectModbus);
 

diff --git a/src/detect-template-buffer.c b/src/detect-template-buffer.c
index 929153fd0907c718f21bd80d4732cf4b1a636669..d3838a0490fe6b78f4b173e0c48cb174d2c3db22 100644 (file)
--- a/src/detect-template-buffer.c
+++ b/src/detect-template-buffer.c
@@ -59,10 +59,10 @@ void DetectTemplateBufferRegister(void)
     sigmatch_table[DETECT_AL_TEMPLATE_BUFFER].flags |= SIGMATCH_PAYLOAD;
 
     /* register inspect engines */
-    DetectAppLayerInspectEngineRegister2("template_buffer",
+    DetectAppLayerInspectEngineRegister("template_buffer",
             ALPROTO_TEMPLATE, SIG_FLAG_TOSERVER,
             DetectEngineInspectTemplateBuffer);
-    DetectAppLayerInspectEngineRegister2("template_buffer",
+    DetectAppLayerInspectEngineRegister("template_buffer",
             ALPROTO_TEMPLATE, SIG_FLAG_TOCLIENT,
             DetectEngineInspectTemplateBuffer);
 

diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c
index f3fa104da8f5a162815120cf53ebc21e6d82de00..5928e442c05725af7e8c39f77c78de8b36dfbd13 100644 (file)
--- a/src/detect-tls-cert-issuer.c
+++ b/src/detect-tls-cert-issuer.c
@@ -77,7 +77,7 @@ void DetectTlsIssuerRegister(void)
     DetectAppLayerMpmRegister("tls_cert_issuer", SIG_FLAG_TOCLIENT, 2,
             PrefilterTxTlsIssuerRegister);
 
-    DetectAppLayerInspectEngineRegister2("tls_cert_issuer",
+    DetectAppLayerInspectEngineRegister("tls_cert_issuer",
             ALPROTO_TLS, SIG_FLAG_TOCLIENT,
             DetectEngineInspectTlsIssuer);
 

diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c
index 33d4d5116186476afb2642d0925f91b648a74e1b..8c4936bbd381e237c09670a37511dd84964198f4 100644 (file)
--- a/src/detect-tls-cert-subject.c
+++ b/src/detect-tls-cert-subject.c
@@ -77,7 +77,7 @@ void DetectTlsSubjectRegister(void)
     DetectAppLayerMpmRegister("tls_cert_subject", SIG_FLAG_TOCLIENT, 2,
             PrefilterTxTlsSubjectRegister);
 
-    DetectAppLayerInspectEngineRegister2("tls_cert_subject",
+    DetectAppLayerInspectEngineRegister("tls_cert_subject",
             ALPROTO_TLS, SIG_FLAG_TOCLIENT,
             DetectEngineInspectTlsSubject);
 

diff --git a/src/detect-tls-cert-validity.c b/src/detect-tls-cert-validity.c
index 510a6ca50cbee3221f74e692189628a1a8356f6d..2a868566d50750426f31405061a619ac78287380 100644 (file)
--- a/src/detect-tls-cert-validity.c
+++ b/src/detect-tls-cert-validity.c
@@ -120,7 +120,7 @@ void DetectTlsValidityRegister (void)
 
     DetectSetupParseRegexes(PARSE_REGEX, &parse_regex, &parse_regex_study);
 
-    DetectAppLayerInspectEngineRegister2("tls_validity",
+    DetectAppLayerInspectEngineRegister("tls_validity",
             ALPROTO_TLS, SIG_FLAG_TOCLIENT,
             DetectEngineInspectTlsValidity);
 

diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c
index 07c71f49c13f0a2a1dba4f3b33d5eeb64413a6af..8d3f8333f2a13577e168b36a6036f8f9b0b4860b 100644 (file)
--- a/src/detect-tls-sni.c
+++ b/src/detect-tls-sni.c
@@ -77,7 +77,7 @@ void DetectTlsSniRegister(void)
     DetectAppLayerMpmRegister("tls_sni", SIG_FLAG_TOSERVER, 2,
             PrefilterTxTlsSniRegister);
 
-    DetectAppLayerInspectEngineRegister2("tls_sni",
+    DetectAppLayerInspectEngineRegister("tls_sni",
             ALPROTO_TLS, SIG_FLAG_TOSERVER,
             DetectEngineInspectTlsSni);