diff options
| author | Florian Westphal <fw@strlen.de> | 2018-06-08 15:19:18 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-11-19 18:38:35 +0100 |
| commit | bd5f7f521d537bee43337cd576108d6843f82608 (patch) | |
| tree | 783fd9d77ae5afd102060b0e10ef8ad611e04da0 /iptables | |
| parent | 3c7ea26c85b95a4c62355c359030d6bbdf2f8df0 (diff) | |
xtables: rename opcodes to arp_opcodes
way too generic name.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables')
| -rw-r--r-- | iptables/nft-arp.c | 4 | ||||
| -rw-r--r-- | iptables/nft-arp.h | 2 | ||||
| -rw-r--r-- | iptables/xtables-arp.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 37850bd3..399f83af 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -29,7 +29,7 @@ #include "nft.h" /* a few names */ -char *opcodes[] = +char *arp_opcodes[] = { "Request", "Reply", @@ -539,7 +539,7 @@ after_devdst: printf("%s", fw->arp.invflags & ARPT_INV_ARPOP ? "! " : ""); if (tmp <= NUMOPCODES && !(format & FMT_NUMERIC)) - printf("--opcode %s", opcodes[tmp-1]); + printf("--opcode %s", arp_opcodes[tmp-1]); else printf("--opcode %d", tmp); diff --git a/iptables/nft-arp.h b/iptables/nft-arp.h index da6bd380..3411fc3d 100644 --- a/iptables/nft-arp.h +++ b/iptables/nft-arp.h @@ -1,7 +1,7 @@ #ifndef _NFT_ARP_H_ #define _NFT_ARP_H_ -extern char *opcodes[]; +extern char *arp_opcodes[]; #define NUMOPCODES 9 #endif diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index 819e7e6c..5a9924ca 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -485,7 +485,7 @@ exit_printhelp(void) "[!] --version -V print package version.\n"); printf(" opcode strings: \n"); for (i = 0; i < NUMOPCODES; i++) - printf(" %d = %s\n", i + 1, opcodes[i]); + printf(" %d = %s\n", i + 1, arp_opcodes[i]); printf( " hardware type string: 1 = Ethernet\n" " protocol type string: 0x800 = IPv4\n"); @@ -1121,7 +1121,7 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, int i; for (i = 0; i < NUMOPCODES; i++) - if (!strcasecmp(opcodes[i], optarg)) + if (!strcasecmp(arp_opcodes[i], optarg)) break; if (i == NUMOPCODES) xtables_error(PARAMETER_PROBLEM, "Problem with specified opcode"); |