diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-12-24 14:17:50 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-01-12 14:08:54 +0100 |
| commit | ded7b57977f3fa619975f752a342046225b56935 (patch) | |
| tree | 023f151a125ec8309bbb77d5887f23032abbda56 | |
| parent | 62c3c93d4b0f5f6b9bb6c6829d507b57b976a644 (diff) | |
xshared: Store parsed wait and wait_interval in xtables_args
While nft-variants don't care, legacy ones do.
Signed-off-by: Phil Sutter <phil@nwl.cc>
| -rw-r--r-- | iptables/xshared.c | 8 | ||||
| -rw-r--r-- | iptables/xshared.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/iptables/xshared.c b/iptables/xshared.c index 4c8ee3aa..b7dad707 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -1311,11 +1311,9 @@ void do_parse(int argc, char *argv[], struct xtables_match *m; struct xtables_rule_match *matchp; bool wait_interval_set = false; - struct timeval wait_interval; struct xtables_target *t; bool table_set = false; bool invert = false; - int wait = 0; /* re-set optind to 0 in case do_command4 gets called * a second time */ @@ -1658,7 +1656,7 @@ void do_parse(int argc, char *argv[], "iptables-restore"); } - wait = parse_wait_time(argc, argv); + args->wait = parse_wait_time(argc, argv); break; case 'W': @@ -1668,7 +1666,7 @@ void do_parse(int argc, char *argv[], "iptables-restore"); } - parse_wait_interval(argc, argv, &wait_interval); + parse_wait_interval(argc, argv, &args->wait_interval); wait_interval_set = true; break; @@ -1753,7 +1751,7 @@ void do_parse(int argc, char *argv[], "\nThe \"nat\" table is not intended for filtering, " "the use of DROP is therefore inhibited.\n\n"); - if (!wait && wait_interval_set) + if (!args->wait && wait_interval_set) xtables_error(PARAMETER_PROBLEM, "--wait-interval only makes sense with --wait\n"); diff --git a/iptables/xshared.h b/iptables/xshared.h index 13ea05fe..48bfe911 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -293,6 +293,8 @@ struct xtables_args { const char *arp_hlen, *arp_opcode; const char *arp_htype, *arp_ptype; unsigned long long pcnt_cnt, bcnt_cnt; + int wait; + struct timeval wait_interval; }; struct xt_cmd_parse_ops { |