templates: remove C app-layer templates

victorjulien · Dec 6, 2022 · 8683154 · 8683154
1 parent 05e1682
commit 8683154
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 869 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -51,7 +51,6 @@ noinst_HEADERS = \
 	app-layer-snmp.h \
 	app-layer-ssh.h \
 	app-layer-ssl.h \
-	app-layer-template.h \
 	app-layer-tftp.h \
 	autoconf.h \
 	build-info.h \
@@ -321,7 +320,6 @@ noinst_HEADERS = \
 	detect-tcp-seq.h \
 	detect-tcp-window.h \
 	detect-template2.h \
-	detect-template-buffer.h \
 	detect-template.h \
 	detect-template-rust-buffer.h \
 	detect-threshold.h \
@@ -426,7 +424,6 @@ noinst_HEADERS = \
 	output-json-snmp.h \
 	output-json-ssh.h \
 	output-json-stats.h \
-	output-json-template.h \
 	output-json-template-rust.h \
 	output-json-tftp.h \
 	output-json-tls.h \
@@ -665,7 +662,6 @@ libsuricata_c_a_SOURCES = \
 	app-layer-snmp.c \
 	app-layer-ssh.c \
 	app-layer-ssl.c \
-	app-layer-template.c \
 	app-layer-tftp.c \
 	conf.c \
 	conf-yaml-loader.c \
@@ -932,7 +928,6 @@ libsuricata_c_a_SOURCES = \
 	detect-tcp-seq.c \
 	detect-tcp-window.c \
 	detect-template2.c \
-	detect-template-buffer.c \
 	detect-template.c \
 	detect-template-rust-buffer.c \
 	detect-threshold.c \
@@ -1037,7 +1032,6 @@ libsuricata_c_a_SOURCES = \
 	output-json-snmp.c \
 	output-json-ssh.c \
 	output-json-stats.c \
-	output-json-template.c \
 	output-json-template-rust.c \
 	output-json-tftp.c \
 	output-json-tls.c \

diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c
@@ -915,8 +915,6 @@ static void AppLayerProtoDetectPrintProbingParsers(AppLayerProtoDetectProbingPar
                         printf("            alproto: ALPROTO_PGSQL\n");
                     else if (pp_pe->alproto == ALPROTO_TELNET)
                         printf("            alproto: ALPROTO_TELNET\n");
-                    else if (pp_pe->alproto == ALPROTO_TEMPLATE)
-                        printf("            alproto: ALPROTO_TEMPLATE\n");
                     else if (pp_pe->alproto == ALPROTO_DNP3)
                         printf("            alproto: ALPROTO_DNP3\n");
                     else if (pp_pe->alproto == ALPROTO_BITTORRENT_DHT)
@@ -1000,8 +998,6 @@ static void AppLayerProtoDetectPrintProbingParsers(AppLayerProtoDetectProbingPar
                     printf("            alproto: ALPROTO_PGSQL\n");
                 else if (pp_pe->alproto == ALPROTO_TELNET)
                     printf("            alproto: ALPROTO_TELNET\n");
-                else if (pp_pe->alproto == ALPROTO_TEMPLATE)
-                    printf("            alproto: ALPROTO_TEMPLATE\n");
                 else if (pp_pe->alproto == ALPROTO_DNP3)
                     printf("            alproto: ALPROTO_DNP3\n");
                 else if (pp_pe->alproto == ALPROTO_BITTORRENT_DHT)

diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
@@ -60,7 +60,6 @@
 #include "app-layer-mqtt.h"
 #include "app-layer-snmp.h"
 #include "app-layer-quic.h"
-#include "app-layer-template.h"
 #include "app-layer-rdp.h"
 #include "app-layer-http2.h"
 
@@ -1741,7 +1740,6 @@ void AppLayerParserRegisterProtocolParsers(void)
     RegisterRFBParsers();
     RegisterMQTTParsers();
     rs_pgsql_register_parser();
-    RegisterTemplateParsers();
     RegisterRdpParsers();
     RegisterHTTP2Parsers();
     rs_telnet_register_parser();

diff --git a/src/app-layer-protos.c b/src/app-layer-protos.c
@@ -117,9 +117,6 @@ const char *AppProtoToString(AppProto alproto)
         case ALPROTO_TELNET:
             proto_name = "telnet";
             break;
-        case ALPROTO_TEMPLATE:
-            proto_name = "template";
-            break;
         case ALPROTO_TEMPLATE_RUST:
             proto_name = "template-rust";
             break;
@@ -190,8 +187,6 @@ AppProto StringToAppProto(const char *proto_name)
         return ALPROTO_PGSQL;
     if (strcmp(proto_name, "telnet") == 0)
         return ALPROTO_TELNET;
-    if (strcmp(proto_name, "template") == 0)
-        return ALPROTO_TEMPLATE;
     if (strcmp(proto_name, "template-rust") == 0)
         return ALPROTO_TEMPLATE_RUST;
     if (strcmp(proto_name,"rdp")==0) return ALPROTO_RDP;

diff --git a/src/app-layer-protos.h b/src/app-layer-protos.h
@@ -56,7 +56,6 @@ enum AppProtoEnum {
     ALPROTO_MQTT,
     ALPROTO_PGSQL,
     ALPROTO_TELNET,
-    ALPROTO_TEMPLATE,
     ALPROTO_TEMPLATE_RUST,
     ALPROTO_RDP,
     ALPROTO_HTTP2,