From: Jamal Hadi Salim <jhs@mojatatu•com>
To: Alexander Duyck <alexander.h.duyck@intel•com>
Cc: shemminger@vyatta•com, netdev@vger•kernel.org,
jeffrey.t.kirsher@intel•com, Hasan Chowdhury <shemonc@gmail•com>,
Pablo Neira Ayuso <pablo@netfilter•org>
Subject: Re: [IPROUTE PATCH v2] iproute2: act_ipt fix xtables breakage on older versions.
Date: Tue, 30 Apr 2013 08:59:58 -0400 [thread overview]
Message-ID: <517FC04E.30705@mojatatu.com> (raw)
In-Reply-To: <20130429154644.52016.60284.stgit@ahduyck-cp1.jf.intel.com>
Hi Alex,
Theres still some confusion on my part.
On 13-04-29 11:50 AM, Alexander Duyck wrote:
> The first is that xtables_merge_options only has 3 parameters. It appears
> this is how this code was originally.
what you are describing above is still not making sense:
As such for the case where the version
> is less than 6 I am assuming it would be correct to maintain the original
> setup that only had 3 parameters being passed instead of 4.
>
More below, lets just pick one of those:
> @@ -335,8 +338,7 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
> m->x6_options,
> &m->option_offset);
> #else
> - opts = xtables_merge_options(tcipt_globals.orig_opts,
> - tcipt_globals.opts,
> + opts = xtables_merge_options(tcipt_globals.opts,
> m->extra_opts,
> &m->option_offset);
> #endif
>
Here's the original equivalent change that you are updating:
-------
- tcipt_globals.opts =
- xtables_merge_options(
#if (XTABLES_VERSION_CODE >= 6)
- tcipt_globals.orig_opts,
+ opts = xtables_options_xfrm(tcipt_globals.orig_opts,
+ tcipt_globals.opts,
+ m->x6_options,
+ &m->option_offset);
+#else
+ opts = xtables_merge_options(tcipt_globals.orig_opts,
+ tcipt_globals.opts,
+ m->extra_opts,
+ &m->option_offset);
#endif
- tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
------------------
I see, originally these parameters for xtables_merge_options():
tcipt_globals.orig_opts <---- This is what you are trying to kill
tcipt_globals.opts
m->extra_opts
&m->option_offset
Which says there were 4 parameters to begin with....
Unless you are saying we had it wrong the first time. Pablo?
cheers,
jamal
next prev parent reply other threads:[~2013-04-30 13:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 15:50 [IPROUTE PATCH v2] iproute2: act_ipt fix xtables breakage on older versions Alexander Duyck
2013-04-30 12:59 ` Jamal Hadi Salim [this message]
2013-04-30 16:07 ` Alexander Duyck
2013-05-01 13:47 ` Jamal Hadi Salim
2013-05-01 14:21 ` Jamal Hadi Salim
2013-05-01 17:18 ` Alexander Duyck
2013-05-01 14:22 ` Jamal Hadi Salim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=517FC04E.30705@mojatatu.com \
--to=jhs@mojatatu$(echo .)com \
--cc=alexander.h.duyck@intel$(echo .)com \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
--cc=shemminger@vyatta$(echo .)com \
--cc=shemonc@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox