aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app-layer: remove unused C wrappers

Browse Source 
Ticket: 4083
pull/10947/head
Philippe Antoine 1 year ago committed by Victor Julien
parent 480955b1f8
commit d8e0c72644
27 changed files with 8 additions and 495 deletions
Show Stats Download Patch File Download Diff File

4
rust/cbindgen.toml
Unescape Escape View File

@ -98,12 +98,8 @@ exclude = [
"JsonT",
"IKEState",
"IKETransaction",
"KRB5State",
"KRB5Transaction",
"NTPState",
"NTPTransaction",
"SNMPState",
"SNMPTransaction",
"SuricataContext",
"SuricataFileContext",
"TFTPState",

12
src/Makefile.am
Unescape Escape View File

@ -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 \

55
src/app-layer-krb5.c
Unescape Escape View File

@ -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 <chifflier@wzdftpd.net>
*
* 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
}

34
src/app-layer-krb5.h
Unescape Escape View File

@ -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 <chifflier@wzdftpd.net>
*/
#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 */

55
src/app-layer-ntp.c
Unescape Escape View File

@ -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 <chifflier@wzdftpd.net>
*
* 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
}

34
src/app-layer-ntp.h
Unescape Escape View File

@ -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 <chifflier@wzdftpd.net>
*/
#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 */

18
src/app-layer-parser.c
Unescape Escape View File

@ -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();

40
src/app-layer-quic.c
Unescape Escape View File

@ -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();
}

28
src/app-layer-quic.h
Unescape Escape View File

@ -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 */

38
src/app-layer-rdp.c
Unescape Escape View File

@ -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 <zach.kelly@lmco.com>
*
* 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();
}

29
src/app-layer-rdp.h
Unescape Escape View File

@ -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 <zach.kelly@lmco.com>
*/
#ifndef SURICATA_APP_LAYER_RDP_H
#define SURICATA_APP_LAYER_RDP_H
void RegisterRdpParsers(void);
#endif /* SURICATA_APP_LAYER_RDP_H */

33
src/app-layer-sip.c
Unescape Escape View File

@ -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 <giuseppe@glongo.it>
*
* 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();
}

29
src/app-layer-sip.h
Unescape Escape View File

@ -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 <giuseppe@glongo.it>
*/
#ifndef SURICATA_APP_LAYER_SIP_H
#define SURICATA_APP_LAYER_SIP_H
void RegisterSIPParsers(void);
#endif /* SURICATA_APP_LAYER_SIP_H */

43
src/app-layer-snmp.c
Unescape Escape View File

@ -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 <chifflier@wzdftpd.net>
*
* 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();
}

33
src/app-layer-snmp.h
Unescape Escape View File

@ -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 <chifflier@wzdftpd.net>
*/
#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 */

1
src/detect-krb5-cname.c
Unescape Escape View File

@ -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;

1
src/detect-krb5-errcode.c
Unescape Escape View File

@ -30,7 +30,6 @@
#include "detect-krb5-errcode.h"
#include "app-layer-krb5.h"
#include "rust.h"
/**

1
src/detect-krb5-msgtype.c
Unescape Escape View File

@ -30,7 +30,6 @@
#include "detect-krb5-msgtype.h"
#include "app-layer-krb5.h"
#include "rust.h"
/**

1
src/detect-krb5-sname.c
Unescape Escape View File

@ -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;

1
src/detect-sip-method.c
Unescape Escape View File

@ -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"

3
src/detect-sip-protocol.c
Unescape Escape View File

@ -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"

1
src/detect-sip-request-line.c
Unescape Escape View File

@ -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"

1
src/detect-sip-response-line.c
Unescape Escape View File

@ -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"

1
src/detect-sip-stat-code.c
Unescape Escape View File

@ -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"

1
src/detect-sip-stat-msg.c
Unescape Escape View File

@ -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"

1
src/detect-sip-uri.c
Unescape Escape View File

@ -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"

5
src/rust-context.h
Unescape Escape View File

@ -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"

Write Preview
Loading…
Cancel
Save