matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: m_xt: Introduce get_xtables_target_opts() 

This pulls common code from parse_ipt() and print_ipt() functions
together.

While here, also fix for incorrect use of the global 'optarg' variable
in print_ipt().

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2016-06-10 13:42:08 +02:00 committed by Stephen Hemminger
parent f6ddd9c5da
commit 2ef4008585
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tc/m_xt.c
View File

@ -116,6 +116,27 @@ static void set_lib_dir(void)
} }
static int get_xtables_target_opts(struct xtables_globals *globals,
struct xtables_target *m)
{
struct option *opts;
#if (XTABLES_VERSION_CODE >= 6)
opts = xtables_options_xfrm(globals->orig_opts,
globals->opts,
m->x6_options,
&m->option_offset);
#else
opts = xtables_merge_options(globals->opts,
m->extra_opts,
&m->option_offset);
#endif
if (!opts)
return -1;
globals->opts = opts;
return 0;
}
static int parse_ipt(struct action_util *a, int *argc_p, static int parse_ipt(struct action_util *a, int *argc_p,
char ***argv_p, int tca_id, struct nlmsghdr *n) char ***argv_p, int tca_id, struct nlmsghdr *n)
{ {
@ -129,7 +150,6 @@ static int parse_ipt(struct action_util *a, int *argc_p,
int size = 0; int size = 0;
int iok = 0, ok = 0; int iok = 0, ok = 0;
__u32 hook = 0, index = 0; __u32 hook = 0, index = 0;
struct option *opts = NULL;
/* copy tcipt_globals because .opts will be modified by iptables */ /* copy tcipt_globals because .opts will be modified by iptables */
struct xtables_globals tmp_tcipt_globals = tcipt_globals; struct xtables_globals tmp_tcipt_globals = tcipt_globals;
@ -163,21 +183,11 @@ static int parse_ipt(struct action_util *a, int *argc_p,
printf(" %s error\n", m->name); printf(" %s error\n", m->name);
return -1; return -1;
} }
#if (XTABLES_VERSION_CODE >= 6)
opts = xtables_options_xfrm(tmp_tcipt_globals.orig_opts, if (get_xtables_target_opts(&tmp_tcipt_globals, m) < 0) {
tmp_tcipt_globals.opts,
m->x6_options,
&m->option_offset);
#else
opts = xtables_merge_options(tmp_tcipt_globals.opts,
m->extra_opts,
&m->option_offset);
#endif
if (opts == NULL) {
fprintf(stderr, " failed to find additional options for target %s\n\n", optarg); fprintf(stderr, " failed to find additional options for target %s\n\n", optarg);
return -1; return -1;
} else }
tmp_tcipt_globals.opts = opts;
ok++; ok++;
break; break;
@ -292,7 +302,6 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)
struct xtables_target *m; struct xtables_target *m;
struct rtattr *tb[TCA_IPT_MAX + 1]; struct rtattr *tb[TCA_IPT_MAX + 1];
struct xt_entry_target *t = NULL; struct xt_entry_target *t = NULL;
struct option *opts = NULL;
if (arg == NULL) if (arg == NULL)
return -1; return -1;
@ -339,21 +348,12 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)
return -1; return -1;
} }
#if (XTABLES_VERSION_CODE >= 6) if (get_xtables_target_opts(&tmp_tcipt_globals, m) < 0) {
opts = xtables_options_xfrm(tmp_tcipt_globals.orig_opts, fprintf(stderr,
tmp_tcipt_globals.opts, " failed to find additional options for target %s\n\n",
m->x6_options, t->u.user.name);
&m->option_offset);
#else
opts = xtables_merge_options(tmp_tcipt_globals.opts,
m->extra_opts,
&m->option_offset);
#endif
if (opts == NULL) {
fprintf(stderr, " failed to find additional options for target %s\n\n", optarg);
return -1; return -1;
} else }
tmp_tcipt_globals.opts = opts;
fprintf(f, "\ttarget "); fprintf(f, "\ttarget ");
m->print(NULL, m->t, 0); m->print(NULL, m->t, 0);
if (tb[TCA_IPT_INDEX] == NULL) { if (tb[TCA_IPT_INDEX] == NULL) {