From 8ff84eaf987d74603a88b02632bd00187defcf8d Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 5 May 2022 18:07:38 +0200 Subject: xshared: Move arp_opcodes into shared space 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 --- iptables/nft-arp.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'iptables/nft-arp.c') diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 65bd965e..e6e4d2d8 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -25,22 +25,8 @@ #include #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); -- cgit v1.2.3