globally replace NETFILTER_VERSION with IPTABLES_VERSION to have consistent naming
diff --git a/Makefile b/Makefile
index 57d6051..029a97c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@
ifndef KERNEL_DIR
KERNEL_DIR=/usr/src/linux
endif
-NETFILTER_VERSION:=1.2.7
-OLD_NETFILTER_VERSION:=1.2.6a
+IPTABLES_VERSION:=1.2.7
+OLD_IPTABLES_VERSION:=1.2.6a
PREFIX:=/usr/local
LIBDIR:=$(PREFIX)/lib
@@ -31,7 +31,7 @@
endif
COPT_FLAGS:=-O2
-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include -Iinclude/ -DNETFILTER_VERSION=\"$(NETFILTER_VERSION)\" #-g #-pg # -DIPTC_DEBUG
+CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include -Iinclude/ -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DIPTC_DEBUG
ifdef NO_SHARED_LIBS
CFLAGS += -DNO_SHARED_LIBS=1
@@ -185,7 +185,7 @@
# Rusty's distro magic.
.PHONY: distrib
-distrib: check distclean delrelease $(RELEASE_DIR)/iptables-$(NETFILTER_VERSION).tar.bz2 diff md5sums # nowhitespace
+distrib: check distclean delrelease $(RELEASE_DIR)/iptables-$(IPTABLES_VERSION).tar.bz2 diff md5sums # nowhitespace
# Makefile must not define:
# -g -pg -DIPTC_DEBUG
@@ -199,21 +199,21 @@
.PHONY: delrelease
delrelease:
- rm -f $(RELEASE_DIR)/iptables-$(NETFILTER_VERSION).tar.bz2
+ rm -f $(RELEASE_DIR)/iptables-$(IPTABLES_VERSION).tar.bz2
-$(RELEASE_DIR)/iptables-$(NETFILTER_VERSION).tar.bz2:
- cd .. && ln -sf userspace iptables-$(NETFILTER_VERSION) && tar cvf - --exclude CVS iptables-$(NETFILTER_VERSION)/. | bzip2 -9 > $@ && rm iptables-$(NETFILTER_VERSION)
+$(RELEASE_DIR)/iptables-$(IPTABLES_VERSION).tar.bz2:
+ cd .. && ln -sf userspace iptables-$(IPTABLES_VERSION) && tar cvf - --exclude CVS iptables-$(IPTABLES_VERSION)/. | bzip2 -9 > $@ && rm iptables-$(IPTABLES_VERSION)
.PHONY: diff
-diff: $(RELEASE_DIR)/iptables-$(NETFILTER_VERSION).tar.bz2
+diff: $(RELEASE_DIR)/iptables-$(IPTABLES_VERSION).tar.bz2
@mkdir /tmp/diffdir
- @cd /tmp/diffdir && tar -x --bzip2 -f $(RELEASE_DIR)/iptables-$(NETFILTER_VERSION).tar.bz2
- @set -e; cd /tmp/diffdir; tar -x --bzip2 -f $(RELEASE_DIR)/iptables-$(OLD_NETFILTER_VERSION).tar.bz2; echo Creating patch-iptables-$(OLD_NETFILTER_VERSION)-$(NETFILTER_VERSION).bz2; diff -urN iptables-$(OLD_NETFILTER_VERSION) iptables-$(NETFILTER_VERSION) | bzip2 -9 > $(RELEASE_DIR)/patch-iptables-$(OLD_NETFILTER_VERSION)-$(NETFILTER_VERSION).bz2
+ @cd /tmp/diffdir && tar -x --bzip2 -f $(RELEASE_DIR)/iptables-$(IPTABLES_VERSION).tar.bz2
+ @set -e; cd /tmp/diffdir; tar -x --bzip2 -f $(RELEASE_DIR)/iptables-$(OLD_IPTABLES_VERSION).tar.bz2; echo Creating patch-iptables-$(OLD_IPTABLES_VERSION)-$(IPTABLES_VERSION).bz2; diff -urN iptables-$(OLD_IPTABLES_VERSION) iptables-$(IPTABLES_VERSION) | bzip2 -9 > $(RELEASE_DIR)/patch-iptables-$(OLD_IPTABLES_VERSION)-$(IPTABLES_VERSION).bz2
@rm -rf /tmp/diffdir
.PHONY: md5sums
md5sums:
- cd $(RELEASE_DIR)/ && md5sum patch-iptables-*-$(NETFILTER_VERSION).bz2 iptables-$(NETFILTER_VERSION).tar.bz2
+ cd $(RELEASE_DIR)/ && md5sum patch-iptables-*-$(IPTABLES_VERSION).bz2 iptables-$(IPTABLES_VERSION).tar.bz2
# $(wildcard) fails wierdly with make v.3.78.1.
include $(shell echo */Makefile)
diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index 529720f..f4d87aa 100644
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -22,7 +22,7 @@
" --log-tcp-sequence Log TCP sequence numbers.\n\n"
" --log-tcp-options Log TCP options.\n\n"
" --log-ip-options Log IP options.\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -244,7 +244,7 @@
struct ip6tables_target log
= { NULL,
"LOG",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_log_info)),
IP6T_ALIGN(sizeof(struct ip6t_log_info)),
&help,
diff --git a/extensions/libip6t_MARK.c b/extensions/libip6t_MARK.c
index 6d2b103..6062a39 100644
--- a/extensions/libip6t_MARK.c
+++ b/extensions/libip6t_MARK.c
@@ -21,7 +21,7 @@
"MARK target v%s options:\n"
" --set-mark value Set nfmark value\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -104,7 +104,7 @@
struct ip6tables_target mark
= { NULL,
"MARK",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_mark_target_info)),
IP6T_ALIGN(sizeof(struct ip6t_mark_target_info)),
&help,
diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index a145f44..b8b9732 100644
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -154,7 +154,7 @@
struct ip6tables_target reject
= { NULL,
"REJECT",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_reject_info)),
IP6T_ALIGN(sizeof(struct ip6t_reject_info)),
&help,
diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index e778557..aced51b 100644
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -17,7 +17,7 @@
" --ahspi [!] spi[:spi] match spi (range)\n"
" --ahlen [!] length total length of this header\n"
" --ahres check the reserved filed, too\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -219,7 +219,7 @@
struct ip6tables_match ah
= { NULL,
"ah",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_ah)),
IP6T_ALIGN(sizeof(struct ip6t_ah)),
&help,
diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index cd1f23b..8ec3912 100644
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -26,7 +26,7 @@
" --%s-len [!] length total length of this header\n"
" --%s-opts TYPE[:LEN][,TYPE[:LEN]...] \n"
" Options and its length (list, max: %d)\n",
-UNAME , NETFILTER_VERSION, LNAME, LNAME, IP6T_OPTS_OPTSNR);
+UNAME , IPTABLES_VERSION, LNAME, LNAME, IP6T_OPTS_OPTSNR);
}
#if HOPBYHOP
@@ -266,7 +266,7 @@
#else
"dst",
#endif
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_opts)),
IP6T_ALIGN(sizeof(struct ip6t_opts)),
&help,
diff --git a/extensions/libip6t_esp.c b/extensions/libip6t_esp.c
index 973338f..3b47102 100644
--- a/extensions/libip6t_esp.c
+++ b/extensions/libip6t_esp.c
@@ -15,7 +15,7 @@
printf(
"ESP v%s options:\n"
" --espspi [!] spi[:spi] match spi (range)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -171,7 +171,7 @@
struct ip6tables_match esp
= { NULL,
"esp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_esp)),
IP6T_ALIGN(sizeof(struct ip6t_esp)),
&help,
diff --git a/extensions/libip6t_eui64.c b/extensions/libip6t_eui64.c
index 9771798..56dca06 100644
--- a/extensions/libip6t_eui64.c
+++ b/extensions/libip6t_eui64.c
@@ -19,7 +19,7 @@
"eui64 v%s options:\n"
" This module hasn't got any option\n"
" This module checks for EUI64 IPv6 addresses\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -69,7 +69,7 @@
struct ip6tables_match eui64
= { NULL,
"eui64",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(int)),
IP6T_ALIGN(sizeof(int)),
&help,
diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index f388201..2cc8a37 100644
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -20,7 +20,7 @@
" --fragfirst matches on the first fragment\n"
" [--fragmore|--fraglast] there are more fragments or this\n"
" is the last one\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -245,7 +245,7 @@
struct ip6tables_match frag
= { NULL,
"frag",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_frag)),
IP6T_ALIGN(sizeof(struct ip6t_frag)),
&help,
diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index a10d6a4..43b4316 100644
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -26,7 +26,7 @@
" --%s-len [!] length total length of this header\n"
" --%s-opts TYPE[:LEN][,TYPE[:LEN]...] \n"
" Options and its length (list, max: %d)\n",
-UNAME , NETFILTER_VERSION, LNAME, LNAME, IP6T_OPTS_OPTSNR);
+UNAME , IPTABLES_VERSION, LNAME, LNAME, IP6T_OPTS_OPTSNR);
}
#if HOPBYHOP
@@ -266,7 +266,7 @@
#else
"dst",
#endif
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_opts)),
IP6T_ALIGN(sizeof(struct ip6t_opts)),
&help,
diff --git a/extensions/libip6t_icmpv6.c b/extensions/libip6t_icmpv6.c
index 97027da..52d7871 100644
--- a/extensions/libip6t_icmpv6.c
+++ b/extensions/libip6t_icmpv6.c
@@ -81,7 +81,7 @@
"ICMPv6 v%s options:\n"
" --icmpv6-type [!] typename match icmpv6 type\n"
" (or numeric type or type/code)\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
print_icmpv6types();
}
@@ -260,7 +260,7 @@
static struct ip6tables_match icmpv6
= { NULL,
"icmp6",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_icmp)),
IP6T_ALIGN(sizeof(struct ip6t_icmp)),
&help,
diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 6e4986d..3437e22 100644
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -145,7 +145,7 @@
" ipv6-frag,ah,esp,ipv6-nonxt,protocol\n"
" numbers: 0,60,43,44,51,50,59\n"
"--soft The header CONTAINS the specified extensions\n",
- NETFILTER_VERSION);
+ IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -301,7 +301,7 @@
struct ip6tables_match ipv6header
= { NULL,
"ipv6header",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_ipv6header_info)),
IP6T_ALIGN(sizeof(struct ip6t_ipv6header_info)),
&help,
diff --git a/extensions/libip6t_length.c b/extensions/libip6t_length.c
index fe65115..7cb5da7 100644
--- a/extensions/libip6t_length.c
+++ b/extensions/libip6t_length.c
@@ -17,7 +17,7 @@
"length v%s options:\n"
"[!] --length length[:length] Match packet length against value or range\n"
" of values (inclusive)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
@@ -143,7 +143,7 @@
struct ip6tables_match length
= { NULL,
"length",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_length_info)),
IP6T_ALIGN(sizeof(struct ip6t_length_info)),
&help,
diff --git a/extensions/libip6t_limit.c b/extensions/libip6t_limit.c
index 4a0dc08..9516252 100644
--- a/extensions/libip6t_limit.c
+++ b/extensions/libip6t_limit.c
@@ -26,7 +26,7 @@
" [Packets per second unless followed by \n"
" /sec /minute /hour /day postfixes]\n"
"--limit-burst number number to match in a burst, default %u\n"
-"\n", NETFILTER_VERSION, IP6T_LIMIT_BURST);
+"\n", IPTABLES_VERSION, IP6T_LIMIT_BURST);
}
static struct option opts[] = {
@@ -181,7 +181,7 @@
struct ip6tables_match limit
= { NULL,
"limit",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_rateinfo)),
offsetof(struct ip6t_rateinfo, prev),
&help,
diff --git a/extensions/libip6t_mac.c b/extensions/libip6t_mac.c
index 64c62f2..8fbb819 100644
--- a/extensions/libip6t_mac.c
+++ b/extensions/libip6t_mac.c
@@ -20,7 +20,7 @@
"MAC v%s options:\n"
" --mac-source [!] XX:XX:XX:XX:XX:XX\n"
" Match source MAC address\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -127,7 +127,7 @@
struct ip6tables_match mac
= { NULL,
"mac",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_mac_info)),
IP6T_ALIGN(sizeof(struct ip6t_mac_info)),
&help,
diff --git a/extensions/libip6t_mark.c b/extensions/libip6t_mark.c
index 7a05d03..4aa606e 100644
--- a/extensions/libip6t_mark.c
+++ b/extensions/libip6t_mark.c
@@ -16,7 +16,7 @@
"MARK match v%s options:\n"
"[!] --mark value[/mask] Match nfmark value with optional mask\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -111,7 +111,7 @@
struct ip6tables_match mark
= { NULL,
"mark",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_mark_info)),
IP6T_ALIGN(sizeof(struct ip6t_mark_info)),
&help,
diff --git a/extensions/libip6t_multiport.c b/extensions/libip6t_multiport.c
index 16bbcf8..4847a9d 100644
--- a/extensions/libip6t_multiport.c
+++ b/extensions/libip6t_multiport.c
@@ -21,7 +21,7 @@
" match destination port(s)\n"
" --ports port[,port,port]\n"
" match both source and destination port(s)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -246,7 +246,7 @@
struct ip6tables_match multiport
= { NULL,
"multiport",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_multiport)),
IP6T_ALIGN(sizeof(struct ip6t_multiport)),
&help,
diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c
index 8b511d9..ce34358 100644
--- a/extensions/libip6t_owner.c
+++ b/extensions/libip6t_owner.c
@@ -21,7 +21,7 @@
"[!] --pid-owner processid Match local pid\n"
"[!] --sid-owner sessionid Match local sid\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -199,7 +199,7 @@
struct ip6tables_match owner
= { NULL,
"owner",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_owner_info)),
IP6T_ALIGN(sizeof(struct ip6t_owner_info)),
&help,
diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index a12270e..b407be1 100644
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -26,7 +26,7 @@
" --rt-0-res check the reserved filed, too (type 0)\n"
" --rt-0-addrs ADDR[,ADDR...] Type=0 addresses (list, max: %d)\n"
" --rt-0-not-strict List of Type=0 addresses not a strict list\n",
-NETFILTER_VERSION, IP6T_RT_HOPS);
+IPTABLES_VERSION, IP6T_RT_HOPS);
}
static struct option opts[] = {
@@ -345,7 +345,7 @@
struct ip6tables_match rt
= { NULL,
"rt",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_rt)),
IP6T_ALIGN(sizeof(struct ip6t_rt)),
&help,
diff --git a/extensions/libip6t_standard.c b/extensions/libip6t_standard.c
index 7941448..b8a0ce7 100644
--- a/extensions/libip6t_standard.c
+++ b/extensions/libip6t_standard.c
@@ -13,7 +13,7 @@
{
printf(
"Standard v%s options:\n"
-"(If target is DROP, ACCEPT, RETURN or nothing)\n", NETFILTER_VERSION);
+"(If target is DROP, ACCEPT, RETURN or nothing)\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -51,7 +51,7 @@
struct ip6tables_target standard
= { NULL,
"standard",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(int)),
IP6T_ALIGN(sizeof(int)),
&help,
diff --git a/extensions/libip6t_tcp.c b/extensions/libip6t_tcp.c
index 367a29f..2eb33dd 100644
--- a/extensions/libip6t_tcp.c
+++ b/extensions/libip6t_tcp.c
@@ -24,7 +24,7 @@
" --dport ...\n"
" match destination port(s)\n"
" --tcp-option [!] number match if TCP option set\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -424,7 +424,7 @@
struct ip6tables_match tcp
= { NULL,
"tcp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_tcp)),
IP6T_ALIGN(sizeof(struct ip6t_tcp)),
&help,
diff --git a/extensions/libip6t_udp.c b/extensions/libip6t_udp.c
index 5378e59..fb0505e 100644
--- a/extensions/libip6t_udp.c
+++ b/extensions/libip6t_udp.c
@@ -19,7 +19,7 @@
" --destination-port [!] port[:port]\n"
" --dport ...\n"
" match destination port(s)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -233,7 +233,7 @@
struct ip6tables_match udp
= { NULL,
"udp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IP6T_ALIGN(sizeof(struct ip6t_udp)),
IP6T_ALIGN(sizeof(struct ip6t_udp)),
&help,
diff --git a/extensions/libipt_BALANCE.c b/extensions/libipt_BALANCE.c
index 78d5d2d..7f0b916 100644
--- a/extensions/libipt_BALANCE.c
+++ b/extensions/libipt_BALANCE.c
@@ -18,7 +18,7 @@
"BALANCE v%s options:\n"
" --to-destination <ipaddr>-<ipaddr>\n"
" Addresses to map destination to.\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -135,7 +135,7 @@
struct iptables_target balance
= { NULL,
"BALANCE",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
&help,
diff --git a/extensions/libipt_CONNMARK.c b/extensions/libipt_CONNMARK.c
index 824c1de..2e06dda 100644
--- a/extensions/libipt_CONNMARK.c
+++ b/extensions/libipt_CONNMARK.c
@@ -25,7 +25,7 @@
" --save-mark Save the packet nfmark on the connection\n"
" --restore-mark Restore saved nfmark value\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -149,7 +149,7 @@
struct iptables_target mark
= { NULL,
"CONNMARK",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_connmark_target_info)),
IPT_ALIGN(sizeof(struct ipt_connmark_target_info)),
&help,
diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index 279f76e..9b82675 100644
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -25,7 +25,7 @@
" --to-destination <ipaddr>[-<ipaddr>][:port-port]\n"
" Address to map destination to.\n"
" (You can use this more than once)\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -228,7 +228,7 @@
struct iptables_target dnat
= { NULL,
"DNAT",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
&help,
diff --git a/extensions/libipt_DSCP.c b/extensions/libipt_DSCP.c
index 19b765e..e06c736 100644
--- a/extensions/libipt_DSCP.c
+++ b/extensions/libipt_DSCP.c
@@ -184,7 +184,7 @@
struct iptables_target dscp
= { NULL,
"DSCP",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_DSCP_info)),
IPT_ALIGN(sizeof(struct ipt_DSCP_info)),
&help,
diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c
index ddab35c..a883b3f 100644
--- a/extensions/libipt_ECN.c
+++ b/extensions/libipt_ECN.c
@@ -6,7 +6,7 @@
*
* libipt_ECN.c borrowed heavily from libipt_DSCP.c
*
- * $Id: libipt_ECN.c,v 1.3 2002/04/10 13:12:53 laforge Exp $
+ * $Id: libipt_ECN.c,v 1.5 2002/05/29 12:43:34 laforge Exp $
*/
#include <stdio.h>
#include <string.h>
@@ -30,7 +30,7 @@
" --ecn-ip-ect Set the IPv4 ECT codepoint (0 to 3)\n"
" --ecn-tcp-cwr Set the IPv4 CWR bit (0 or 1)\n"
" --ecn-tcp-ece Set the IPv4 CWR bit (0 or 1)\n",
- NETFILTER_VERSION, NETFILTER_VERSION
+ IPTABLES_VERSION, IPTABLES_VERSION
);
}
@@ -157,7 +157,7 @@
struct iptables_target ecn
= { NULL,
"ECN",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_ECN_info)),
IPT_ALIGN(sizeof(struct ipt_ECN_info)),
&help,
diff --git a/extensions/libipt_FTOS.c b/extensions/libipt_FTOS.c
index 2e3771b..3ff2d5a 100644
--- a/extensions/libipt_FTOS.c
+++ b/extensions/libipt_FTOS.c
@@ -116,7 +116,7 @@
struct iptables_target ftos
= { NULL,
"FTOS",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_FTOS_info)),
IPT_ALIGN(sizeof(struct ipt_FTOS_info)),
&help,
diff --git a/extensions/libipt_IPV4OPTSSTRIP.c b/extensions/libipt_IPV4OPTSSTRIP.c
index 59cbf19..92452f9 100644
--- a/extensions/libipt_IPV4OPTSSTRIP.c
+++ b/extensions/libipt_IPV4OPTSSTRIP.c
@@ -21,7 +21,7 @@
static void help(void)
{
printf("IPV4OPTSSTRIP v%s target takes no option !! Make sure you use it in the mangle table.\n",
- NETFILTER_VERSION);
+ IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -63,7 +63,7 @@
struct iptables_target IPV4OPTSSTRIP
= { NULL,
"IPV4OPTSSTRIP",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(0),
IPT_ALIGN(0),
&help,
diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index 1445f08..66028a6 100644
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -22,7 +22,7 @@
" --log-tcp-sequence Log TCP sequence numbers.\n\n"
" --log-tcp-options Log TCP options.\n\n"
" --log-ip-options Log IP options.\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -244,7 +244,7 @@
struct iptables_target log
= { NULL,
"LOG",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_log_info)),
IPT_ALIGN(sizeof(struct ipt_log_info)),
&help,
diff --git a/extensions/libipt_MARK.c b/extensions/libipt_MARK.c
index 6d4c41e..93570d6 100644
--- a/extensions/libipt_MARK.c
+++ b/extensions/libipt_MARK.c
@@ -21,7 +21,7 @@
"MARK target v%s options:\n"
" --set-mark value Set nfmark value\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -104,7 +104,7 @@
struct iptables_target mark
= { NULL,
"MARK",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
&help,
diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index cbf5ba1..2d4ee99 100644
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -16,7 +16,7 @@
"MASQUERADE v%s options:\n"
" --to-ports <port>[-<port>]\n"
" Port (range) to map to.\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -150,7 +150,7 @@
struct iptables_target masq
= { NULL,
"MASQUERADE",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
&help,
diff --git a/extensions/libipt_MIRROR.c b/extensions/libipt_MIRROR.c
index 632e954..b5996fa 100644
--- a/extensions/libipt_MIRROR.c
+++ b/extensions/libipt_MIRROR.c
@@ -13,7 +13,7 @@
{
printf(
"MIRROR target v%s takes no options\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -45,7 +45,7 @@
struct iptables_target mirror
= { NULL,
"MIRROR",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(0),
IPT_ALIGN(0),
&help,
diff --git a/extensions/libipt_NETLINK.c b/extensions/libipt_NETLINK.c
index 7855d99..9e71990 100644
--- a/extensions/libipt_NETLINK.c
+++ b/extensions/libipt_NETLINK.c
@@ -16,7 +16,7 @@
" --nldrop Drop the packet too\n"
" --nlmark <number> Mark the packet\n"
" --nlsize <bytes> Limit packet size\n",
- NETFILTER_VERSION);
+ IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -139,7 +139,7 @@
static
struct iptables_target netlink = { NULL,
"NETLINK",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_nldata)),
IPT_ALIGN(sizeof(struct ipt_nldata)),
&help,
diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c
index 9124157..a45acb9 100644
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -25,7 +25,7 @@
printf(MODULENAME" v%s options:\n"
" --%s address[/mask]\n"
" Network address to map to.\n\n",
- NETFILTER_VERSION, opts[0].name);
+ IPTABLES_VERSION, opts[0].name);
}
static u_int32_t
@@ -183,7 +183,7 @@
struct iptables_target target_module
= { NULL,
MODULENAME,
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
&help,
diff --git a/extensions/libipt_POOL.c b/extensions/libipt_POOL.c
index 6269771..1fef3cb 100644
--- a/extensions/libipt_POOL.c
+++ b/extensions/libipt_POOL.c
@@ -28,7 +28,7 @@
" --add-dstip <pool>\n"
" --del-dstip <pool>\n"
" add/del src/dst IP from pool.\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -134,7 +134,7 @@
struct iptables_target ipt_pool_target
= { NULL,
"POOL",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_pool_info)),
IPT_ALIGN(sizeof(struct ipt_pool_info)),
&help,
diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index ca029c8..052b533 100644
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -16,7 +16,7 @@
"REDIRECT v%s options:\n"
" --to-ports <port>[-<port>]\n"
" Port (range) to map to.\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -151,7 +151,7 @@
struct iptables_target redir
= { NULL,
"REDIRECT",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
&help,
diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 2403bef..ba63a0a 100644
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -160,7 +160,7 @@
struct iptables_target reject
= { NULL,
"REJECT",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_reject_info)),
IPT_ALIGN(sizeof(struct ipt_reject_info)),
&help,
diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index 37c75d8..e9c42a8 100644
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -22,7 +22,7 @@
" --nodst\n"
" Don't use destination-ip in\n"
" source selection\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -192,7 +192,7 @@
struct iptables_target same
= { NULL,
"SAME",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_same_info)),
IPT_ALIGN(sizeof(struct ipt_same_info)),
&help,
diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c
index 9493a14..d909c2a 100644
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -25,7 +25,7 @@
" --to-source <ipaddr>[-<ipaddr>][:port-port]\n"
" Address to map source to.\n"
" (You can use this more than once)\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -228,7 +228,7 @@
struct iptables_target snat
= { NULL,
"SNAT",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
&help,
diff --git a/extensions/libipt_TCPMSS.c b/extensions/libipt_TCPMSS.c
index ebc10a7..6892b52 100644
--- a/extensions/libipt_TCPMSS.c
+++ b/extensions/libipt_TCPMSS.c
@@ -24,7 +24,7 @@
"TCPMSS target v%s mutually-exclusive options:\n"
" --set-mss value explicitly set MSS option to specified value\n"
" --clamp-mss-to-pmtu automatically clamp MSS value to (path_MTU - 40)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -117,7 +117,7 @@
struct iptables_target mss
= { NULL,
"TCPMSS",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
&help,
diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c
index bc3cf76..87c3816 100644
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -37,7 +37,7 @@
"TOS target v%s options:\n"
" --set-tos value Set Type of Service field to one of the\n"
" following numeric or descriptive values:\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
for (i = 0; i < sizeof(TOS_values)/sizeof(struct TOS_value);i++)
printf(" %s %u (0x%02x)\n",
@@ -157,7 +157,7 @@
struct iptables_target tos
= { NULL,
"TOS",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
&help,
diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c
index e4d56b3..e6f8a0c 100644
--- a/extensions/libipt_TTL.c
+++ b/extensions/libipt_TTL.c
@@ -1,7 +1,7 @@
/* Shared library add-on to iptables for the TTL target
* (C) 2000 by Harald Welte <laforge@gnumonks.org>
*
- * $Id: libipt_TTL.c,v 1.4 2002/02/25 11:25:41 laforge Exp $
+ * $Id: libipt_TTL.c,v 1.5 2002/03/14 11:35:58 laforge Exp $
*
* This program is distributed under the terms of GNU GPL
*/
@@ -27,7 +27,7 @@
" --ttl-set value Set TTL to <value>\n"
" --ttl-dec value Decrement TTL by <value>\n"
" --ttl-inc value Increment TTL by <value>\n"
-, NETFILTER_VERSION);
+, IPTABLES_VERSION);
}
static int parse(int c, char **argv, int invert, unsigned int *flags,
@@ -146,7 +146,7 @@
static
struct iptables_target TTL = { NULL,
"TTL",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_TTL_info)),
IPT_ALIGN(sizeof(struct ipt_TTL_info)),
&help,
diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index 6a9c342..ddcc59d 100644
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -43,7 +43,7 @@
" --ulog-cprange size Bytes of each packet to be passed\n"
" --ulog-qthreshold Threshold of in-kernel queue\n"
" --ulog-prefix prefix Prefix log messages with this prefix.\n\n",
- NETFILTER_VERSION);
+ IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -190,7 +190,7 @@
static
struct iptables_target ulog = { NULL,
"ULOG",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_ulog_info)),
IPT_ALIGN(sizeof(struct ipt_ulog_info)),
&help,
diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index 1b139c2..1e58398 100644
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -16,7 +16,7 @@
"AH v%s options:\n"
" --ahspi [!] spi[:spi]\n"
" match spi (range)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -172,7 +172,7 @@
struct iptables_match ah
= { NULL,
"ah",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_ah)),
IPT_ALIGN(sizeof(struct ipt_ah)),
&help,
diff --git a/extensions/libipt_connlimit.c b/extensions/libipt_connlimit.c
index a9a0f37..f0df453 100644
--- a/extensions/libipt_connlimit.c
+++ b/extensions/libipt_connlimit.c
@@ -17,7 +17,7 @@
"iplimit v%s options:\n"
"[!] --iplimit-above n match if the number of existing tcp connections is (not) above n\n"
" --iplimit-mask n group hosts using mask\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -114,7 +114,7 @@
static struct iptables_match iplimit = {
name: "iplimit",
- version: NETFILTER_VERSION,
+ version: IPTABLES_VERSION,
size: IPT_ALIGN(sizeof(struct ipt_iplimit_info)),
userspacesize: offsetof(struct ipt_iplimit_info,data),
help: help,
diff --git a/extensions/libipt_connmark.c b/extensions/libipt_connmark.c
index 005050f..6371b4e 100644
--- a/extensions/libipt_connmark.c
+++ b/extensions/libipt_connmark.c
@@ -16,7 +16,7 @@
"CONNMARK match v%s options:\n"
"[!] --mark value[/mask] Match nfmark value with optional mask\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -110,7 +110,7 @@
struct iptables_match mark
= { NULL,
"connmark",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_connmark_info)),
IPT_ALIGN(sizeof(struct ipt_connmark_info)),
&help,
diff --git a/extensions/libipt_conntrack.c b/extensions/libipt_conntrack.c
index 859d368..f190a3b 100644
--- a/extensions/libipt_conntrack.c
+++ b/extensions/libipt_conntrack.c
@@ -34,7 +34,7 @@
" Status(es) to match\n"
" [!] --ctexpire time[:time] Match remaining lifetime in seconds against\n"
" value or range of values (inclusive)\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
@@ -491,7 +491,7 @@
struct iptables_match conntrack
= { NULL,
"conntrack",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_conntrack_info)),
IPT_ALIGN(sizeof(struct ipt_conntrack_info)),
&help,
diff --git a/extensions/libipt_dscp.c b/extensions/libipt_dscp.c
index db380ce..8378815 100644
--- a/extensions/libipt_dscp.c
+++ b/extensions/libipt_dscp.c
@@ -30,7 +30,7 @@
"DSCP match v%s options\n"
"[!] --dscp value Match DSCP codepoint with numerical value\n"
" This value can be in decimal (ex: 32)\n"
-" or in hex (ex: 0x20)\n", NETFILTER_VERSION
+" or in hex (ex: 0x20)\n", IPTABLES_VERSION
);
}
@@ -128,7 +128,7 @@
struct iptables_match dscp
= { NULL,
"dscp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_dscp_info)),
IPT_ALIGN(sizeof(struct ipt_dscp_info)),
&help,
diff --git a/extensions/libipt_esp.c b/extensions/libipt_esp.c
index 8804495..531fdd1 100644
--- a/extensions/libipt_esp.c
+++ b/extensions/libipt_esp.c
@@ -16,7 +16,7 @@
"ESP v%s options:\n"
" --espspi [!] spi[:spi]\n"
" match spi (range)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -172,7 +172,7 @@
struct iptables_match esp
= { NULL,
"esp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_esp)),
IPT_ALIGN(sizeof(struct ipt_esp)),
&help,
diff --git a/extensions/libipt_helper.c b/extensions/libipt_helper.c
index 92ade93..8c59e2a 100644
--- a/extensions/libipt_helper.c
+++ b/extensions/libipt_helper.c
@@ -16,7 +16,7 @@
"helper match v%s options:\n"
"[!] --helper value Match helper value\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -90,7 +90,7 @@
struct iptables_match helper
= { NULL,
"helper",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_helper_info)),
IPT_ALIGN(sizeof(struct ipt_helper_info)),
&help,
diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index 98098fa..1cfcb5b 100644
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -96,7 +96,7 @@
"ICMP v%s options:\n"
" --icmp-type [!] typename match icmp type\n"
" (or numeric type or type/code)\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
print_icmptypes();
}
@@ -276,7 +276,7 @@
struct iptables_match icmp
= { NULL,
"icmp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_icmp)),
IPT_ALIGN(sizeof(struct ipt_icmp)),
&help,
diff --git a/extensions/libipt_ipv4options.c b/extensions/libipt_ipv4options.c
index c7bd876..2aec10b 100644
--- a/extensions/libipt_ipv4options.c
+++ b/extensions/libipt_ipv4options.c
@@ -21,7 +21,7 @@
" [!] --ts (match timestamp flag)\n\n"
" [!] --ra (match router-alert option)\n\n"
" [!] --any-opt (match any option or no option at all if used with '!')\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -303,7 +303,7 @@
struct iptables_match ipv4options_struct
= { NULL,
"ipv4options",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_ipv4options_info)),
IPT_ALIGN(sizeof(struct ipt_ipv4options_info)),
&help,
diff --git a/extensions/libipt_length.c b/extensions/libipt_length.c
index cd5a6a8..a61ce67 100644
--- a/extensions/libipt_length.c
+++ b/extensions/libipt_length.c
@@ -16,7 +16,7 @@
"length v%s options:\n"
"[!] --length length[:length] Match packet length against value or range\n"
" of values (inclusive)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
@@ -142,7 +142,7 @@
struct iptables_match length
= { NULL,
"length",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_length_info)),
IPT_ALIGN(sizeof(struct ipt_length_info)),
&help,
diff --git a/extensions/libipt_limit.c b/extensions/libipt_limit.c
index 2839547..af381fa 100644
--- a/extensions/libipt_limit.c
+++ b/extensions/libipt_limit.c
@@ -26,7 +26,7 @@
" [Packets per second unless followed by \n"
" /sec /minute /hour /day postfixes]\n"
"--limit-burst number number to match in a burst, default %u\n"
-"\n", NETFILTER_VERSION, IPT_LIMIT_BURST);
+"\n", IPTABLES_VERSION, IPT_LIMIT_BURST);
}
static struct option opts[] = {
@@ -181,7 +181,7 @@
struct iptables_match limit
= { NULL,
"limit",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_rateinfo)),
offsetof(struct ipt_rateinfo, prev),
&help,
diff --git a/extensions/libipt_mac.c b/extensions/libipt_mac.c
index 5779e8b..e50a887 100644
--- a/extensions/libipt_mac.c
+++ b/extensions/libipt_mac.c
@@ -20,7 +20,7 @@
"MAC v%s options:\n"
" --mac-source [!] XX:XX:XX:XX:XX:XX\n"
" Match source MAC address\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -127,7 +127,7 @@
struct iptables_match mac
= { NULL,
"mac",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_mac_info)),
IPT_ALIGN(sizeof(struct ipt_mac_info)),
&help,
diff --git a/extensions/libipt_mark.c b/extensions/libipt_mark.c
index 1c86fd7..82e826d 100644
--- a/extensions/libipt_mark.c
+++ b/extensions/libipt_mark.c
@@ -16,7 +16,7 @@
"MARK match v%s options:\n"
"[!] --mark value[/mask] Match nfmark value with optional mask\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -111,7 +111,7 @@
struct iptables_match mark
= { NULL,
"mark",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_mark_info)),
IPT_ALIGN(sizeof(struct ipt_mark_info)),
&help,
diff --git a/extensions/libipt_mport.c b/extensions/libipt_mport.c
index 37a1a79..df11583 100644
--- a/extensions/libipt_mport.c
+++ b/extensions/libipt_mport.c
@@ -21,7 +21,7 @@
" match destination port(s)\n"
" --ports port[,port:port,port]\n"
" match both source and destination port(s)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -288,7 +288,7 @@
struct iptables_match mport
= { NULL,
"mport",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_mport)),
IPT_ALIGN(sizeof(struct ipt_mport)),
&help,
diff --git a/extensions/libipt_multiport.c b/extensions/libipt_multiport.c
index 58cf18c..b12f2e9 100644
--- a/extensions/libipt_multiport.c
+++ b/extensions/libipt_multiport.c
@@ -21,7 +21,7 @@
" match destination port(s)\n"
" --ports port[,port,port]\n"
" match both source and destination port(s)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -246,7 +246,7 @@
struct iptables_match multiport
= { NULL,
"multiport",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_multiport)),
IPT_ALIGN(sizeof(struct ipt_multiport)),
&help,
diff --git a/extensions/libipt_nth.c b/extensions/libipt_nth.c
index d0c4a77..7b12e80 100644
--- a/extensions/libipt_nth.c
+++ b/extensions/libipt_nth.c
@@ -40,7 +40,7 @@
" there must be Nth number of --packet\n"
" rules, covering all values between 0 and\n"
" Nth-1 inclusively.\n",
-NETFILTER_VERSION, IPT_NTH_NUM_COUNTERS-1);
+IPTABLES_VERSION, IPT_NTH_NUM_COUNTERS-1);
}
static struct option opts[] = {
@@ -221,7 +221,7 @@
struct iptables_match nth
= { NULL,
"nth",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_nth_info)),
IPT_ALIGN(sizeof(struct ipt_nth_info)),
&help,
diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
index 334c336..25e0e9f 100644
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -23,7 +23,7 @@
"[!] --sid-owner sessionid Match local sid\n"
"[!] --cmd-owner name Match local command name\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
#else
printf(
"OWNER match v%s options:\n"
@@ -32,7 +32,7 @@
"[!] --pid-owner processid Match local pid\n"
"[!] --sid-owner sessionid Match local sid\n"
"\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
#endif /* IPT_OWNER_COMM */
}
@@ -239,7 +239,7 @@
struct iptables_match owner
= { NULL,
"owner",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_owner_info)),
IPT_ALIGN(sizeof(struct ipt_owner_info)),
&help,
diff --git a/extensions/libipt_pkttype.c b/extensions/libipt_pkttype.c
index a0c74b8..c60cb28 100644
--- a/extensions/libipt_pkttype.c
+++ b/extensions/libipt_pkttype.c
@@ -156,7 +156,7 @@
struct iptables_match pkttype = {
NULL,
"pkttype",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
&help,
diff --git a/extensions/libipt_pool.c b/extensions/libipt_pool.c
index 4e54f45..666599d 100644
--- a/extensions/libipt_pool.c
+++ b/extensions/libipt_pool.c
@@ -24,7 +24,7 @@
" [!] --srcpool NAME|INDEX\n"
" [!] --dstpool NAME|INDEX\n"
" Pool index (or name from %s) to match\n"
-"\n", NETFILTER_VERSION, IPPOOL_CONF);
+"\n", IPTABLES_VERSION, IPPOOL_CONF);
}
static struct option opts[] = {
@@ -126,7 +126,7 @@
struct iptables_match pool
= { NULL,
"pool",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_pool_info)),
IPT_ALIGN(sizeof(struct ipt_pool_info)),
&help,
diff --git a/extensions/libipt_psd.c b/extensions/libipt_psd.c
index de1fc76..201e909 100644
--- a/extensions/libipt_psd.c
+++ b/extensions/libipt_psd.c
@@ -34,7 +34,7 @@
" --psd-delay-threshold delay Portscan detection delay threshold\n\n"
" --psd-lo-ports-weight lo Privileged ports weight\n\n"
" --psd-hi-ports-weight hi High ports weight\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -183,7 +183,7 @@
struct iptables_match psd
= { NULL,
"psd",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_psd_info)),
IPT_ALIGN(sizeof(struct ipt_psd_info)),
&help,
diff --git a/extensions/libipt_quota.c b/extensions/libipt_quota.c
index d95b8a1..078f9e3 100644
--- a/extensions/libipt_quota.c
+++ b/extensions/libipt_quota.c
@@ -95,7 +95,7 @@
struct iptables_match quota = { NULL,
"quota",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof (struct ipt_quota_info)),
IPT_ALIGN(sizeof (struct ipt_quota_info)),
&help,
diff --git a/extensions/libipt_random.c b/extensions/libipt_random.c
index 19859eb..d195ca5 100644
--- a/extensions/libipt_random.c
+++ b/extensions/libipt_random.c
@@ -38,7 +38,7 @@
" [--average] percent The probability in percentage of the match\n"
" If ommited, a probability of 50%% percent is set.\n"
" Percentage must be within : 1 <= percent <= 99.\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -133,7 +133,7 @@
struct iptables_match rand_match
= { NULL,
"random",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_rand_info)),
IPT_ALIGN(sizeof(struct ipt_rand_info)),
&help,
diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index 77e6a3e..60a3897 100644
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -20,7 +20,7 @@
"REALM v%s options:\n"
" --realm [!] value[/mask]\n"
" Match realm\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -115,7 +115,7 @@
struct iptables_match realm
= { NULL,
"realm",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_realm_info)),
IPT_ALIGN(sizeof(struct ipt_realm_info)),
&help,
diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c
index d796d56..5b48cd3 100644
--- a/extensions/libipt_recent.c
+++ b/extensions/libipt_recent.c
@@ -30,7 +30,7 @@
" Useful if you have problems with people spoofing their source address in order\n"
" to DoS you via this module.\n"
" --name name Name of the recent list to be used. DEFAULT used if none given.\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
@@ -185,7 +185,7 @@
struct iptables_match recent
= { NULL,
"recent",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_recent_info)),
IPT_ALIGN(sizeof(struct ipt_recent_info)),
&help,
diff --git a/extensions/libipt_record_rpc.c b/extensions/libipt_record_rpc.c
index c40df40..819c8ef 100644
--- a/extensions/libipt_record_rpc.c
+++ b/extensions/libipt_record_rpc.c
@@ -9,7 +9,7 @@
{
printf(
"record_rpc v%s takes no options\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -56,7 +56,7 @@
struct iptables_match record_rpc
= { NULL,
"record_rpc",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(0),
IPT_ALIGN(0),
&help,
diff --git a/extensions/libipt_standard.c b/extensions/libipt_standard.c
index c5faf18..d79ad7c 100644
--- a/extensions/libipt_standard.c
+++ b/extensions/libipt_standard.c
@@ -13,7 +13,7 @@
{
printf(
"Standard v%s options:\n"
-"(If target is DROP, ACCEPT, RETURN or nothing)\n", NETFILTER_VERSION);
+"(If target is DROP, ACCEPT, RETURN or nothing)\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -51,7 +51,7 @@
struct iptables_target standard
= { NULL,
"standard",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(int)),
IPT_ALIGN(sizeof(int)),
&help,
diff --git a/extensions/libipt_state.c b/extensions/libipt_state.c
index 0c2b4f8..ac3c0ba 100644
--- a/extensions/libipt_state.c
+++ b/extensions/libipt_state.c
@@ -16,7 +16,7 @@
"state v%s options:\n"
" [!] --state [INVALID|ESTABLISHED|NEW|RELATED][,...]\n"
" State(s) to match\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -145,7 +145,7 @@
struct iptables_match state
= { NULL,
"state",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_state_info)),
IPT_ALIGN(sizeof(struct ipt_state_info)),
&help,
diff --git a/extensions/libipt_string.c b/extensions/libipt_string.c
index 96801b3..20613fd 100644
--- a/extensions/libipt_string.c
+++ b/extensions/libipt_string.c
@@ -24,7 +24,7 @@
printf(
"STRING match v%s options:\n"
"--string [!] string Match a string in a packet\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
fputc('\n', stdout);
}
@@ -116,7 +116,7 @@
struct iptables_match string
= { NULL,
"string",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_string_info)),
IPT_ALIGN(sizeof(struct ipt_string_info)),
&help,
diff --git a/extensions/libipt_tcp.c b/extensions/libipt_tcp.c
index 85f6d78..acf6050 100644
--- a/extensions/libipt_tcp.c
+++ b/extensions/libipt_tcp.c
@@ -24,7 +24,7 @@
" --dport ...\n"
" match destination port(s)\n"
" --tcp-option [!] number match if TCP option set\n\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -423,7 +423,7 @@
struct iptables_match tcp
= { NULL,
"tcp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_tcp)),
IPT_ALIGN(sizeof(struct ipt_tcp)),
&help,
diff --git a/extensions/libipt_tcpmss.c b/extensions/libipt_tcpmss.c
index 87353bf..a2a9c18 100644
--- a/extensions/libipt_tcpmss.c
+++ b/extensions/libipt_tcpmss.c
@@ -16,7 +16,7 @@
"tcpmss match v%s options:\n"
"[!] --mss value[:value] Match TCP MSS range.\n"
" (only valid for TCP SYN or SYN/ACK packets)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -143,7 +143,7 @@
struct iptables_match tcpmss
= { NULL,
"tcpmss",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_tcpmss_match_info)),
IPT_ALIGN(sizeof(struct ipt_tcpmss_match_info)),
&help,
diff --git a/extensions/libipt_time.c b/extensions/libipt_time.c
index 1ad5058..909ca81 100644
--- a/extensions/libipt_time.c
+++ b/extensions/libipt_time.c
@@ -21,7 +21,7 @@
" timestart value : HH:MM\n"
" timestop value : HH:MM\n"
" listofdays value: a list of days to apply -> ie. Mon,Tue,Wed,Thu,Fri. Case sensitive\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -295,7 +295,7 @@
struct iptables_match timestruct
= { NULL,
"time",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_time_info)),
IPT_ALIGN(sizeof(struct ipt_time_info)),
&help,
diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c
index 3d4616f..b0cd2e0 100644
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -32,7 +32,7 @@
"TOS match v%s options:\n"
"[!] --tos value Match Type of Service field from one of the\n"
" following numeric or descriptive values:\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
for (i = 0; i < sizeof(TOS_values)/sizeof(struct TOS_value);i++)
printf(" %s %u (0x%02x)\n",
@@ -155,7 +155,7 @@
struct iptables_match tos
= { NULL,
"tos",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_tos_info)),
IPT_ALIGN(sizeof(struct ipt_tos_info)),
&help,
diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c
index 4ef9764..799cc56 100644
--- a/extensions/libipt_ttl.c
+++ b/extensions/libipt_ttl.c
@@ -1,7 +1,7 @@
/* Shared library add-on to iptables to add TTL matching support
* (C) 2000 by Harald Welte <laforge@gnumonks.org>
*
- * $Id: libipt_ttl.c,v 1.4 2002/02/25 11:25:41 laforge Exp $
+ * $Id: libipt_ttl.c,v 1.5 2002/03/14 11:35:58 laforge Exp $
*
* This program is released under the terms of GNU GPL */
@@ -21,7 +21,7 @@
" --ttl-eq value Match time to live value\n"
" --ttl-lt value Match TTL < value\n"
" --ttl-gt value Match TTL > value\n"
-, NETFILTER_VERSION);
+, IPTABLES_VERSION);
}
static void init(struct ipt_entry_match *m, unsigned int *nfcache)
@@ -158,7 +158,7 @@
struct iptables_match ttl = {
NULL,
"ttl",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_ttl_info)),
IPT_ALIGN(sizeof(struct ipt_ttl_info)),
&help,
diff --git a/extensions/libipt_udp.c b/extensions/libipt_udp.c
index 6b6b996..622fb43 100644
--- a/extensions/libipt_udp.c
+++ b/extensions/libipt_udp.c
@@ -19,7 +19,7 @@
" --destination-port [!] port[:port]\n"
" --dport ...\n"
" match destination port(s)\n",
-NETFILTER_VERSION);
+IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -233,7 +233,7 @@
struct iptables_match udp
= { NULL,
"udp",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(sizeof(struct ipt_udp)),
IPT_ALIGN(sizeof(struct ipt_udp)),
&help,
diff --git a/extensions/libipt_unclean.c b/extensions/libipt_unclean.c
index 5e842e9..16cc0a5 100644
--- a/extensions/libipt_unclean.c
+++ b/extensions/libipt_unclean.c
@@ -10,7 +10,7 @@
{
printf(
"unclean v%s takes no options\n"
-"\n", NETFILTER_VERSION);
+"\n", IPTABLES_VERSION);
}
static struct option opts[] = {
@@ -45,7 +45,7 @@
struct iptables_match unclean
= { NULL,
"unclean",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
IPT_ALIGN(0),
IPT_ALIGN(0),
&help,
diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index d75507d..f4a8697 100644
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -6,7 +6,7 @@
* Harald Welte <laforge@gnumonks.org>
* Rusty Russell <rusty@linuxcare.com.au>
*
- * $Id: ip6tables-restore.c,v 1.20 2002/01/17 20:43:10 laforge Exp $
+ * $Id: ip6tables-restore.c,v 1.8 2002/03/03 09:44:31 laforge Exp $
*/
#include <getopt.h>
@@ -116,7 +116,7 @@
const char *modprobe = 0;
program_name = "ip6tables-restore";
- program_version = NETFILTER_VERSION;
+ program_version = IPTABLES_VERSION;
#ifdef NO_SHARED_LIBS
init_extensions();
@@ -135,7 +135,7 @@
break;
case 'h':
print_usage("ip6tables-restore",
- NETFILTER_VERSION);
+ IPTABLES_VERSION);
break;
case 'n':
noflush = 1;
diff --git a/ip6tables-save.c b/ip6tables-save.c
index 4ec1bf4..1a11bff 100644
--- a/ip6tables-save.c
+++ b/ip6tables-save.c
@@ -266,7 +266,7 @@
time_t now = time(NULL);
printf("# Generated by ip6tables-save v%s on %s",
- NETFILTER_VERSION, ctime(&now));
+ IPTABLES_VERSION, ctime(&now));
printf("*%s\n", tablename);
/* Dump out chain names first,
@@ -321,7 +321,7 @@
int c;
program_name = "ip6tables-save";
- program_version = NETFILTER_VERSION;
+ program_version = IPTABLES_VERSION;
#ifdef NO_SHARED_LIBS
init_extensions();
diff --git a/ip6tables-standalone.c b/ip6tables-standalone.c
index f0145ce..fd576f6 100644
--- a/ip6tables-standalone.c
+++ b/ip6tables-standalone.c
@@ -37,7 +37,7 @@
ip6tc_handle_t handle = NULL;
program_name = "ip6tables";
- program_version = NETFILTER_VERSION;
+ program_version = IPTABLES_VERSION;
#ifdef NO_SHARED_LIBS
init_extensions();
diff --git a/iptables-restore.c b/iptables-restore.c
index 6afd6b1..3abda11 100644
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -4,7 +4,7 @@
*
* This code is distributed under the terms of GNU GPL
*
- * $Id: iptables-restore.c,v 1.19 2001/12/06 15:06:34 marc Exp $
+ * $Id: iptables-restore.c,v 1.20 2002/01/17 20:43:10 laforge Exp $
*/
#include <getopt.h>
@@ -108,7 +108,7 @@
const char *modprobe = 0;
program_name = "iptables-restore";
- program_version = NETFILTER_VERSION;
+ program_version = IPTABLES_VERSION;
#ifdef NO_SHARED_LIBS
init_extensions();
@@ -127,7 +127,7 @@
break;
case 'h':
print_usage("iptables-restore",
- NETFILTER_VERSION);
+ IPTABLES_VERSION);
break;
case 'n':
noflush = 1;
diff --git a/iptables-save.c b/iptables-save.c
index e57cd7c..cb7da40 100644
--- a/iptables-save.c
+++ b/iptables-save.c
@@ -259,7 +259,7 @@
time_t now = time(NULL);
printf("# Generated by iptables-save v%s on %s",
- NETFILTER_VERSION, ctime(&now));
+ IPTABLES_VERSION, ctime(&now));
printf("*%s\n", tablename);
/* Dump out chain names first,
@@ -314,7 +314,7 @@
int c;
program_name = "iptables-save";
- program_version = NETFILTER_VERSION;
+ program_version = IPTABLES_VERSION;
#ifdef NO_SHARED_LIBS
init_extensions();
diff --git a/iptables-standalone.c b/iptables-standalone.c
index 791f950..1564bc9 100644
--- a/iptables-standalone.c
+++ b/iptables-standalone.c
@@ -38,7 +38,7 @@
iptc_handle_t handle = NULL;
program_name = "iptables";
- program_version = NETFILTER_VERSION;
+ program_version = IPTABLES_VERSION;
#ifdef NO_SHARED_LIBS
init_extensions();
diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c
index 395b8c7..985b9b0 100644
--- a/libiptc/libiptc.c
+++ b/libiptc/libiptc.c
@@ -1,4 +1,4 @@
-/* Library which manipulates firewall rules. Version $Revision: 1.33 $ */
+/* Library which manipulates firewall rules. Version $Revision: 1.34 $ */
/* Architecture of firewall rules is as follows:
*
@@ -307,7 +307,7 @@
CHECK(handle);
printf("libiptc v%s. %u entries, %u bytes.\n",
- NETFILTER_VERSION,
+ IPTABLES_VERSION,
handle->new_number, handle->entries.size);
printf("Table `%s'\n", handle->info.name);
printf("Hooks: pre/in/fwd/out/post = %u/%u/%u/%u/%u\n",