summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-10-16 08:49:31 +0000
committerPatrick McHardy <kaber@trash.net>2007-10-16 08:49:31 +0000
commit31f51c62d1aed362ec1eae8db37bd4ba981a4dcc (patch)
tree1f6bdce90341f54267818ab2f2f20bdb1b0a0858
parentc1745b9fd757a4d57d3e8b6365954a5fd70ba3a7 (diff)
Add ip6tables-{save,restore} to non-experimental target, fix strict aliasing warnings
-rw-r--r--Makefile4
-rw-r--r--ip6tables-restore.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3e6dcd59..a4bbf611 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,8 @@ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-r
ifeq ($(DO_IPV6), 1)
EXTRAS+=ip6tables ip6tables.o ip6tables.8
EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
-EXTRAS_EXP+=ip6tables-save ip6tables-restore
-EXTRA_INSTALLS_EXP+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
+EXTRAS+=ip6tables-save ip6tables-restore
+EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
endif
ifndef IPT_LIBDIR
diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 9d01841e..a34e2260 100644
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -77,7 +77,11 @@ ip6tc_handle_t create_handle(const char *tablename, const char* modprobe)
static int parse_counters(char *string, struct ip6t_counters *ctr)
{
- return (sscanf(string, "[%llu:%llu]", (unsigned long long *)&ctr->pcnt, (unsigned long long *)&ctr->bcnt) == 2);
+ u_int64_t *pcnt, *bcnt;
+
+ pcnt = &ctr->pcnt;
+ bcnt = &ctr->bcnt;
+ return (sscanf(string, "[%llu:%llu]", (unsigned long long *)pcnt, (unsigned long long *)bcnt) == 2);
}
/* global new argv and argc */