diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | iptables-restore.c | 10 | ||||
| -rw-r--r-- | iptables-save.c | 8 | ||||
| -rw-r--r-- | iptables-standalone.c | 5 |
4 files changed, 39 insertions, 3 deletions
@@ -42,7 +42,9 @@ EXTRAS+=iptables iptables.o iptables.8 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8 # No longer experimental. +ifneq ($(DO_MULTI), 1) EXTRAS+=iptables-save iptables-restore +endif EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 ifeq ($(DO_IPV6), 1) @@ -114,8 +116,13 @@ print-extensions: iptables.o: iptables.c $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< +ifeq ($(DO_MULTI), 1) +iptables: iptables-multi.c iptables-save.c iptables-restore.c iptables-standalone.c iptables.o $(STATIC_LIBS) libiptc/libiptc.a + $(CC) $(CFLAGS) -DIPTABLES_MULTI -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS) +else iptables: iptables-standalone.c iptables.o $(STATIC_LIBS) libiptc/libiptc.a $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS) +endif $(DESTDIR)$(BINDIR)/iptables: iptables @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) @@ -124,16 +131,28 @@ $(DESTDIR)$(BINDIR)/iptables: iptables iptables-save: iptables-save.c iptables.o $(STATIC_LIBS) libiptc/libiptc.a $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS) +ifeq ($(DO_MULTI), 1) +$(DESTDIR)$(BINDIR)/iptables-save: iptables + @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) + ln -sf $< $@ +else $(DESTDIR)$(BINDIR)/iptables-save: iptables-save @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) cp $< $@ +endif iptables-restore: iptables-restore.c iptables.o $(STATIC_LIBS) libiptc/libiptc.a $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS) +ifeq ($(DO_MULTI), 1) +$(DESTDIR)$(BINDIR)/iptables-restore: iptables + @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) + ln -sf $< $@ +else $(DESTDIR)$(BINDIR)/iptables-restore: iptables-restore @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) cp $< $@ +endif ip6tables.o: ip6tables.c $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< diff --git a/iptables-restore.c b/iptables-restore.c index e21cacc5..c0ab99e2 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -4,7 +4,7 @@ * * This code is distributed under the terms of GNU GPL v2 * - * $Id: iptables-restore.c,v 1.33 2004/02/01 22:03:27 gandalf Exp $ + * $Id: iptables-restore.c,v 1.34 2004/05/26 16:04:48 gandalf Exp $ */ #include <getopt.h> @@ -99,7 +99,13 @@ static void free_argv(void) { free(newargv[i]); } -int main(int argc, char *argv[]) +#ifdef IPTABLES_MULTI +int +iptables_restore_main(int argc, char *argv[]) +#else +int +main(int argc, char *argv[]) +#endif { iptc_handle_t handle = NULL; char buffer[10240]; diff --git a/iptables-save.c b/iptables-save.c index 14314a5f..d825130e 100644 --- a/iptables-save.c +++ b/iptables-save.c @@ -321,7 +321,13 @@ static int do_output(const char *tablename) * :Chain name POLICY packets bytes * rule */ -int main(int argc, char *argv[]) +#ifdef IPTABLES_MULTI +int +iptables_save_main(int argc, char *argv[]) +#else +int +main(int argc, char *argv[]) +#endif { const char *tablename = NULL; int c; diff --git a/iptables-standalone.c b/iptables-standalone.c index 8a4c90ec..244db5fe 100644 --- a/iptables-standalone.c +++ b/iptables-standalone.c @@ -37,8 +37,13 @@ #include <string.h> #include <iptables.h> +#ifdef IPTABLES_MULTI +int +iptables_main(int argc, char *argv[]) +#else int main(int argc, char *argv[]) +#endif { int ret; char *table = "filter"; |