diff options
| -rw-r--r-- | include/xtables.h | 1 | ||||
| -rw-r--r-- | iptables/xtables-arp.c | 6 | ||||
| -rw-r--r-- | iptables/xtables.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/xtables.h b/include/xtables.h index c872a042..ca674c26 100644 --- a/include/xtables.h +++ b/include/xtables.h @@ -425,6 +425,7 @@ struct xtables_globals struct option *opts; void (*exit_err)(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3))); int (*compat_rev)(const char *name, uint8_t rev, int opt); + void (*print_help)(const struct xtables_rule_match *m); }; #define XT_GETOPT_TABLEEND {.name = NULL, .has_arg = false} diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index a028ac34..2e4bb3f2 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -97,6 +97,7 @@ static struct option original_opts[] = { #define opts xt_params->opts extern void xtables_exit_error(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3))); +static void printhelp(const struct xtables_rule_match *m); struct xtables_globals arptables_globals = { .option_offset = 0, .program_version = PACKAGE_VERSION, @@ -104,6 +105,7 @@ struct xtables_globals arptables_globals = { .orig_opts = original_opts, .exit_err = xtables_exit_error, .compat_rev = nft_compatible_revision, + .print_help = printhelp, }; /***********************************************/ @@ -164,7 +166,7 @@ exit_tryhelp(int status) } static void -printhelp(void) +printhelp(const struct xtables_rule_match *m) { struct xtables_target *t = NULL; int i; @@ -563,7 +565,7 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, if (!optarg) optarg = argv[optind]; - printhelp(); + xt_params->print_help(NULL); command = CMD_NONE; break; case 's': diff --git a/iptables/xtables.c b/iptables/xtables.c index 9abfc8f8..2b3cc930 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -85,6 +85,7 @@ static struct option original_opts[] = { }; void xtables_exit_error(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3))); +static void printhelp(const struct xtables_rule_match *m); struct xtables_globals xtables_globals = { .option_offset = 0, @@ -93,6 +94,7 @@ struct xtables_globals xtables_globals = { .orig_opts = original_opts, .exit_err = xtables_exit_error, .compat_rev = nft_compatible_revision, + .print_help = printhelp, }; #define opts xt_params->opts @@ -435,7 +437,7 @@ void do_parse(struct nft_handle *h, int argc, char *argv[], xtables_find_match(cs->protocol, XTF_TRY_LOAD, &cs->matches); - printhelp(cs->matches); + xt_params->print_help(cs->matches); p->command = CMD_NONE; return; |