From: Philippe Antoine Date: Sun, 21 Apr 2024 21:40:34 +0000 (+0200) Subject: app-layer: remove unused C wrappers X-Git-Tag: suricata-8.0.0-beta1~1429 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10947%2Fhead;p=thirdparty%2Fsuricata.git app-layer: remove unused C wrappers Ticket: 4083 --- diff --git a/rust/cbindgen.toml b/rust/cbindgen.toml index 15c56e2e7d..3240f4661e 100644 --- a/rust/cbindgen.toml +++ b/rust/cbindgen.toml @@ -98,12 +98,8 @@ exclude = [ "JsonT", "IKEState", "IKETransaction", - "KRB5State", - "KRB5Transaction", "NTPState", "NTPTransaction", - "SNMPState", - "SNMPTransaction", "SuricataContext", "SuricataFileContext", "TFTPState", diff --git a/src/Makefile.am b/src/Makefile.am index 7dd33a7599..d2fd1e29ea 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,21 +33,15 @@ noinst_HEADERS = \ app-layer-htp-xff.h \ app-layer-http2.h \ app-layer-ike.h \ - app-layer-krb5.h \ app-layer-modbus.h \ - app-layer-quic.h \ app-layer-nfs-tcp.h \ app-layer-nfs-udp.h \ - app-layer-ntp.h \ app-layer-parser.h \ app-layer-protos.h \ - app-layer-rdp.h \ app-layer-register.h \ app-layer-rfb.h \ - app-layer-sip.h \ app-layer-smb.h \ app-layer-smtp.h \ - app-layer-snmp.h \ app-layer-ssh.h \ app-layer-ssl.h \ app-layer-tftp.h \ @@ -649,21 +643,15 @@ libsuricata_c_a_SOURCES = \ app-layer-htp-xff.c \ app-layer-http2.c \ app-layer-ike.c \ - app-layer-krb5.c \ app-layer-modbus.c \ - app-layer-quic.c \ app-layer-nfs-tcp.c \ app-layer-nfs-udp.c \ - app-layer-ntp.c \ app-layer-parser.c \ app-layer-protos.c \ - app-layer-rdp.c \ app-layer-register.c \ app-layer-rfb.c \ - app-layer-sip.c \ app-layer-smb.c \ app-layer-smtp.c \ - app-layer-snmp.c \ app-layer-ssh.c \ app-layer-ssl.c \ app-layer-tftp.c \ diff --git a/src/app-layer-krb5.c b/src/app-layer-krb5.c deleted file mode 100644 index 7b2b63f119..0000000000 --- a/src/app-layer-krb5.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 2015 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Pierre Chifflier - * - * Parser for Kerberos v5 application layer running on UDP port 88. - */ - -#include "suricata-common.h" -#include "stream.h" -#include "conf.h" - -#include "util-unittest.h" - -#include "app-layer-detect-proto.h" -#include "app-layer-parser.h" - -#include "app-layer-krb5.h" -#include "rust.h" - -void RegisterKRB5Parsers(void) -{ - rs_register_krb5_parser(); - -#ifdef UNITTESTS - AppLayerParserRegisterProtocolUnittests(IPPROTO_TCP, ALPROTO_KRB5, - KRB5ParserRegisterTests); -#endif -} - -#ifdef UNITTESTS -#endif - -void KRB5ParserRegisterTests(void) -{ -#ifdef UNITTESTS -#endif -} diff --git a/src/app-layer-krb5.h b/src/app-layer-krb5.h deleted file mode 100644 index ec8d5a5406..0000000000 --- a/src/app-layer-krb5.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2015 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Pierre Chifflier - */ - -#ifndef SURICATA_APP_LAYER_KRB5_H -#define SURICATA_APP_LAYER_KRB5_H - -void RegisterKRB5Parsers(void); -void KRB5ParserRegisterTests(void); - -/** Opaque Rust types. */ -typedef struct KRB5State_ KRB5State; -typedef struct KRB5Transaction_ KRB5Transaction; - -#endif /* SURICATA_APP_LAYER_KRB5_H */ diff --git a/src/app-layer-ntp.c b/src/app-layer-ntp.c deleted file mode 100644 index fa7f95d711..0000000000 --- a/src/app-layer-ntp.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 2017 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Pierre Chifflier - * - * Parser for NTP application layer running on UDP port 123. - */ - -#include "suricata-common.h" -#include "stream.h" -#include "conf.h" - -#include "util-unittest.h" - -#include "app-layer-detect-proto.h" -#include "app-layer-parser.h" - -#include "app-layer-ntp.h" -#include "rust.h" - -void RegisterNTPParsers(void) -{ - rs_register_ntp_parser(); - -#ifdef UNITTESTS - AppLayerParserRegisterProtocolUnittests(IPPROTO_UDP, ALPROTO_NTP, - NTPParserRegisterTests); -#endif -} - -#ifdef UNITTESTS -#endif - -void NTPParserRegisterTests(void) -{ -#ifdef UNITTESTS -#endif -} diff --git a/src/app-layer-ntp.h b/src/app-layer-ntp.h deleted file mode 100644 index 08797d413a..0000000000 --- a/src/app-layer-ntp.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2017 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Pierre Chifflier - */ - -#ifndef SURICATA_APP_LAYER_NTP_H -#define SURICATA_APP_LAYER_NTP_H - -void RegisterNTPParsers(void); -void NTPParserRegisterTests(void); - -/** Opaque Rust types. */ -typedef struct NTPState_ NTPState; -typedef struct NTPTransaction_ NTPTransaction; - -#endif /* SURICATA_APP_LAYER_NTP_H */ diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c index cf04151d79..83bd5bb03d 100644 --- a/src/app-layer-parser.c +++ b/src/app-layer-parser.c @@ -51,15 +51,9 @@ #include "app-layer-dnp3.h" #include "app-layer-nfs-tcp.h" #include "app-layer-nfs-udp.h" -#include "app-layer-ntp.h" #include "app-layer-tftp.h" #include "app-layer-ike.h" -#include "app-layer-krb5.h" -#include "app-layer-sip.h" #include "app-layer-rfb.h" -#include "app-layer-snmp.h" -#include "app-layer-quic.h" -#include "app-layer-rdp.h" #include "app-layer-http2.h" struct AppLayerParserThreadCtx_ { @@ -1746,20 +1740,20 @@ void AppLayerParserRegisterProtocolParsers(void) RegisterDNP3Parsers(); RegisterNFSTCPParsers(); RegisterNFSUDPParsers(); - RegisterNTPParsers(); + rs_register_ntp_parser(); RegisterTFTPParsers(); RegisterIKEParsers(); - RegisterKRB5Parsers(); + rs_register_krb5_parser(); rs_dhcp_register_parser(); - RegisterSNMPParsers(); - RegisterSIPParsers(); - RegisterQuicParsers(); + rs_register_snmp_parser(); + rs_sip_register_parser(); + rs_quic_register_parser(); rs_websocket_register_parser(); rs_template_register_parser(); RegisterRFBParsers(); SCMqttRegisterParser(); rs_pgsql_register_parser(); - RegisterRdpParsers(); + rs_rdp_register_parser(); RegisterHTTP2Parsers(); rs_telnet_register_parser(); diff --git a/src/app-layer-quic.c b/src/app-layer-quic.c deleted file mode 100644 index 837aa9c496..0000000000 --- a/src/app-layer-quic.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 2021 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * Quic Application Layer - * - */ - -#include "suricata-common.h" -#include "stream.h" -#include "conf.h" - -#include "util-unittest.h" - -#include "app-layer-detect-proto.h" -#include "app-layer-parser.h" - -#include "app-layer-quic.h" -#include "rust.h" - -void RegisterQuicParsers(void) -{ - rs_quic_register_parser(); -} diff --git a/src/app-layer-quic.h b/src/app-layer-quic.h deleted file mode 100644 index 79551ae6a9..0000000000 --- a/src/app-layer-quic.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2021 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - */ - -#ifndef SURICATA_APP_LAYER_QUIC_H -#define SURICATA_APP_LAYER_QUIC_H - -void RegisterQuicParsers(void); - -#endif /* SURICATA_APP_LAYER_QUIC_H */ diff --git a/src/app-layer-rdp.c b/src/app-layer-rdp.c deleted file mode 100644 index 2611de4237..0000000000 --- a/src/app-layer-rdp.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2019 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Zach Kelly - * - * Application layer parser for RDP - */ - -#include "suricata-common.h" -#include "stream.h" -#include "conf.h" -#include "util-unittest.h" -#include "app-layer-detect-proto.h" -#include "app-layer-parser.h" -#include "app-layer-rdp.h" -#include "rust.h" - -void RegisterRdpParsers(void) { - SCLogDebug("Registering rdp parser"); - rs_rdp_register_parser(); -} diff --git a/src/app-layer-rdp.h b/src/app-layer-rdp.h deleted file mode 100644 index 4b804f7ee0..0000000000 --- a/src/app-layer-rdp.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (C) 2019 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Zach Kelly - */ - -#ifndef SURICATA_APP_LAYER_RDP_H -#define SURICATA_APP_LAYER_RDP_H - -void RegisterRdpParsers(void); - -#endif /* SURICATA_APP_LAYER_RDP_H */ diff --git a/src/app-layer-sip.c b/src/app-layer-sip.c deleted file mode 100644 index 780d21cbcf..0000000000 --- a/src/app-layer-sip.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2019-2020 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Giuseppe Longo - * - * Parser for SIP application layer running on UDP port 5060. - */ - -#include "suricata-common.h" -#include "app-layer-sip.h" -#include "rust.h" - -void RegisterSIPParsers(void) -{ - rs_sip_register_parser(); -} diff --git a/src/app-layer-sip.h b/src/app-layer-sip.h deleted file mode 100644 index af4f4e1f6c..0000000000 --- a/src/app-layer-sip.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (C) 2019-2020 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Giuseppe Longo - */ - -#ifndef SURICATA_APP_LAYER_SIP_H -#define SURICATA_APP_LAYER_SIP_H - -void RegisterSIPParsers(void); - -#endif /* SURICATA_APP_LAYER_SIP_H */ diff --git a/src/app-layer-snmp.c b/src/app-layer-snmp.c deleted file mode 100644 index 589aa451ed..0000000000 --- a/src/app-layer-snmp.c +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (C) 2015-2019 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Pierre Chifflier - * - * Parser for SNMP v2c/v3 application layer running on UDP port 161. - * - */ - -#include "suricata-common.h" -#include "stream.h" -#include "conf.h" - -#include "util-unittest.h" - -#include "app-layer-detect-proto.h" -#include "app-layer-parser.h" - -#include "app-layer-snmp.h" -#include "rust.h" - -void RegisterSNMPParsers(void) -{ - rs_register_snmp_parser(); -} - diff --git a/src/app-layer-snmp.h b/src/app-layer-snmp.h deleted file mode 100644 index 637e94f370..0000000000 --- a/src/app-layer-snmp.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2017-2019 Open Information Security Foundation - * - * You can copy, redistribute or modify this Program under the terms of - * the GNU General Public License version 2 as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -/** - * \file - * - * \author Pierre Chifflier - */ - -#ifndef SURICATA_APP_LAYER_SNMP_H -#define SURICATA_APP_LAYER_SNMP_H - -void RegisterSNMPParsers(void); - -/** Opaque Rust types. */ -typedef struct SNMPState_ SNMPState; -typedef struct SNMPTransaction_ SNMPTransaction; - -#endif /* SURICATA_APP_LAYER_SNMP_H */ diff --git a/src/detect-krb5-cname.c b/src/detect-krb5-cname.c index a85b7aa8f8..37b6c72c3d 100644 --- a/src/detect-krb5-cname.c +++ b/src/detect-krb5-cname.c @@ -34,7 +34,6 @@ #include "detect-krb5-cname.h" #include "rust.h" -#include "app-layer-krb5.h" #include "util-profiling.h" static int g_krb5_cname_buffer_id = 0; diff --git a/src/detect-krb5-errcode.c b/src/detect-krb5-errcode.c index b422bdc38e..72fa14a632 100644 --- a/src/detect-krb5-errcode.c +++ b/src/detect-krb5-errcode.c @@ -30,7 +30,6 @@ #include "detect-krb5-errcode.h" -#include "app-layer-krb5.h" #include "rust.h" /** diff --git a/src/detect-krb5-msgtype.c b/src/detect-krb5-msgtype.c index 9220a2929f..5325c7d328 100644 --- a/src/detect-krb5-msgtype.c +++ b/src/detect-krb5-msgtype.c @@ -30,7 +30,6 @@ #include "detect-krb5-msgtype.h" -#include "app-layer-krb5.h" #include "rust.h" /** diff --git a/src/detect-krb5-sname.c b/src/detect-krb5-sname.c index f5670bd554..ff52c1a28d 100644 --- a/src/detect-krb5-sname.c +++ b/src/detect-krb5-sname.c @@ -34,7 +34,6 @@ #include "detect-krb5-sname.h" #include "rust.h" -#include "app-layer-krb5.h" #include "util-profiling.h" static int g_krb5_sname_buffer_id = 0; diff --git a/src/detect-sip-method.c b/src/detect-sip-method.c index d4ee89ad19..ed22381d9f 100644 --- a/src/detect-sip-method.c +++ b/src/detect-sip-method.c @@ -51,7 +51,6 @@ #include "stream-tcp.h" #include "rust.h" -#include "app-layer-sip.h" #define KEYWORD_NAME "sip.method" #define KEYWORD_DOC "sip-keywords.html#sip-method" diff --git a/src/detect-sip-protocol.c b/src/detect-sip-protocol.c index 6adf744529..069d707771 100644 --- a/src/detect-sip-protocol.c +++ b/src/detect-sip-protocol.c @@ -1,4 +1,4 @@ - /* Copyright (C) 2019 Open Information Security Foundation +/* Copyright (C) 2019 Open Information Security Foundation * * You can copy, redistribute or modify this Program under the terms of * the GNU General Public License version 2 as published by the Free @@ -52,7 +52,6 @@ #include "stream-tcp.h" #include "rust.h" -#include "app-layer-sip.h" #define KEYWORD_NAME "sip.protocol" #define KEYWORD_DOC "sip-keywords.html#sip-protocol" diff --git a/src/detect-sip-request-line.c b/src/detect-sip-request-line.c index 5852f7fbe8..23ce659d3f 100644 --- a/src/detect-sip-request-line.c +++ b/src/detect-sip-request-line.c @@ -51,7 +51,6 @@ #include "stream-tcp.h" #include "rust.h" -#include "app-layer-sip.h" #define KEYWORD_NAME "sip.request_line" #define KEYWORD_DOC "sip-keywords.html#sip-request-line" diff --git a/src/detect-sip-response-line.c b/src/detect-sip-response-line.c index 12be766dfe..a98a6c7d7c 100644 --- a/src/detect-sip-response-line.c +++ b/src/detect-sip-response-line.c @@ -51,7 +51,6 @@ #include "stream-tcp.h" #include "rust.h" -#include "app-layer-sip.h" #define KEYWORD_NAME "sip.response_line" #define KEYWORD_DOC "sip-keywords.html#sip-response-line" diff --git a/src/detect-sip-stat-code.c b/src/detect-sip-stat-code.c index 883872b169..965a697366 100644 --- a/src/detect-sip-stat-code.c +++ b/src/detect-sip-stat-code.c @@ -52,7 +52,6 @@ #include "stream-tcp.h" #include "rust.h" -#include "app-layer-sip.h" #define KEYWORD_NAME "sip.stat_code" #define KEYWORD_DOC "sip-keywords.html#sip-stat-code" diff --git a/src/detect-sip-stat-msg.c b/src/detect-sip-stat-msg.c index bda224b3e1..abcf803c6c 100644 --- a/src/detect-sip-stat-msg.c +++ b/src/detect-sip-stat-msg.c @@ -52,7 +52,6 @@ #include "stream-tcp.h" #include "rust.h" -#include "app-layer-sip.h" #define KEYWORD_NAME "sip.stat_msg" #define KEYWORD_DOC "sip-keywords.html#sip-stat-msg" diff --git a/src/detect-sip-uri.c b/src/detect-sip-uri.c index f71627e035..daf42235d8 100644 --- a/src/detect-sip-uri.c +++ b/src/detect-sip-uri.c @@ -52,7 +52,6 @@ #include "stream-tcp.h" #include "rust.h" -#include "app-layer-sip.h" #define KEYWORD_NAME "sip.uri" #define KEYWORD_DOC "sip-keywords.html#sip-uri" diff --git a/src/rust-context.h b/src/rust-context.h index bbb0253ec6..df1179e368 100644 --- a/src/rust-context.h +++ b/src/rust-context.h @@ -22,10 +22,7 @@ #include "detect.h" #include "detect-engine-state.h" //DetectEngineState -#include "app-layer-krb5.h" //KRB5State, KRB5Transaction -#include "app-layer-ike.h" //IKEState, IKETransaction -#include "app-layer-ntp.h" //NTPState, NTPTransaction -#include "app-layer-snmp.h" //SNMPState, SNMPTransaction +#include "app-layer-ike.h" //IKEState, IKETransaction #include "app-layer-tftp.h" //TFTPState, TFTPTransaction #include "util-debug.h"