diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-09-27 16:59:49 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2021-10-20 11:32:54 +0200 |
| commit | 65b150ae382a8b5d1fc7f2465b3ac590c1601ce1 (patch) | |
| tree | c319b280cff3f8fca00539cd9e7fbb54e21e4be6 /iptables | |
| parent | 2e6014c739852daf8c0c42caeef01d3966622c4b (diff) | |
xshared: Store optstring in xtables_globals
Preparing for a common option parser, store the string of options for
each family inside the respective xtables_globals object. The
array of long option definitions sitting in there already indicates it's
the right place.
While being at it, drop '-m' support from arptables-nft.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables')
| -rw-r--r-- | iptables/xshared.h | 2 | ||||
| -rw-r--r-- | iptables/xtables-arp.c | 4 | ||||
| -rw-r--r-- | iptables/xtables-eb.c | 5 | ||||
| -rw-r--r-- | iptables/xtables.c | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/iptables/xshared.h b/iptables/xshared.h index 823894f9..b59116ac 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -68,6 +68,8 @@ struct xtables_globals; struct xtables_rule_match; struct xtables_target; +#define OPTSTRING_COMMON "-:A:C:D:E:F::I:L::M:N:P:VX::Z::" "c:d:i:j:o:p:s:t:" + /* define invflags which won't collide with IPT ones */ #define IPT_INV_SRCDEVADDR 0x0080 #define IPT_INV_TGTDEVADDR 0x0100 diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index 1d132bdf..a028ac34 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -100,6 +100,7 @@ extern void xtables_exit_error(enum xtables_exittype status, const char *msg, .. struct xtables_globals arptables_globals = { .option_offset = 0, .program_version = PACKAGE_VERSION, + .optstring = OPTSTRING_COMMON "R:S::" "h::l:nv" /* "m:" */, .orig_opts = original_opts, .exit_err = xtables_exit_error, .compat_rev = nft_compatible_revision, @@ -444,8 +445,7 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, opterr = 0; opts = xt_params->orig_opts; - while ((c = getopt_long(argc, argv, - "-A:D:R:I:L::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:l:i:vnt:m:c:", + while ((c = getopt_long(argc, argv, xt_params->optstring, opts, NULL)) != -1) { switch (c) { /* diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index 1ed6bcd8..3f58754d 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -220,6 +220,7 @@ extern void xtables_exit_error(enum xtables_exittype status, const char *msg, .. struct xtables_globals ebtables_globals = { .option_offset = 0, .program_version = PACKAGE_VERSION, + .optstring = OPTSTRING_COMMON "h", .orig_opts = ebt_original_options, .exit_err = xtables_exit_error, .compat_rev = nft_compatible_revision, @@ -732,8 +733,8 @@ int do_commandeb(struct nft_handle *h, int argc, char *argv[], char **table, opterr = false; /* Getopt saves the day */ - while ((c = getopt_long(argc, argv, - "-A:D:C:I:N:E:X::L::Z::F::P:Vhi:o:j:c:p:s:d:t:M:", opts, NULL)) != -1) { + while ((c = getopt_long(argc, argv, xt_params->optstring, + opts, NULL)) != -1) { cs.c = c; switch (c) { diff --git a/iptables/xtables.c b/iptables/xtables.c index 0a700e08..c17cf7ae 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -89,6 +89,7 @@ void xtables_exit_error(enum xtables_exittype status, const char *msg, ...) __at struct xtables_globals xtables_globals = { .option_offset = 0, .program_version = PACKAGE_VERSION, + .optstring = OPTSTRING_COMMON "R:S::W::" "46bfg:h::m:nvw::x", .orig_opts = original_opts, .exit_err = xtables_exit_error, .compat_rev = nft_compatible_revision, @@ -455,8 +456,7 @@ void do_parse(struct nft_handle *h, int argc, char *argv[], opterr = 0; opts = xt_params->orig_opts; - while ((cs->c = getopt_long(argc, argv, - "-:A:C:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:fbvw::W::nt:m:xc:g:46", + while ((cs->c = getopt_long(argc, argv, xt_params->optstring, opts, NULL)) != -1) { switch (cs->c) { /* |