Add IPv6 support to pkttype match

4 files changed, 38 insertions, 22 deletions

diff --git a/extensions/Makefile b/extensions/Makefile
index 2c911b6..85ed1aa 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -5,9 +5,9 @@
 # header files are present in the include/linux directory of this iptables
 # package (HW)
 #
-PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac owner physdev pkttype policy realm state tos ttl unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE REDIRECT REJECT SAME SNAT TCPMSS TOS TTL TRACE ULOG
+PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac owner physdev policy realm state tos ttl unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE REDIRECT REJECT SAME SNAT TCPMSS TOS TTL TRACE ULOG
 PF6_EXT_SLIB:=connlimit connmark eui64 hl icmp6 length limit mac owner physdev policy state CONNMARK HL LOG NFQUEUE MARK TCPMSS TRACE
-PFX_EXT_SLIB:=mark multiport sctp standard tcp tcpmss udp NOTRACK
+PFX_EXT_SLIB:=mark multiport pkttype sctp standard tcp tcpmss udp NOTRACK
 
 ifeq ($(DO_SELINUX), 1)
 PF_EXT_SE_SLIB:=SECMARK CONNSECMARK
diff --git a/extensions/libipt_pkttype.c b/extensions/libxt_pkttype.c
index 568aaab..9654226 100644
--- a/extensions/libipt_pkttype.c
+++ b/extensions/libxt_pkttype.c
@@ -14,9 +14,9 @@
 #else
 #include <linux/if_ether.h>
 #endif
-#include <iptables.h>
+#include <xtables.h>
 #include <linux/if_packet.h>
-#include <linux/netfilter_ipv4/ipt_pkttype.h>
+#include <linux/netfilter/xt_pkttype.h>
 
 #define	PKTTYPE_VERSION	"0.1"
 
@@ -69,7 +69,7 @@ static struct option opts[] = {
 	{0}
 };
 
-static void parse_pkttype(const char *pkttype, struct ipt_pkttype_info *info)
+static void parse_pkttype(const char *pkttype, struct xt_pkttype_info *info)
 {
 	unsigned int	i;
 	
@@ -90,7 +90,7 @@ static int parse(int c, char **argv, int invert, unsigned int *flags,
       unsigned int *nfcache,
       struct xt_entry_match **match)
 {
-	struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)(*match)->data;
+	struct xt_pkttype_info *info = (struct xt_pkttype_info *)(*match)->data;
 	
 	switch(c)
 	{
@@ -115,7 +115,7 @@ static void final_check(unsigned int flags)
 		exit_error(PARAMETER_PROBLEM, "You must specify `--pkt-type'");
 }
 
-static void print_pkttype(struct ipt_pkttype_info *info)
+static void print_pkttype(struct xt_pkttype_info *info)
 {
 	unsigned int	i;
 	
@@ -133,7 +133,7 @@ static void print_pkttype(struct ipt_pkttype_info *info)
 
 static void print(const void *ip, const struct xt_entry_match *match, int numeric)
 {
-	struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)match->data;
+	struct xt_pkttype_info *info = (struct xt_pkttype_info *)match->data;
 	
 	printf("PKTTYPE %s= ", info->invert?"!":"");
 	print_pkttype(info);
@@ -141,18 +141,34 @@ static void print(const void *ip, const struct xt_entry_match *match, int numeri
 
 static void save(const void *ip, const struct xt_entry_match *match)
 {
-	struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)match->data;
+	struct xt_pkttype_info *info = (struct xt_pkttype_info *)match->data;
 	
 	printf("--pkt-type %s", info->invert?"! ":"");
 	print_pkttype(info);
 }
 
-static struct iptables_match pkttype = {
+static struct xtables_match pkttype = {
 	.next		= NULL,
+	.family		= AF_INET,
 	.name		= "pkttype",
 	.version	= IPTABLES_VERSION,
-	.size		= IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
-	.userspacesize	= IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
+	.size		= XT_ALIGN(sizeof(struct xt_pkttype_info)),
+	.userspacesize	= XT_ALIGN(sizeof(struct xt_pkttype_info)),
+	.help		= &help,
+	.parse		= &parse, 
+	.final_check	= &final_check, 
+	.print		= &print,
+	.save		= &save, 
+	.extra_opts	= opts
+};
+
+static struct xtables_match pkttype6 = {
+	.next		= NULL,
+	.family		= AF_INET6,
+	.name		= "pkttype",
+	.version	= IPTABLES_VERSION,
+	.size		= XT_ALIGN(sizeof(struct xt_pkttype_info)),
+	.userspacesize	= XT_ALIGN(sizeof(struct xt_pkttype_info)),
 	.help		= &help,
 	.parse		= &parse, 
 	.final_check	= &final_check, 
@@ -163,5 +179,6 @@ static struct iptables_match pkttype = {
 
 void _init(void)
 {
-	register_match(&pkttype);
+	xtables_register_match(&pkttype);
+	xtables_register_match(&pkttype6);
 }
diff --git a/include/linux/netfilter/xt_pkttype.h b/include/linux/netfilter/xt_pkttype.h
new file mode 100644
index 0000000..f265cf5
--- /dev/null
+++ b/include/linux/netfilter/xt_pkttype.h
@@ -0,0 +1,8 @@
+#ifndef _XT_PKTTYPE_H
+#define _XT_PKTTYPE_H
+
+struct xt_pkttype_info {
+	int	pkttype;
+	int	invert;
+};
+#endif /*_XT_PKTTYPE_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_pkttype.h b/include/linux/netfilter_ipv4/ipt_pkttype.h
deleted file mode 100644
index c189e94..0000000
--- a/include/linux/netfilter_ipv4/ipt_pkttype.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _IPT_PKTTYPE_H
-#define _IPT_PKTTYPE_H
-
-struct ipt_pkttype_info {
-	int	pkttype;
-	int	invert;
-};
-
-#endif /*_IPT_PKTTYPE_H*/