It will be referenced by xtables_printhelp() if printing for arptables
and therefore must be present in legacy as well even if unused.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
extensions/libarpt_mangle.c | 1 -
iptables/nft-arp.c | 22 ++++------------------
iptables/nft-arp.h | 7 -------
iptables/xshared.c | 14 ++++++++++++++
iptables/xshared.h | 3 +++
iptables/xtables-arp.c | 1 -
iptables/xtables-monitor.c | 1 -
iptables/xtables.c | 1 -
8 files changed, 21 insertions(+), 29 deletions(-)
delete mode 100644 iptables/nft-arp.h
diff --git a/extensions/libarpt_mangle.c b/extensions/libarpt_mangle.c
index a2378a8ba6ccb..765edf34781f3 100644
--- a/extensions/libarpt_mangle.c
+++ b/extensions/libarpt_mangle.c
@@ -13,7 +13,6 @@
#include <xtables.h>
#include <linux/netfilter_arp/arpt_mangle.h>
#include "iptables/nft.h"
-#include "iptables/nft-arp.h"
static void arpmangle_print_help(void)
{
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c
index 65bd965eb69f6..e6e4d2d81e528 100644
--- a/iptables/nft-arp.c
+++ b/iptables/nft-arp.c
@@ -25,22 +25,8 @@
#include <linux/netfilter/nf_tables.h>
#include "nft-shared.h"
-#include "nft-arp.h"
#include "nft.h"
-
-/* a few names */
-char *arp_opcodes[] =
-{
- "Request",
- "Reply",
- "Request_Reverse",
- "Reply_Reverse",
- "DRARP_Request",
- "DRARP_Reply",
- "DRARP_Error",
- "InARP_Request",
- "ARP_NAK",
-};
+#include "xshared.h"
static bool need_devaddr(struct arpt_devaddr_info *info)
{
@@ -429,7 +415,7 @@ after_devdst:
printf("%s%s", sep, fw->arp.invflags & IPT_INV_ARPOP
? "! " : "");
- if (tmp <= NUMOPCODES && !(format & FMT_NUMERIC))
+ if (tmp <= ARP_NUMOPCODES && !(format & FMT_NUMERIC))
printf("--opcode %s", arp_opcodes[tmp-1]);
else
printf("--opcode %d", tmp);
@@ -660,11 +646,11 @@ static void nft_arp_post_parse(int command,
&cs->arp.arp.arpop_mask, 10)) {
int i;
- for (i = 0; i < NUMOPCODES; i++)
+ for (i = 0; i < ARP_NUMOPCODES; i++)
if (!strcasecmp(arp_opcodes[i],
args->arp_opcode))
break;
- if (i == NUMOPCODES)
+ if (i == ARP_NUMOPCODES)
xtables_error(PARAMETER_PROBLEM,
"Problem with specified opcode");
cs->arp.arp.arpop = htons(i+1);
diff --git a/iptables/nft-arp.h b/iptables/nft-arp.h
deleted file mode 100644
index 3411fc3d7c7b3..0000000000000
--- a/iptables/nft-arp.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _NFT_ARP_H_
-#define _NFT_ARP_H_
-
-extern char *arp_opcodes[];
-#define NUMOPCODES 9
-
-#endif
diff --git a/iptables/xshared.c b/iptables/xshared.c
index 00828c8ae87d9..674b49cb72798 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -20,6 +20,20 @@
#include <signal.h>
#include "xshared.h"
+/* a few arp opcode names */
+char *arp_opcodes[] =
+{
+ "Request",
+ "Reply",
+ "Request_Reverse",
+ "Reply_Reverse",
+ "DRARP_Request",
+ "DRARP_Reply",
+ "DRARP_Error",
+ "InARP_Request",
+ "ARP_NAK",
+};
+
/*
* Print out any special helps. A user might like to be able to add a --help
* to the commandline, and see expected results. So we call help for all
diff --git a/iptables/xshared.h b/iptables/xshared.h
index ca761ee7246ad..2fdebc326a6d6 100644
--- a/iptables/xshared.h
+++ b/iptables/xshared.h
@@ -330,4 +330,7 @@ void ipv4_post_parse(int command, struct iptables_command_state *cs,
void ipv6_post_parse(int command, struct iptables_command_state *cs,
struct xtables_args *args);
+extern char *arp_opcodes[];
+#define ARP_NUMOPCODES 9
+
#endif /* IPTABLES_XSHARED_H */
diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c
index 68514297f381f..f1a128fc55647 100644
--- a/iptables/xtables-arp.c
+++ b/iptables/xtables-arp.c
@@ -37,7 +37,6 @@
#include "xshared.h"
#include "nft.h"
-#include "nft-arp.h"
static struct option original_opts[] = {
{ "append", 1, 0, 'A' },
diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c
index 8a04f4d1490c1..905bb7fed6309 100644
--- a/iptables/xtables-monitor.c
+++ b/iptables/xtables-monitor.c
@@ -37,7 +37,6 @@
#include "iptables.h" /* for xtables_globals */
#include "xtables-multi.h"
#include "nft.h"
-#include "nft-arp.h"
struct cb_arg {
uint32_t nfproto;
diff --git a/iptables/xtables.c b/iptables/xtables.c
index c44b39acdcd97..c65c3fce5cfbe 100644
--- a/iptables/xtables.c
+++ b/iptables/xtables.c
@@ -42,7 +42,6 @@
#include <fcntl.h>
#include "xshared.h"
#include "nft-shared.h"
-#include "nft-arp.h"
#include "nft.h"
static struct option original_opts[] = {
--
2.34.1
