From: Philippe Antoine Date: Thu, 23 Mar 2023 15:41:30 +0000 (+0100) Subject: debug: use AppProtoToString X-Git-Tag: suricata-7.0.0-rc2~286 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b2605bdfe1365b28dbbea28785710825611da7b;p=thirdparty%2Fsuricata.git debug: use AppProtoToString instead of recoding it. This way, setup-app-layer.py needs to patch one file less --- diff --git a/scripts/setup-app-layer.py b/scripts/setup-app-layer.py index 3d1e7a720b..4bc3a895ad 100755 --- a/scripts/setup-app-layer.py +++ b/scripts/setup-app-layer.py @@ -158,18 +158,6 @@ def patch_app_layer_protos_c(protoname): output.write(line) open(filename, "w").write(output.getvalue()) -def patch_app_layer_detect_proto_c(proto): - filename = "src/app-layer-detect-proto.c" - print("Patching %s." % (filename)) - output = io.StringIO() - inlines = open(filename).readlines() - for i, line in enumerate(inlines): - if line.find("== ALPROTO_TEMPLATE)") > -1: - output.write(inlines[i].replace("TEMPLATE", proto.upper())) - output.write(inlines[i+1].replace("TEMPLATE", proto.upper())) - output.write(line) - open(filename, "w").write(output.getvalue()) - def patch_app_layer_parser_c(proto): filename = "src/app-layer-parser.c" print("Patching %s." % (filename)) @@ -435,7 +423,6 @@ def main(): patch_rust_lib_rs(proto) patch_app_layer_protos_h(proto) patch_app_layer_protos_c(proto) - patch_app_layer_detect_proto_c(proto) patch_app_layer_parser_c(proto) patch_suricata_yaml_in(proto) diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c index 863fb920af..7c5ed84f88 100644 --- a/src/app-layer-detect-proto.c +++ b/src/app-layer-detect-proto.c @@ -860,69 +860,7 @@ static void AppLayerProtoDetectPrintProbingParsers(AppLayerProtoDetectProbingPar pp_pe = pp_port->dp; for ( ; pp_pe != NULL; pp_pe = pp_pe->next) { - if (pp_pe->alproto == ALPROTO_HTTP1) - printf(" alproto: ALPROTO_HTTP1\n"); - else if (pp_pe->alproto == ALPROTO_FTP) - printf(" alproto: ALPROTO_FTP\n"); - else if (pp_pe->alproto == ALPROTO_FTPDATA) - printf(" alproto: ALPROTO_FTPDATA\n"); - else if (pp_pe->alproto == ALPROTO_SMTP) - printf(" alproto: ALPROTO_SMTP\n"); - else if (pp_pe->alproto == ALPROTO_TLS) - printf(" alproto: ALPROTO_TLS\n"); - else if (pp_pe->alproto == ALPROTO_SSH) - printf(" alproto: ALPROTO_SSH\n"); - else if (pp_pe->alproto == ALPROTO_IMAP) - printf(" alproto: ALPROTO_IMAP\n"); - else if (pp_pe->alproto == ALPROTO_JABBER) - printf(" alproto: ALPROTO_JABBER\n"); - else if (pp_pe->alproto == ALPROTO_SMB) - printf(" alproto: ALPROTO_SMB\n"); - else if (pp_pe->alproto == ALPROTO_DCERPC) - printf(" alproto: ALPROTO_DCERPC\n"); - else if (pp_pe->alproto == ALPROTO_IRC) - printf(" alproto: ALPROTO_IRC\n"); - else if (pp_pe->alproto == ALPROTO_DNS) - printf(" alproto: ALPROTO_DNS\n"); - else if (pp_pe->alproto == ALPROTO_MODBUS) - printf(" alproto: ALPROTO_MODBUS\n"); - else if (pp_pe->alproto == ALPROTO_ENIP) - printf(" alproto: ALPROTO_ENIP\n"); - else if (pp_pe->alproto == ALPROTO_NFS) - printf(" alproto: ALPROTO_NFS\n"); - else if (pp_pe->alproto == ALPROTO_NTP) - printf(" alproto: ALPROTO_NTP\n"); - else if (pp_pe->alproto == ALPROTO_TFTP) - printf(" alproto: ALPROTO_TFTP\n"); - else if (pp_pe->alproto == ALPROTO_IKE) - printf(" alproto: ALPROTO_IKE\n"); - else if (pp_pe->alproto == ALPROTO_KRB5) - printf(" alproto: ALPROTO_KRB5\n"); - else if (pp_pe->alproto == ALPROTO_DHCP) - printf(" alproto: ALPROTO_DHCP\n"); - else if (pp_pe->alproto == ALPROTO_QUIC) - printf(" alproto: ALPROTO_QUIC\n"); - else if (pp_pe->alproto == ALPROTO_SNMP) - printf(" alproto: ALPROTO_SNMP\n"); - else if (pp_pe->alproto == ALPROTO_SIP) - printf(" alproto: ALPROTO_SIP\n"); - else if (pp_pe->alproto == ALPROTO_TEMPLATE) - printf(" alproto: ALPROTO_TEMPLATE\n"); - else if (pp_pe->alproto == ALPROTO_RFB) - printf(" alproto: ALPROTO_RFB\n"); - else if (pp_pe->alproto == ALPROTO_MQTT) - printf(" alproto: ALPROTO_MQTT\n"); - else if (pp_pe->alproto == ALPROTO_PGSQL) - printf(" alproto: ALPROTO_PGSQL\n"); - else if (pp_pe->alproto == ALPROTO_TELNET) - printf(" alproto: ALPROTO_TELNET\n"); - else if (pp_pe->alproto == ALPROTO_DNP3) - printf(" alproto: ALPROTO_DNP3\n"); - else if (pp_pe->alproto == ALPROTO_BITTORRENT_DHT) - printf(" alproto: ALPROTO_BITTORRENT_DHT\n"); - else - printf("impossible\n"); - + printf(" alproto: %s\n", AppProtoToString(pp_pe->alproto)); printf(" port: %"PRIu16 "\n", pp_pe->port); printf(" mask: %"PRIu32 "\n", pp_pe->alproto_mask); printf(" min_depth: %"PRIu32 "\n", pp_pe->min_depth); @@ -943,69 +881,7 @@ static void AppLayerProtoDetectPrintProbingParsers(AppLayerProtoDetectProbingPar pp_pe = pp_port->sp; for ( ; pp_pe != NULL; pp_pe = pp_pe->next) { - if (pp_pe->alproto == ALPROTO_HTTP1) - printf(" alproto: ALPROTO_HTTP1\n"); - else if (pp_pe->alproto == ALPROTO_FTP) - printf(" alproto: ALPROTO_FTP\n"); - else if (pp_pe->alproto == ALPROTO_FTPDATA) - printf(" alproto: ALPROTO_FTPDATA\n"); - else if (pp_pe->alproto == ALPROTO_SMTP) - printf(" alproto: ALPROTO_SMTP\n"); - else if (pp_pe->alproto == ALPROTO_TLS) - printf(" alproto: ALPROTO_TLS\n"); - else if (pp_pe->alproto == ALPROTO_SSH) - printf(" alproto: ALPROTO_SSH\n"); - else if (pp_pe->alproto == ALPROTO_IMAP) - printf(" alproto: ALPROTO_IMAP\n"); - else if (pp_pe->alproto == ALPROTO_JABBER) - printf(" alproto: ALPROTO_JABBER\n"); - else if (pp_pe->alproto == ALPROTO_SMB) - printf(" alproto: ALPROTO_SMB\n"); - else if (pp_pe->alproto == ALPROTO_DCERPC) - printf(" alproto: ALPROTO_DCERPC\n"); - else if (pp_pe->alproto == ALPROTO_IRC) - printf(" alproto: ALPROTO_IRC\n"); - else if (pp_pe->alproto == ALPROTO_DNS) - printf(" alproto: ALPROTO_DNS\n"); - else if (pp_pe->alproto == ALPROTO_MODBUS) - printf(" alproto: ALPROTO_MODBUS\n"); - else if (pp_pe->alproto == ALPROTO_ENIP) - printf(" alproto: ALPROTO_ENIP\n"); - else if (pp_pe->alproto == ALPROTO_NFS) - printf(" alproto: ALPROTO_NFS\n"); - else if (pp_pe->alproto == ALPROTO_NTP) - printf(" alproto: ALPROTO_NTP\n"); - else if (pp_pe->alproto == ALPROTO_TFTP) - printf(" alproto: ALPROTO_TFTP\n"); - else if (pp_pe->alproto == ALPROTO_IKE) - printf(" alproto: ALPROTO_IKE\n"); - else if (pp_pe->alproto == ALPROTO_KRB5) - printf(" alproto: ALPROTO_KRB5\n"); - else if (pp_pe->alproto == ALPROTO_QUIC) - printf(" alproto: ALPROTO_QUIC\n"); - else if (pp_pe->alproto == ALPROTO_DHCP) - printf(" alproto: ALPROTO_DHCP\n"); - else if (pp_pe->alproto == ALPROTO_SNMP) - printf(" alproto: ALPROTO_SNMP\n"); - else if (pp_pe->alproto == ALPROTO_SIP) - printf(" alproto: ALPROTO_SIP\n"); - else if (pp_pe->alproto == ALPROTO_TEMPLATE) - printf(" alproto: ALPROTO_TEMPLATE\n"); - else if (pp_pe->alproto == ALPROTO_RFB) - printf(" alproto: ALPROTO_RFB\n"); - else if (pp_pe->alproto == ALPROTO_MQTT) - printf(" alproto: ALPROTO_MQTT\n"); - else if (pp_pe->alproto == ALPROTO_PGSQL) - printf(" alproto: ALPROTO_PGSQL\n"); - else if (pp_pe->alproto == ALPROTO_TELNET) - printf(" alproto: ALPROTO_TELNET\n"); - else if (pp_pe->alproto == ALPROTO_DNP3) - printf(" alproto: ALPROTO_DNP3\n"); - else if (pp_pe->alproto == ALPROTO_BITTORRENT_DHT) - printf(" alproto: ALPROTO_BITTORRENT_DHT\n"); - else - printf("impossible\n"); - + printf(" alproto: %s\n", AppProtoToString(pp_pe->alproto)); printf(" port: %"PRIu16 "\n", pp_pe->port); printf(" mask: %"PRIu32 "\n", pp_pe->alproto_mask); printf(" min_depth: %"PRIu32 "\n", pp_pe->min_depth);