xtables-multi: fix absence of xml translator in IPv6-only builds
PATCH 1/1 xtables-multi: fix absence of xml translator in IPv6-only builds
From: Maciej Żenczykowski <[email protected]>
Commit de791ff2d7ac85fa0a707bbd6d98457bb18c5cbb didn't actually build the iptables-xml code into the xtables-multi binary...
--- Makefile.am | 4 ++-- iptables-multi.h | 1 - iptables-xml.c | 4 ++-- xtables-multi.c | 6 ++++-- xtables-multi.h | 6 ++++++ 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 xtables-multi.h
Makefile.am +2 -2
@@ -38,7 +38,7 @@ libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1 libxtables_la_LIBADD = endif -xtables_multi_SOURCES = xtables-multi.c +xtables_multi_SOURCES = xtables-multi.c iptables-xml.c xtables_multi_CFLAGS = ${AM_CFLAGS} -DIPTABLES_MULTI xtables_multi_LDFLAGS = -rdynamic xtables_multi_LDADD = extensions/libext.a
@@ -46,7 +46,7 @@ if ENABLE_STATIC xtables_multi_CFLAGS += -DALL_INCLUSIVE endif if ENABLE_IPV4 -xtables_multi_SOURCES += iptables-save.c iptables-restore.c iptables-xml.c \ +xtables_multi_SOURCES += iptables-save.c iptables-restore.c \ iptables-standalone.c iptables.c xtables_multi_CFLAGS += -DENABLE_IPV4 xtables_multi_LDADD += libiptc/libip4tc.la extensions/libext4.a
iptables-multi.h +0 -1
@@ -4,6 +4,5 @@extern int iptables_main (int ,char **);extern int iptables_save_main (int ,char **);extern int iptables_restore_main (int ,char **); -extern int iptables_xml_main (int ,char **);#endif /* _IPTABLES_MULTI_H */
iptables-xml.c +2 -2
@@ -1,6 +1,6 @@/* Code to convert iptables-save format to xml format, * (C) 2006 Ufo Mechanic <[email protected]> -* based on iptables-restor (C) 2000-2002 by Harald Welte <[email protected]> +* based on iptables-restore (C) 2000-2002 by Harald Welte <[email protected]> * based on previous code from Rusty Russell <[email protected]> * * This code is distributed under the terms of GNU GPL v2
@@ -14,7 +14,7 @@#include <stdarg.h> #include "iptables.h" #include "libiptc/libiptc.h" -#include "iptables-multi.h" +#include "xtables-multi.h" #include <xtables.h> #ifdef DEBUG
xtables-multi.c +4 -2
@@ -3,6 +3,8 @@#include <string.h> #include "xshared.h" +#include "xtables-multi.h" +#ifdef ENABLE_IPV4 #include "iptables-multi.h" #endif
@@ -19,9 +21,9 @@ static const struct subcommand multi_subcommands[] = { {"save4", iptables_save_main}, {"iptables-restore", iptables_restore_main}, {"restore4", iptables_restore_main}, - {"iptables-xml", iptables_xml_main}, - {"xml4", iptables_xml_main}, #endif + {"iptables-xml", iptables_xml_main}, + {"xml", iptables_xml_main}, #ifdef ENABLE_IPV6 {"ip6tables", ip6tables_main}, {"main6", ip6tables_main},
xtables-multi.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _XTABLES_MULTI_H +#define _XTABLES_MULTI_H 1 + +extern int iptables_xml_main (int ,char **); + +#endif /* _XTABLES_MULTI_H */
Signature · 6 lines
1.7.3.1 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
FYI, forgot to CC you.
2011/6/6 Maciej Żenczykowski <[email protected]>:
Quoted 108 lines
From: Maciej Żenczykowski <[email protected]>
Commit
de791ff2d7ac85fa0a707bbd6d98457bb18c5cbbdidn't actually build the iptables-xml code into the xtables-multi binary...Change-Id Ib2701ae27ef10c2ce23b13b97b2abb52b520cd95Signed-off-by Maciej Zenczykowski <[email protected]>---
Makefile.am | 4 ++--
iptables-multi.h | 1 -iptables-xml.c | 4 ++-- xtables-multi.c | 6 ++++-- xtables-multi.h | 6 ++++++ 5 files changed, 14 insertions(+), 7 deletions(-)create mode 100644
xtables-multi.hMakefile.am +0
-0@@ -38,7 +38,7 @@ libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1libxtables_la_LIBADD =
endifMakefile.am +1
-1-xtables_multi_SOURCES = xtables-multi.c +xtables_multi_SOURCES = xtables-multi.c iptables-xml.cxtables_multi_CFLAGS = ${AM_CFLAGS} -DIPTABLES_MULTI
xtables_multi_LDFLAGS= -rdynamicxtables_multi_LDADD= extensions/libext.aMakefile.am +0
-0@@ -46,7 +46,7 @@ if ENABLE_STATICxtables_multi_CFLAGS += -DALL_INCLUSIVE
endif
ifENABLE_IPV4Makefile.am +1
-1-xtables_multi_SOURCES += iptables-save.c iptables-restore.c iptables-xml.c \ +xtables_multi_SOURCES += iptables-save.c iptables-restore.c \iptables-standalone.c
iptables.cxtables_multi_CFLAGS+= -DENABLE_IPV4xtables_multi_LDADD+= libiptc/libip4tc.la extensions/libext4.aiptables-multi.h +0
-1@@ -4,6 +4,5 @@ extern int iptables_main(int, char **); extern int iptables_save_main(int, char **); extern int iptables_restore_main(int, char **); -extern int iptables_xml_main (int ,char **); #endif /* _IPTABLES_MULTI_H */iptables-xml.c +2
-2@@ -1,6 +1,6 @@ /* Code to convert iptables-save format to xml format,* (C) 2006 Ufo Mechanic <[email protected]> -* based on iptables-restor (C) 2000-2002 by Harald Welte <[email protected]> +* based on iptables-restore (C) 2000-2002 by Harald Welte <[email protected]> * based on previous code from Rusty Russell <[email protected]> * * This code is distributed under the terms of GNU GPL v2 @@ -14,7 +14,7 @@ #include <stdarg.h> #include "iptables.h" #include "libiptc/libiptc.h" -#include "iptables-multi.h" +#include "xtables-multi.h" #include <xtables.h> #ifdef DEBUGxtables-multi.c +4
-2@@ -3,6 +3,8 @@ #include <string.h> #include "xshared.h" +#include "xtables-multi.h" + #ifdef ENABLE_IPV4 #include "iptables-multi.h" #endif@@ -19,9 +21,9 @@ static const struct subcommand multi_subcommands[] = { {"save4", iptables_save_main}, {"iptables-restore", iptables_restore_main}, {"restore4", iptables_restore_main}, - {"iptables-xml", iptables_xml_main}, - {"xml4", iptables_xml_main}, #endif + {"iptables-xml", iptables_xml_main}, + {"xml", iptables_xml_main}, #ifdef ENABLE_IPV6 {"ip6tables", ip6tables_main}, {"main6", ip6tables_main},xtables-multi.h new file +6
-1@@ -0,0 +1,6 @@ +#ifndef _XTABLES_MULTI_H +#define _XTABLES_MULTI_H 1 + +extern int iptables_xml_main (int ,char **); + +#endif /* _XTABLES_MULTI_H */ --
Quoted 3 lines
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
xtables-multi.h line 6
Quoted 10 lines · Maciej Żenczykowski
index 0000000..615724b
xtables-multi.h new file +6
-0@@ -0,0 +1,6 @@ +#ifndef _XTABLES_MULTI_H +#define _XTABLES_MULTI_H 1 + +extern int iptables_xml_main (int ,char **); + +#endif /* _XTABLES_MULTI_H */
Simply put this in xshared.h.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 14 lines · Jan Engelhardt
xtables-multi.h line 6
Quoted 10 lines · Maciej Żenczykowski
index 0000000..615724b
xtables-multi.h new file +6
-0@@ -0,0 +1,6 @@ +#ifndef _XTABLES_MULTI_H +#define _XTABLES_MULTI_H 1 + +extern int iptables_xml_main (int ,char **); + +#endif /* _XTABLES_MULTI_H */ Simply put this in
xshared.h.
Applied anyway, cleanup follows later.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
2011/6/7 Jan Engelhardt <[email protected]>:
Quoted 1 line
Simply put this in
xshared.h.
Theoretically this is only needed for compilation of xtables-multi, and thus doesn't quite strictly belong in xshared.h.
I was also thinking of renaming the files iptables-xml.* to xtables-xml.* to make it better reflect that it isn't ip4tables specific
(a binary symlink would continue to exist).
Quoted 10 lines · Maciej Żenczykowski
2011/6/7 Jan Engelhardt <[email protected]>:
Quoted 1 line
Simply put this in
xshared.h.Theoretically this is only needed for compilation of xtables-multi, and thus doesn't quite strictly belong in
xshared.h.I was also thinking of renaming the files iptables-xml.* to xtables-xml.* to make it better reflect that it isn't ip4tables specific
(a binary symlink would continue to exist).
Let me take care of that, I plan to move this into a separate dir already.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Jan Engelhardt
Quoted 6 lines · Maciej Żenczykowski
2011/6/7 Jan Engelhardt <[email protected]>:
Quoted 1 line
Simply put this in
xshared.h.Theoretically this is only needed for compilation of xtables-multi, and thus doesn't quite strictly belong in
xshared.h.
Quoted 7 lines
Quoted 4 lines
I was also thinking of renaming the files iptables-xml.* to xtables-xml.* to make it better reflect that it isn't ip4tables specific
(a binary symlink would continue to exist).Let me take care of that, I plan to move this into a separate dir already.
Hm... generally your idea is not bad, though iptables-xml would need to be kept as a v4_link (Makefile.am) I suspect.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html