From 5e9714e384e31dc52922d8516415b6c94a6ffd54 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 11 Oct 2019 11:19:14 +0200 Subject: [PATCH] rust: remove all HAVE_RUST guards --- src/app-layer-dhcp.c | 5 ----- src/app-layer-dns-tcp-rust.c | 4 ---- src/app-layer-dns-udp-rust.c | 4 ---- src/app-layer-krb5.c | 10 ---------- src/app-layer-nfs-tcp.c | 9 --------- src/app-layer-nfs-udp.c | 9 --------- src/app-layer-ntp.c | 10 ---------- src/app-layer-template-rust.c | 4 ---- src/detect-file-data.c | 4 ---- src/detect-krb5-errcode.c | 10 ---------- src/detect-krb5-msgtype.c | 10 ---------- src/detect-template-rust-buffer.c | 11 ----------- src/output-json-alert.c | 2 -- src/output-json-dhcp.c | 10 ---------- src/output-json-ikev2.c | 8 -------- src/output-json-krb5.c | 8 -------- src/output-json-nfs.c | 9 --------- src/output-json-nfs.h | 2 -- src/output-json-snmp.c | 8 -------- src/output-json-template-rust.c | 10 ---------- src/output-json-tftp.c | 9 --------- src/suricata.c | 6 ------ src/util-debug.c | 5 ----- 23 files changed, 167 deletions(-) diff --git a/src/app-layer-dhcp.c b/src/app-layer-dhcp.c index 23b8a8a02d..33a38564a0 100644 --- a/src/app-layer-dhcp.c +++ b/src/app-layer-dhcp.c @@ -25,16 +25,11 @@ #include "util-unittest.h" #include "app-layer-parser.h" #include "app-layer-dhcp.h" - -#ifdef HAVE_RUST #include "rust-dhcp-dhcp-gen.h" -#endif /* HAVE_RUST */ void RegisterDHCPParsers(void) { -#ifdef HAVE_RUST rs_dhcp_register_parser(); -#endif /* HAVE_RUST */ #ifdef UNITTESTS AppLayerParserRegisterProtocolUnittests(IPPROTO_TCP, ALPROTO_DHCP, DHCPParserRegisterTests); diff --git a/src/app-layer-dns-tcp-rust.c b/src/app-layer-dns-tcp-rust.c index a6d3efb3a3..3b7cc90a27 100644 --- a/src/app-layer-dns-tcp-rust.c +++ b/src/app-layer-dns-tcp-rust.c @@ -25,8 +25,6 @@ #include "util-unittest.h" -#ifdef HAVE_RUST - #include "app-layer-dns-tcp-rust.h" #include "rust-dns-dns-gen.h" @@ -310,5 +308,3 @@ static void RustDNSTCPParserRegisterTests(void) } #endif /* UNITTESTS */ - -#endif /* HAVE_RUST */ diff --git a/src/app-layer-dns-udp-rust.c b/src/app-layer-dns-udp-rust.c index 734d410a05..b7148ff539 100644 --- a/src/app-layer-dns-udp-rust.c +++ b/src/app-layer-dns-udp-rust.c @@ -25,8 +25,6 @@ #include "util-unittest.h" -#ifdef HAVE_RUST - #include "app-layer-dns-udp-rust.h" #include "rust-dns-dns-gen.h" @@ -376,5 +374,3 @@ static void RustDNSUDPParserRegisterTests(void) } #endif - -#endif /* HAVE_RUST */ diff --git a/src/app-layer-krb5.c b/src/app-layer-krb5.c index 66777f60eb..ac73ffcf6c 100644 --- a/src/app-layer-krb5.c +++ b/src/app-layer-krb5.c @@ -34,8 +34,6 @@ #include "app-layer-krb5.h" -#ifdef HAVE_RUST - #include "rust-krb-krb5-gen.h" void RegisterKRB5Parsers(void) @@ -56,11 +54,3 @@ void KRB5ParserRegisterTests(void) #ifdef UNITTESTS #endif } - -#else /* HAVE_RUST */ - -void RegisterKRB5Parsers(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/app-layer-nfs-tcp.c b/src/app-layer-nfs-tcp.c index 5753e6025e..96f4f0bcf9 100644 --- a/src/app-layer-nfs-tcp.c +++ b/src/app-layer-nfs-tcp.c @@ -37,13 +37,6 @@ #include "app-layer-nfs-tcp.h" -#ifndef HAVE_RUST -void RegisterNFSTCPParsers(void) -{ -} - -#else - #include "rust.h" #include "rust-nfs-nfs-gen.h" @@ -416,5 +409,3 @@ void NFSTCPParserRegisterTests(void) #ifdef UNITTESTS #endif } - -#endif /* HAVE_RUST */ diff --git a/src/app-layer-nfs-udp.c b/src/app-layer-nfs-udp.c index 976e3446bc..c3cad69d22 100644 --- a/src/app-layer-nfs-udp.c +++ b/src/app-layer-nfs-udp.c @@ -34,13 +34,6 @@ #include "app-layer-nfs-udp.h" -#ifndef HAVE_RUST -void RegisterNFSUDPParsers(void) -{ -} - -#else - #include "rust.h" #include "rust-nfs-nfs-gen.h" @@ -375,5 +368,3 @@ void NFSUDPParserRegisterTests(void) #ifdef UNITTESTS #endif } - -#endif /* HAVE_RUST */ diff --git a/src/app-layer-ntp.c b/src/app-layer-ntp.c index 85e0aa223f..00c1dc4f83 100644 --- a/src/app-layer-ntp.c +++ b/src/app-layer-ntp.c @@ -34,8 +34,6 @@ #include "app-layer-ntp.h" -#if defined(HAVE_RUST) - #include "rust-ntp-ntp-gen.h" void RegisterNTPParsers(void) @@ -56,11 +54,3 @@ void NTPParserRegisterTests(void) #ifdef UNITTESTS #endif } - -#else /* HAVE_RUST */ - -void RegisterNTPParsers(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/app-layer-template-rust.c b/src/app-layer-template-rust.c index f7f76ce4b4..201bec5b7e 100644 --- a/src/app-layer-template-rust.c +++ b/src/app-layer-template-rust.c @@ -44,13 +44,10 @@ #include "app-layer-template-rust.h" -#ifdef HAVE_RUST #include "rust-applayertemplate-template-gen.h" -#endif void RegisterTemplateRustParsers(void) { -#ifdef HAVE_RUST /* TEMPLATE_START_REMOVE */ /* Only register if enabled in config. */ if (ConfGetNode("app-layer.protocols.template-rust") == NULL) { @@ -59,7 +56,6 @@ void RegisterTemplateRustParsers(void) /* TEMPLATE_END_REMOVE */ SCLogNotice("Registring Rust template parser."); rs_template_register_parser(); -#endif #ifdef UNITTESTS AppLayerParserRegisterProtocolUnittests(IPPROTO_TCP, ALPROTO_TEMPLATE_RUST, TemplateRustParserRegisterTests); diff --git a/src/detect-file-data.c b/src/detect-file-data.c index 6065ed04f2..63a5b53b48 100644 --- a/src/detect-file-data.c +++ b/src/detect-file-data.c @@ -97,14 +97,12 @@ void DetectFiledataRegister(void) PrefilterGenericMpmRegister, HttpServerBodyGetDataCallback, ALPROTO_HTTP, HTP_RESPONSE_BODY); -#ifdef HAVE_RUST DetectAppLayerMpmRegister2("file_data", SIG_FLAG_TOSERVER, 2, PrefilterMpmFiledataRegister, NULL, ALPROTO_SMB, 0); DetectAppLayerMpmRegister2("file_data", SIG_FLAG_TOCLIENT, 2, PrefilterMpmFiledataRegister, NULL, ALPROTO_SMB, 0); -#endif DetectAppLayerInspectEngineRegister2("file_data", ALPROTO_HTTP, SIG_FLAG_TOCLIENT, HTP_RESPONSE_BODY, @@ -114,14 +112,12 @@ void DetectFiledataRegister(void) DetectEngineInspectFiledata, NULL); DetectBufferTypeRegisterSetupCallback("file_data", DetectFiledataSetupCallback); -#ifdef HAVE_RUST DetectAppLayerInspectEngineRegister2("file_data", ALPROTO_SMB, SIG_FLAG_TOSERVER, 0, DetectEngineInspectFiledata, NULL); DetectAppLayerInspectEngineRegister2("file_data", ALPROTO_SMB, SIG_FLAG_TOCLIENT, 0, DetectEngineInspectFiledata, NULL); -#endif DetectBufferTypeSetDescriptionByName("file_data", "http response body, smb files or smtp attachments data"); diff --git a/src/detect-krb5-errcode.c b/src/detect-krb5-errcode.c index a754bfd74f..6c1224ab40 100644 --- a/src/detect-krb5-errcode.c +++ b/src/detect-krb5-errcode.c @@ -29,8 +29,6 @@ #include "detect-krb5-errcode.h" -#ifdef HAVE_RUST - #include "app-layer-krb5.h" #include "rust-krb-detect-gen.h" @@ -264,11 +262,3 @@ static void DetectKrb5ErrCodeRegisterTests(void) { DetectKrb5ErrCodeSignatureTest01); #endif /* UNITTESTS */ } - -#else /* HAVE_RUST */ - -void DetectKrb5ErrCodeRegister(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/detect-krb5-msgtype.c b/src/detect-krb5-msgtype.c index 5f49f26636..0810ef533a 100644 --- a/src/detect-krb5-msgtype.c +++ b/src/detect-krb5-msgtype.c @@ -29,8 +29,6 @@ #include "detect-krb5-msgtype.h" -#ifdef HAVE_RUST - #include "app-layer-krb5.h" #include "rust-krb-detect-gen.h" @@ -261,11 +259,3 @@ static void DetectKrb5MsgTypeRegisterTests(void) { DetectKrb5MsgTypeSignatureTest01); #endif /* UNITTESTS */ } - -#else /* HAVE_RUST */ - -void DetectKrb5MsgTypeRegister(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/detect-template-rust-buffer.c b/src/detect-template-rust-buffer.c index ff5c9eb53f..1de4655191 100644 --- a/src/detect-template-rust-buffer.c +++ b/src/detect-template-rust-buffer.c @@ -38,15 +38,6 @@ #include "detect-engine-content-inspection.h" #include "detect-template-rust-buffer.h" #include "app-layer-parser.h" - -#ifndef HAVE_RUST - -void DetectTemplateRustBufferRegister(void) -{ -} - -#else - #include "rust-applayertemplate-template-gen.h" static int DetectTemplateRustBufferSetup(DetectEngineCtx *, Signature *, @@ -222,5 +213,3 @@ static void DetectTemplateRustBufferRegisterTests(void) DetectTemplateRustBufferTest); #endif /* UNITTESTS */ } - -#endif diff --git a/src/output-json-alert.c b/src/output-json-alert.c index 419b15e58d..c3bba04a87 100644 --- a/src/output-json-alert.c +++ b/src/output-json-alert.c @@ -464,7 +464,6 @@ static int AlertJson(ThreadVars *tv, JsonAlertLogThread *aft, const Packet *p) } } -#ifdef HAVE_RUST if (proto == ALPROTO_NFS) { hjs = JsonNFSAddMetadataRPC(p->flow, pa->tx_id); if (hjs) @@ -481,7 +480,6 @@ static int AlertJson(ThreadVars *tv, JsonAlertLogThread *aft, const Packet *p) if (hjs) json_object_set_new(js, "sip", hjs); } -#endif if (proto == ALPROTO_FTPDATA) { hjs = JsonFTPDataAddMetadata(p->flow); if (hjs) diff --git a/src/output-json-dhcp.c b/src/output-json-dhcp.c index c335d5f190..8ca109f139 100644 --- a/src/output-json-dhcp.c +++ b/src/output-json-dhcp.c @@ -51,8 +51,6 @@ #include "app-layer-dhcp.h" #include "output-json-dhcp.h" -#if defined(HAVE_LIBJANSSON) && defined(HAVE_RUST) - #include "rust-dhcp-logger-gen.h" typedef struct LogDHCPFileCtx_ { @@ -179,11 +177,3 @@ void JsonDHCPLogRegister(void) JsonDHCPLogger, JsonDHCPLogThreadInit, JsonDHCPLogThreadDeinit, NULL); } - -#else /* No JSON support. */ - -void JsonDHCPLogRegister(void) -{ -} - -#endif /* HAVE_LIBJANSSON */ diff --git a/src/output-json-ikev2.c b/src/output-json-ikev2.c index 4c9d416693..26af90f9de 100644 --- a/src/output-json-ikev2.c +++ b/src/output-json-ikev2.c @@ -47,7 +47,6 @@ #include "app-layer-ikev2.h" #include "output-json-ikev2.h" -#ifdef HAVE_RUST #ifdef HAVE_LIBJANSSON #include "rust.h" @@ -187,10 +186,3 @@ void JsonIKEv2LogRegister(void) } #endif /* HAVE_LIBJANSSON */ -#else /* No rust support. */ - -void JsonIKEv2LogRegister(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/output-json-krb5.c b/src/output-json-krb5.c index 2322c56f7f..0578809a58 100644 --- a/src/output-json-krb5.c +++ b/src/output-json-krb5.c @@ -47,7 +47,6 @@ #include "app-layer-krb5.h" #include "output-json-krb5.h" -#ifdef HAVE_RUST #ifdef HAVE_LIBJANSSON #include "rust.h" @@ -188,10 +187,3 @@ void JsonKRB5LogRegister(void) } #endif /* HAVE_LIBJANSSON */ -#else /* No rust support. */ - -void JsonKRB5LogRegister(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/output-json-nfs.c b/src/output-json-nfs.c index 5274adc581..e63495620c 100644 --- a/src/output-json-nfs.c +++ b/src/output-json-nfs.c @@ -46,7 +46,6 @@ #include "output-json-nfs.h" -#ifdef HAVE_RUST #ifdef HAVE_LIBJANSSON #include "rust.h" #include "rust-nfs-log-gen.h" @@ -142,11 +141,3 @@ void JsonNFSLogRegister(void) } #endif /* HAVE_LIBJANSSON */ - -#else /* no rust */ - -void JsonNFSLogRegister(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/output-json-nfs.h b/src/output-json-nfs.h index a70a510d56..ee78e5ddba 100644 --- a/src/output-json-nfs.h +++ b/src/output-json-nfs.h @@ -25,8 +25,6 @@ #define __OUTPUT_JSON_NFS_H__ void JsonNFSLogRegister(void); -#ifdef HAVE_RUST json_t *JsonNFSAddMetadataRPC(const Flow *f, uint64_t tx_id); json_t *JsonNFSAddMetadata(const Flow *f, uint64_t tx_id); -#endif /* HAVE_RUST */ #endif /* __OUTPUT_JSON_NFS_H__ */ diff --git a/src/output-json-snmp.c b/src/output-json-snmp.c index 24b8013fd4..9f07d5ceba 100644 --- a/src/output-json-snmp.c +++ b/src/output-json-snmp.c @@ -47,7 +47,6 @@ #include "app-layer-snmp.h" #include "output-json-snmp.h" -#ifdef HAVE_RUST #ifdef HAVE_LIBJANSSON #include "rust.h" @@ -187,10 +186,3 @@ void JsonSNMPLogRegister(void) } #endif /* HAVE_LIBJANSSON */ -#else /* No rust support. */ - -void JsonSNMPLogRegister(void) -{ -} - -#endif /* HAVE_RUST */ diff --git a/src/output-json-template-rust.c b/src/output-json-template-rust.c index 35e3ce926e..4c1e2f9dcc 100644 --- a/src/output-json-template-rust.c +++ b/src/output-json-template-rust.c @@ -53,8 +53,6 @@ #include "app-layer-template-rust.h" #include "output-json-template-rust.h" -#if defined(HAVE_LIBJANSSON) && defined(HAVE_RUST) - #include "rust-applayertemplate-logger-gen.h" typedef struct LogTemplateFileCtx_ { @@ -185,11 +183,3 @@ void JsonTemplateRustLogRegister(void) SCLogNotice("Template JSON logger registered."); } - -#else /* No JSON support. */ - -void JsonTemplateRustLogRegister(void) -{ -} - -#endif /* HAVE_LIBJANSSON */ diff --git a/src/output-json-tftp.c b/src/output-json-tftp.c index c7e6e5353d..ec33f4d42f 100644 --- a/src/output-json-tftp.c +++ b/src/output-json-tftp.c @@ -48,8 +48,6 @@ #include "app-layer-tftp.h" #include "output-json-tftp.h" -#ifdef HAVE_RUST - #include "rust.h" #include "rust-tftp-log-gen.h" @@ -179,13 +177,6 @@ void JsonTFTPLogRegister(void) SCLogDebug("TFTP JSON logger registered."); } -#else /* HAVE_RUST */ - -void JsonTFTPLogRegister(void) -{ -} - -#endif /* HAVE_RUST */ #else /* HAVE_LIBJANSSON */ diff --git a/src/suricata.c b/src/suricata.c index fd98170ee2..38a323ecfb 100644 --- a/src/suricata.c +++ b/src/suricata.c @@ -176,10 +176,8 @@ #include "util-lua.h" -#ifdef HAVE_RUST #include "rust.h" #include "rust-core-gen.h" -#endif /* * we put this here, because we only use it here in main. @@ -767,9 +765,7 @@ static void PrintBuildInfo(void) #ifdef HAVE_MAGIC strlcat(features, "MAGIC ", sizeof(features)); #endif -#if defined(HAVE_RUST) strlcat(features, "RUST ", sizeof(features)); -#endif if (strlen(features) == 0) { strlcat(features, "none", sizeof(features)); } @@ -2946,7 +2942,6 @@ int main(int argc, char **argv) { SCInstanceInit(&suricata, argv[0]); -#ifdef HAVE_RUST SuricataContext context; context.SCLogMessage = SCLogMessage; context.DetectEngineStateFree = DetectEngineStateFree; @@ -2963,7 +2958,6 @@ int main(int argc, char **argv) context.FileSetTx = FileContainerSetTx; rs_init(&context); -#endif SC_ATOMIC_INIT(engine_stage); diff --git a/src/util-debug.c b/src/util-debug.c index 33185f99d9..84b0fd2cbe 100644 --- a/src/util-debug.c +++ b/src/util-debug.c @@ -43,9 +43,7 @@ #include "util-unittest.h" #include "util-syslog.h" -#ifdef HAVE_RUST #include "rust-log-gen.h" -#endif #include "conf.h" @@ -1286,10 +1284,7 @@ void SCLogInitLogModule(SCLogInitData *sc_lid) //SCOutputPrint(sc_did->startup_message); -#ifdef HAVE_RUST rs_log_set_level(sc_log_global_log_level); -#endif - return; }