iptables-xml: Use add_param_to_argv()
Phil Sutter
reviewerPATCH 1/2 iptables-xml: Use add_param_to_argv()
Extend the shared argv parser by storing whether a given argument was quoted or not, then use it in iptables-xml. One remaining extra bit is extraction of chain name in -A commands, do that afterwards in a loop.
--- iptables/iptables-xml.c | 78 +- .../testcases/ipt-save/0006iptables-xml_0 | 13 + .../ipt-save/dumps/fedora27-iptables.xml | 925 ++++++++++++++++++ iptables/xshared.c | 6 +- 4 files changed, 949 insertions(+), 73 deletions(-) create mode 100755 iptables/tests/shell/testcases/ipt-save/0006iptables-xml_0 create mode 100644 iptables/tests/shell/testcases/ipt-save/dumps/fedora27-iptables.xml
iptables/iptables-xml.c +7 -71
@@ -647,78 +647,8 @@ iptables_xml_main(int argc, char *argv[])char *parsestart = buffer;char *chain =NULL ; -/* the parser */ -char *param_start, *curchar; -int quote_open, quoted; -char param_buffer[1024 ]; -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 -* then so can everyone else */ - - quote_open =0 ; -/* We need to know which args were quoted so we -can preserve quote */ - quoted =0 ; - param_start = parsestart; - -for (curchar = parsestart; *curchar; curchar++) { -if (*curchar =='"' ) { -/* quote_open cannot be true if there -* was no previous character. Thus, -* curchar-1 has to be within bounds */ -if (quote_open && - *(curchar -1 ) !='\\' ) { - quote_open =0 ; - *curchar =' ' ; - }else { - quote_open =1 ; - quoted =1 ; - param_start++; - } - } -if (*curchar ==' ' - || *curchar =='\t' || *curchar =='\n' ) { -int param_len = curchar - param_start; - -if (quote_open) -continue ; - -if (!param_len) { -/* two spaces? */ - param_start++; -continue ; - } - -/* end of one parameter */ -strncpy (param_buffer, param_start, - param_len); - *(param_buffer + param_len) ='\0' ; - -/* check if table name specified */ -if ((param_buffer[0 ] =='-' && - param_buffer[1 ] !='-' && -strchr (param_buffer,'t' )) || - (!strncmp (param_buffer,"--t" ,3 ) && - !strncmp (param_buffer,"--table" ,strlen (param_buffer)))) -xtables_error (PARAMETER_PROBLEM , -"Line %u seems to have a " -"-t table option.\n" , - line); - -add_argv (param_buffer, quoted); -if (newargc >=2 - &&0 == -strcmp (newargv[newargc -2 ],"-A" )) - chain = newargv[newargc -1 ]; - quoted =0 ; - param_start += param_len +1 ; - }else { -/* regular character, skip */ - } - } +add_param_to_argv (parsestart, line);DEBUGP ("calling do_command4(%u, argv, &%s, handle):\n" , newargc, curTable);
@@ -726,6 +656,12 @@ iptables_xml_main(int argc, char *argv[])for (a =0 ; a < newargc; a++)DEBUGP ("argv[%u]: %s\n" , a, newargv[a]); +for (a =1 ; a < newargc; a++) { +if (strcmp (newargv[a -1 ],"-A" )) +continue ; + chain = newargv[a]; +break ; + }if (!chain) {fprintf (stderr,"%s: line %u failed - no chain found\n" , prog_name, line);
iptables/tests/shell/testcases/ipt-save/0006iptables-xml_0 new file +13 -0
@@ -0,0 +1,13 @@ +#!/bin/bash + +case "$(basename $XT_MULTI)" in + xtables-legacy-multi) + ;; + *) + echo "skip $XT_MULTI" + exit 0 + ;; +esac + +dump=$(dirname $0)/dumps/fedora27-iptables +diff -u -Z <(cat ${dump}.xml) <($XT_MULTI iptables-xml <$dump)
iptables/tests/shell/testcases/ipt-save/dumps/fedora27-iptables.xml new file +925 -0
925 lines not on this page · raw message
iptables/xshared.c +4 -2
@@ -484,7 +484,7 @@ static void add_param(struct xt_param_buf *param, const char *curchar)void add_param_to_argv (char *parsestart,int line) { -int quote_open =0 , escaped =0 ; +int quote_open =0 , escaped =0 , quoted =0 ;struct xt_param_buf param = {};char *curchar;
@@ -511,6 +511,7 @@ void add_param_to_argv(char *parsestart, int line) }else {if (*curchar =='"' ) { quote_open =1 ; + quoted =1 ;continue ; } }
@@ -545,8 +546,9 @@ void add_param_to_argv(char *parsestart, int line) line, xt_params->program_name); } -add_argv (param.buffer,0 ); +add_argv (param.buffer, quoted); param.len =0 ; + quoted =0 ; } }
Signature · 1 line
2.23.0
Phil Sutter
reviewerPATCH 2/2 xshared: Introduce struct argv_store
Make add_argv() and related routines reentrant by introducing a data structure to hold the stored arguments.
--- iptables/iptables-restore.c | 28 +++++++------- iptables/iptables-xml.c | 30 ++++++++------- iptables/xshared.c | 76 +++++++++++++++++++------------------ iptables/xshared.h | 26 +++++++------ iptables/xtables-restore.c | 31 +++++++-------- 5 files changed, 96 insertions(+), 95 deletions(-)
iptables/iptables-restore.c +13 -15
@@ -94,6 +94,7 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, int argc, char *argv[]) { struct xtc_handle *handle = NULL; +struct argv_store av_store = {};char buffer[10240 ];int c, lock;char curtable[XT_TABLE_MAXNAMELEN +1 ] = {};
@@ -311,34 +312,31 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, ret =1 ; }else if (in_table) { -int a;char *pcnt =NULL ;char *bcnt =NULL ;char *parsestart = buffer; -add_argv (argv[0 ],0 ); -add_argv ("-t" ,0 ); -add_argv (curtable,0 ); +add_argv (&av_store, argv[0 ],0 ); +add_argv (&av_store,"-t" ,0 ); +add_argv (&av_store, curtable,0 );tokenize_rule_counters (&parsestart, &pcnt, &bcnt, line);if (counters && pcnt && bcnt) { -add_argv ("--set-counters" ,0 ); -add_argv (pcnt,0 ); -add_argv (bcnt,0 ); +add_argv (&av_store,"--set-counters" ,0 ); +add_argv (&av_store, pcnt,0 ); +add_argv (&av_store, bcnt,0 ); } -add_param_to_argv (parsestart, line); +add_param_to_argv (&av_store, parsestart, line);DEBUGP ("calling do_command(%u, argv, &%s, handle):\n" , - newargc, curtable); + av_store.argc, curtable); +debug_print_argv (&av_store); -for (a =0 ; a < newargc; a++) -DEBUGP ("argv[%u]: %s\n" , a, newargv[a]); + ret = cb->do_command (av_store.argc, av_store.argv, + &av_store.argv[2 ], &handle, true); - ret = cb->do_command (newargc, newargv, - &newargv[2 ], &handle, true); - -free_argv (); +free_argv (&av_store);fflush (stdout); }if (tablename &&strcmp (tablename, curtable) !=0 )
iptables/iptables-xml.c +16 -14
@@ -440,7 +440,7 @@ do_rule_part(char *leveltag1, char *leveltag2, int part, int argc, }static int -compareRules (void ) +compareRules (int newargc,char *newargv[],int oldargc,char *oldargv[]) {/* Compare arguments up to -j or -g for match. * NOTE: We don't want to combine actions if there were no criteria
@@ -489,11 +489,13 @@ compareRules(void)/* has a nice parsed rule starting with -A */ static void -do_rule (char *pcnt,char *bcnt,int argc,char *argv[],int argvattr[]) +do_rule (char *pcnt,char *bcnt,int argc,char *argv[],int argvattr[], +int oldargc,char *oldargv[]) {/* are these conditions the same as the previous rule? * If so, skip arg straight to -j or -g */ -if (combine && argc >2 && !isTarget (argv[2 ]) &&compareRules ()) { +if (combine && argc >2 && !isTarget (argv[2 ]) && +compareRules (argc, argv, oldargc, oldargv)) {xmlComment ("Combine action from next rule" ); }else {
@@ -539,6 +541,7 @@ do_rule(char *pcnt, char *bcnt, int argc, char *argv[], int argvattr[])int iptables_xml_main (int argc,char *argv[]) { +struct argv_store last_rule = {}, cur_rule = {};char buffer[10240 ];int c;FILE *in;
@@ -648,18 +651,16 @@ iptables_xml_main(int argc, char *argv[])char *chain =NULL ;tokenize_rule_counters (&parsestart, &pcnt, &bcnt, line); -add_param_to_argv (parsestart, line); +add_param_to_argv (&cur_rule, parsestart, line);DEBUGP ("calling do_command4(%u, argv, &%s, handle):\n" , - newargc, curTable); + cur_rule.argc, curTable); +debug_print_argv (&cur_rule); -for (a =0 ; a < newargc; a++) -DEBUGP ("argv[%u]: %s\n" , a, newargv[a]); - -for (a =1 ; a < newargc; a++) { -if (strcmp (newargv[a -1 ],"-A" )) +for (a =1 ; a < cur_rule.argc; a++) { +if (strcmp (cur_rule.argv[a -1 ],"-A" ))continue ; - chain = newargv[a]; + chain = cur_rule.argv[a];break ; }if (!chain) {
@@ -668,9 +669,10 @@ iptables_xml_main(int argc, char *argv[])exit (1 ); }needChain (chain);// Should we explicitly look for -A -do_rule (pcnt, bcnt, newargc, newargv, newargvattr); +do_rule (pcnt, bcnt, cur_rule.argc, cur_rule.argv, + cur_rule.argvattr, last_rule.argc, last_rule.argv); -save_argv (); +save_argv (&last_rule, &cur_rule); ret =1 ; }if (!ret) {
@@ -687,7 +689,7 @@ iptables_xml_main(int argc, char *argv[])fclose (in);printf ("</iptables-rules>\n" ); -free_argv (); +free_argv (&last_rule);return 0 ; }
iptables/xshared.c +39 -37
114 lines not on this page · raw message
iptables/xshared.h +15 -11
@@ -156,18 +156,22 @@ bool xs_has_arg(int argc, char *argv[]);extern const struct xtables_afinfo *afinfo; -extern char *newargv[]; -extern int newargc; - -extern char *oldargv[]; -extern int oldargc; - -extern int newargvattr[]; +#define MAX_ARGC 255 +struct argv_store { +int argc; +char *argv[MAX_ARGC ]; +int argvattr[MAX_ARGC ]; +}; -int add_argv (const char *what,int quoted); -void free_argv (void ); -void save_argv (void ); -void add_param_to_argv (char *parsestart,int line); +void add_argv (struct argv_store *store,const char *what,int quoted); +void free_argv (struct argv_store *store); +void save_argv (struct argv_store *dst,struct argv_store *src); +void add_param_to_argv (struct argv_store *store,char *parsestart,int line); +#ifdef DEBUG +void debug_print_argv (struct argv_store *store); +#else +# define debug_print_argv (...)/* nothing */ +#endif void print_ipv4_addresses (const struct ipt_entry *fw,unsigned int format);void print_ipv6_addresses (const struct ip6t_entry *fw6,unsigned int format);
iptables/xtables-restore.c +13 -18
@@ -73,6 +73,7 @@ void xtables_restore_parse(struct nft_handle *h, const struct nft_xt_restore_cb *cb) {const struct builtin_table *curtable =NULL ; +struct argv_store av_store = {};char buffer[10240 ];int in_table =0 ;
@@ -209,35 +210,29 @@ void xtables_restore_parse(struct nft_handle *h, } ret =1 ; }else if (in_table) { -int a;char *pcnt =NULL ;char *bcnt =NULL ;char *parsestart = buffer; -/* reset the newargv */ - newargc =0 ; - -add_argv (xt_params->program_name,0 ); -add_argv ("-t" ,0 ); -add_argv (curtable->name,0 ); +add_argv (&av_store, xt_params->program_name,0 ); +add_argv (&av_store,"-t" ,0 ); +add_argv (&av_store, curtable->name,0 );tokenize_rule_counters (&parsestart, &pcnt, &bcnt, line);if (counters && pcnt && bcnt) { -add_argv ("--set-counters" ,0 ); -add_argv (pcnt,0 ); -add_argv (bcnt,0 ); +add_argv (&av_store,"--set-counters" ,0 ); +add_argv (&av_store, pcnt,0 ); +add_argv (&av_store, bcnt,0 ); } -add_param_to_argv (parsestart, line); +add_param_to_argv (&av_store, parsestart, line);DEBUGP ("calling do_command4(%u, argv, &%s, handle):\n" , - newargc, curtable->name); - -for (a =0 ; a < newargc; a++) -DEBUGP ("argv[%u]: %s\n" , a, newargv[a]); + av_store.argc, curtable->name); +debug_print_argv (&av_store); - ret = cb->do_command (h, newargc, newargv, - &newargv[2 ], true); + ret = cb->do_command (h, av_store.argc, av_store.argv, + &av_store.argv[2 ], true);if (ret <0 ) {if (cb->abort) ret = cb->abort (h);
@@ -251,7 +246,7 @@ void xtables_restore_parse(struct nft_handle *h,exit (1 ); } -free_argv (); +free_argv (&av_store);fflush (stdout); } if (p->tablename && curtable &&
Signature · 1 line
2.23.0
Re: [iptables PATCH 2/2] xshared: Introduce struct argv_store
Quoted 4 lines · Phil Sutter
Make
add_argv()and related routines reentrant by introducing a data structure to hold the stored arguments.Signed-off-by Phil Sutter <[email protected]>
Quoted 5 lines · Phil Sutter
Extend the shared argv parser by storing whether a given argument was quoted or not, then use it in iptables-xml. One remaining extra bit is extraction of chain name in -A commands, do that afterwards in a loop.
Signed-off-by Phil Sutter <[email protected]>