diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-09-17 18:43:21 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-10-18 11:57:24 +0200 |
| commit | 4abb44c978d75656f69dd59f24522eb970881ccf (patch) | |
| tree | 88a992be6606e03aeb378b79205d29316ca1eb7a /iptables/iptables-xml.c | |
| parent | fe2c53d570bf7a301b0cb5aa25b1186a47378a6b (diff) | |
xtables-restore: Introduce rule counter tokenizer function
The same piece of code appears three times, introduce a function to take
care of tokenizing and error reporting.
Pass buffer pointer via reference so it can be updated to point to after
the counters (if found).
While being at it, drop pointless casting when passing pcnt/bcnt to
add_argv().
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/iptables-xml.c')
| -rw-r--r-- | iptables/iptables-xml.c | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/iptables/iptables-xml.c b/iptables/iptables-xml.c index 36ad7845..5255e097 100644 --- a/iptables/iptables-xml.c +++ b/iptables/iptables-xml.c @@ -644,7 +644,7 @@ iptables_xml_main(int argc, char *argv[]) unsigned int a; char *pcnt = NULL; char *bcnt = NULL; - char *parsestart; + char *parsestart = buffer; char *chain = NULL; /* the parser */ @@ -652,34 +652,7 @@ iptables_xml_main(int argc, char *argv[]) int quote_open, quoted; char param_buffer[1024]; - if (buffer[0] == '[') { - /* we have counters in our input */ - char *ptr = strchr(buffer, ']'); - - if (!ptr) - xtables_error(PARAMETER_PROBLEM, - "Bad line %u: need ]\n", - line); - - pcnt = strtok(buffer + 1, ":"); - if (!pcnt) - xtables_error(PARAMETER_PROBLEM, - "Bad line %u: need :\n", - line); - - bcnt = strtok(NULL, "]"); - if (!bcnt) - xtables_error(PARAMETER_PROBLEM, - "Bad line %u: need ]\n", - line); - - /* start command parsing after counter */ - parsestart = ptr + 1; - } else { - /* start command parsing at start of line */ - parsestart = buffer; - } - + tokenize_rule_counters(&parsestart, &pcnt, &bcnt, line); /* This is a 'real' parser crafted in artist mode * not hacker mode. If the author can live with that |