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/xtables-eb.c | |
| 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/xtables-eb.c')
| -rw-r--r-- | iptables/xtables-eb.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) { |