dhcp: remove C app-layer-dhcp wrapper

This just wrapped the Rust function to register the parse,
so instead just call the Rust function directly to remove
the C wrapper, and the 2 C files.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1b3a1b1ba7f54e8f6cfae5c0dcae66953e9ef71c..6ac999b9ddaacd55a68e81192a47faba03da8482 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,6 @@ app-layer-register.c app-layer-register.h \
 app-layer-tftp.c app-layer-tftp.h \
 app-layer-ikev2.c app-layer-ikev2.h \
 app-layer-krb5.c app-layer-krb5.h \
-app-layer-dhcp.c app-layer-dhcp.h \
 app-layer-template.c app-layer-template.h \
 app-layer-template-rust.c app-layer-template-rust.h \
 app-layer-rdp.c app-layer-rdp.h \

diff --git a/src/app-layer-dhcp.c b/src/app-layer-dhcp.c
deleted file mode 100644 (file)
index 243cc63..0000000
--- a/src/app-layer-dhcp.c
+++ /dev/null
@@ -1,46 +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 Jason Ish <jason.ish@oisf.net>
- */
-
-#include "suricata-common.h"
-#include "util-unittest.h"
-#include "app-layer-parser.h"
-#include "app-layer-dhcp.h"
-#include "rust.h"
-
-void RegisterDHCPParsers(void)
-{
-    rs_dhcp_register_parser();
-#ifdef UNITTESTS
-    AppLayerParserRegisterProtocolUnittests(IPPROTO_TCP, ALPROTO_DHCP,
-        DHCPParserRegisterTests);
-#endif
-}
-
-#ifdef UNITTESTS
-#endif
-
-void DHCPParserRegisterTests(void)
-{
-#ifdef UNITTESTS
-#endif
-}

diff --git a/src/app-layer-dhcp.h b/src/app-layer-dhcp.h
deleted file mode 100644 (file)
index 2981ec3..0000000
--- a/src/app-layer-dhcp.h
+++ /dev/null
@@ -1,30 +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 Jason Ish <jason.ish@oisf.net>
- */
-
-#ifndef __APP_LAYER_DHCP_H__
-#define __APP_LAYER_DHCP_H__
-
-void RegisterDHCPParsers(void);
-void DHCPParserRegisterTests(void);
-
-#endif /* __APP_LAYER_DHCP_H__ */

diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
index 52dc925f6b6bd980c0687180e00b9156e33d0479..46d306d59300681201700d9984a1bac52e804a12 100644 (file)
--- a/src/app-layer-parser.c
+++ b/src/app-layer-parser.c
@@ -63,7 +63,6 @@
 #include "app-layer-tftp.h"
 #include "app-layer-ikev2.h"
 #include "app-layer-krb5.h"
-#include "app-layer-dhcp.h"
 #include "app-layer-snmp.h"
 #include "app-layer-sip.h"
 #include "app-layer-template.h"
@@ -80,6 +79,8 @@
 
 #include "runmodes.h"
 
+#include "rust.h"
+
 struct AppLayerParserThreadCtx_ {
     void *alproto_local_storage[FLOW_PROTO_MAX][ALPROTO_MAX];
 };
@@ -1545,7 +1546,7 @@ void AppLayerParserRegisterProtocolParsers(void)
     RegisterTFTPParsers();
     RegisterIKEV2Parsers();
     RegisterKRB5Parsers();
-    RegisterDHCPParsers();
+    rs_dhcp_register_parser();
     RegisterSNMPParsers();
     RegisterSIPParsers();
     RegisterTemplateRustParsers();

diff --git a/src/output-json-dhcp.c b/src/output-json-dhcp.c
index 18cc8259e94b2dd4c3403b786bd86a0325f25b1e..8174cc4f0cf835e8b983f0db741c3b171832ba4a 100644 (file)
--- a/src/output-json-dhcp.c
+++ b/src/output-json-dhcp.c
@@ -42,7 +42,6 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 
-#include "app-layer-dhcp.h"
 #include "output-json-dhcp.h"
 #include "rust.h"