On 8/11/2011 8:59 AM, Hegyi László wrote:
Revised patch, in my previous message line ends were somehow wrong. Sorry!
helasz
diff --git a/tc/m_xt.c b/tc/m_xt.c
index 651a59e..13bf19f 100644
--- a/tc/m_xt.c
+++ b/tc/m_xt.c
@@ -160,9 +160,13 @@ static int parse_ipt(struct action_util *a,int *argc_p,
return -1;
}
tcipt_globals.opts =
- xtables_merge_options(tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
+ xtables_merge_options(
+#if (XTABLES_VERSION_CODE >= 6)
+ tcipt_globals.orig_opts,
+#endif
+ tcipt_globals.opts,
+ m->extra_opts,
+ &m->option_offset);
} else {
fprintf(stderr," failed to find target %s\n\n", optarg);
return -1;
@@ -305,7 +309,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr
*arg)
}
tcipt_globals.opts =
- xtables_merge_options(tcipt_globals.opts,
+ xtables_merge_options(
+#if (XTABLES_VERSION_CODE >= 6)
+ tcipt_globals.orig_opts,
+#endif
+ tcipt_globals.opts,
m->extra_opts,
&m->option_offset);
} else {
Hi Helasz,
I have also ran into this when doing a cross build for Mips64 on the latest 9.0
trunk r39542.
The build system could not apply the patch as given above, perhaps you patched against a
different version of iproute2?
Anyway, I applied the changes from your patch by hand and re-generated the patch, and this
one works with the latest T2 revision. I have attached it as a file, so that somone with
commit access to svn can apply it. (It is August, and it seems like everyone is on vacation)
Jan
------------------------------------------------------------------------------------------
Megújult a G-Mail! Látogass el a www.gmail.hu <http://gmail.hu> oldalra!
--- ./tc/m_xt.c.vanella 2011-08-12 11:12:44.316986453 -0400
+++ ./tc/m_xt.c 2011-08-12 11:17:48.533484052 -0400
@@ -162,7 +162,11 @@
return -1;
}
tcipt_globals.opts =
- xtables_merge_options(tcipt_globals.opts,
+ xtables_merge_options(
+#if (XTABLES_VERSION_CODE >= 6)
+ tcipt_globals.orig_opts,
+#endif
+ tcipt_globals.opts,
m->extra_opts,
&m->option_offset);
} else {
@@ -307,7 +311,11 @@
}
tcipt_globals.opts =
- xtables_merge_options(tcipt_globals.opts,
+ xtables_merge_options(
+#if (XTABLES_VERSION_CODE >= 6)
+ tcipt_globals.orig_opts,
+#endif
+ tcipt_globals.opts,
m->extra_opts,
&m->option_offset);
} else {
-----------------------------------------------------------
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
