netfilter: ipt_addrtype: rename to xt_addrtype

Followup patch will add ipv6 support.

ipt_addrtype.h is retained for compatibility reasons, but no longer used
by the kernel.

Signed-off-by: Florian Westphal <fwestphal@astaro.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 05b248aa91f155cee7440ff8034857c196c6ab26..a7ee7cf5009ed873ed5290cd3f282e0b28bcc829 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -618,3 +618,11 @@ Who:       Jan Engelhardt <jengelh@medozas.de>
 Files: net/netfilter/xt_connlimit.c
 
 ----------------------------
+
+What:  ipt_addrtype match include file
+When:  2012
+Why:   superseded by xt_addrtype
+Who:   Florian Westphal <fw@strlen.de>
+Files: include/linux/netfilter_ipv4/ipt_addrtype.h
+
+----------------------------

diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 15e83bf3dd58dc73dda0091c288cc8f0c3d696dc..a1b410c76fc3019bc7357961053601231a9e9da9 100644 (file)
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -29,6 +29,7 @@ header-y += xt_TCPMSS.h
 header-y += xt_TCPOPTSTRIP.h
 header-y += xt_TEE.h
 header-y += xt_TPROXY.h
+header-y += xt_addrtype.h
 header-y += xt_cluster.h
 header-y += xt_comment.h
 header-y += xt_connbytes.h

diff --git a/include/linux/netfilter/xt_addrtype.h b/include/linux/netfilter/xt_addrtype.h
new file mode 100644 (file)
index 0000000..b492fc8
--- /dev/null
+++ b/include/linux/netfilter/xt_addrtype.h
@@ -0,0 +1,27 @@
+#ifndef _XT_ADDRTYPE_H
+#define _XT_ADDRTYPE_H
+
+#include <linux/types.h>
+
+enum {
+       XT_ADDRTYPE_INVERT_SOURCE       = 0x0001,
+       XT_ADDRTYPE_INVERT_DEST         = 0x0002,
+       XT_ADDRTYPE_LIMIT_IFACE_IN      = 0x0004,
+       XT_ADDRTYPE_LIMIT_IFACE_OUT     = 0x0008,
+};
+
+struct xt_addrtype_info_v1 {
+       __u16   source;         /* source-type mask */
+       __u16   dest;           /* dest-type mask */
+       __u32   flags;
+};
+
+/* revision 0 */
+struct xt_addrtype_info {
+       __u16   source;         /* source-type mask */
+       __u16   dest;           /* dest-type mask */
+       __u32   invert_source;
+       __u32   invert_dest;
+};
+
+#endif

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index f926a310075d16aa4d286f76018d072dbdffe7a5..1dfc18a03fd4219fe9dd419011877d0a7ce3dfa7 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -64,16 +64,6 @@ config IP_NF_IPTABLES
 if IP_NF_IPTABLES
 
 # The matches.
-config IP_NF_MATCH_ADDRTYPE
-       tristate '"addrtype" address type match support'
-       depends on NETFILTER_ADVANCED
-       help
-         This option allows you to match what routing thinks of an address,
-         eg. UNICAST, LOCAL, BROADCAST, ...
-
-         If you want to compile it as a module, say M here and read
-         <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
-
 config IP_NF_MATCH_AH
        tristate '"ah" match support'
        depends on NETFILTER_ADVANCED

diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 19eb59d010376693fff50c56cdc00e9e00726a71..dca2082ec68339cc5fce2af9b6fbbe296298c11c 100644 (file)
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -48,7 +48,6 @@ obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o
 obj-$(CONFIG_IP_NF_SECURITY) += iptable_security.o
 
 # matches
-obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
 obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
 obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
 

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 82a6e0d80f058dcbdc25863c97fb2d878836024b..32bff6d86cb24911c6f7206c31668dc4c8e0c36e 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -649,6 +649,16 @@ config NETFILTER_XT_TARGET_TCPOPTSTRIP
 
 comment "Xtables matches"
 
+config NETFILTER_XT_MATCH_ADDRTYPE
+       tristate '"addrtype" address type match support'
+       depends on NETFILTER_ADVANCED
+       ---help---
+         This option allows you to match what routing thinks of an address,
+         eg. UNICAST, LOCAL, BROADCAST, ...
+
+         If you want to compile it as a module, say M here and read
+         <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
+
 config NETFILTER_XT_MATCH_CLUSTER
        tristate '"cluster" match support'
        depends on NF_CONNTRACK

diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index d57a890eaee51d036cc59efa16dc7621704501e7..1a02853df8638191106e8f9dece4b574399d441e 100644 (file)
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -70,6 +70,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_IDLETIMER) += xt_IDLETIMER.o
 
 # matches
+obj-$(CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) += xt_addrtype.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_CLUSTER) += xt_cluster.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_CONNBYTES) += xt_connbytes.o

diff --git a/net/ipv4/netfilter/ipt_addrtype.c b/net/netfilter/xt_addrtype.c
similarity index 79%
rename from net/ipv4/netfilter/ipt_addrtype.c
rename to net/netfilter/xt_addrtype.c
index db8bff0fb86dc711f1d422ba188a41f85a33d32f..e89c0b84583c51d8612da0b8bc6fd908b72f47ed 100644 (file)
--- a/net/ipv4/netfilter/ipt_addrtype.c
+++ b/net/netfilter/xt_addrtype.c
@@ -16,12 +16,13 @@
 #include <linux/ip.h>
 #include <net/route.h>
 
-#include <linux/netfilter_ipv4/ipt_addrtype.h>
+#include <linux/netfilter/xt_addrtype.h>
 #include <linux/netfilter/x_tables.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
-MODULE_DESCRIPTION("Xtables: address type match for IPv4");
+MODULE_DESCRIPTION("Xtables: address type match");
+MODULE_ALIAS("ipt_addrtype");
 
 static inline bool match_type(struct net *net, const struct net_device *dev,
                              __be32 addr, u_int16_t mask)
@@ -33,7 +34,7 @@ static bool
 addrtype_mt_v0(const struct sk_buff *skb, struct xt_action_param *par)
 {
        struct net *net = dev_net(par->in ? par->in : par->out);
-       const struct ipt_addrtype_info *info = par->matchinfo;
+       const struct xt_addrtype_info *info = par->matchinfo;
        const struct iphdr *iph = ip_hdr(skb);
        bool ret = true;
 
@@ -51,31 +52,31 @@ static bool
 addrtype_mt_v1(const struct sk_buff *skb, struct xt_action_param *par)
 {
        struct net *net = dev_net(par->in ? par->in : par->out);
-       const struct ipt_addrtype_info_v1 *info = par->matchinfo;
+       const struct xt_addrtype_info_v1 *info = par->matchinfo;
        const struct iphdr *iph = ip_hdr(skb);
        const struct net_device *dev = NULL;
        bool ret = true;
 
-       if (info->flags & IPT_ADDRTYPE_LIMIT_IFACE_IN)
+       if (info->flags & XT_ADDRTYPE_LIMIT_IFACE_IN)
                dev = par->in;
-       else if (info->flags & IPT_ADDRTYPE_LIMIT_IFACE_OUT)
+       else if (info->flags & XT_ADDRTYPE_LIMIT_IFACE_OUT)
                dev = par->out;
 
        if (info->source)
                ret &= match_type(net, dev, iph->saddr, info->source) ^
-                      (info->flags & IPT_ADDRTYPE_INVERT_SOURCE);
+                      (info->flags & XT_ADDRTYPE_INVERT_SOURCE);
        if (ret && info->dest)
                ret &= match_type(net, dev, iph->daddr, info->dest) ^
-                      !!(info->flags & IPT_ADDRTYPE_INVERT_DEST);
+                      !!(info->flags & XT_ADDRTYPE_INVERT_DEST);
        return ret;
 }
 
 static int addrtype_mt_checkentry_v1(const struct xt_mtchk_param *par)
 {
-       struct ipt_addrtype_info_v1 *info = par->matchinfo;
+       struct xt_addrtype_info_v1 *info = par->matchinfo;
 
-       if (info->flags & IPT_ADDRTYPE_LIMIT_IFACE_IN &&
-           info->flags & IPT_ADDRTYPE_LIMIT_IFACE_OUT) {
+       if (info->flags & XT_ADDRTYPE_LIMIT_IFACE_IN &&
+           info->flags & XT_ADDRTYPE_LIMIT_IFACE_OUT) {
                pr_info("both incoming and outgoing "
                        "interface limitation cannot be selected\n");
                return -EINVAL;
@@ -83,7 +84,7 @@ static int addrtype_mt_checkentry_v1(const struct xt_mtchk_param *par)
 
        if (par->hook_mask & ((1 << NF_INET_PRE_ROUTING) |
            (1 << NF_INET_LOCAL_IN)) &&
-           info->flags & IPT_ADDRTYPE_LIMIT_IFACE_OUT) {
+           info->flags & XT_ADDRTYPE_LIMIT_IFACE_OUT) {
                pr_info("output interface limitation "
                        "not valid in PREROUTING and INPUT\n");
                return -EINVAL;
@@ -91,7 +92,7 @@ static int addrtype_mt_checkentry_v1(const struct xt_mtchk_param *par)
 
        if (par->hook_mask & ((1 << NF_INET_POST_ROUTING) |
            (1 << NF_INET_LOCAL_OUT)) &&
-           info->flags & IPT_ADDRTYPE_LIMIT_IFACE_IN) {
+           info->flags & XT_ADDRTYPE_LIMIT_IFACE_IN) {
                pr_info("input interface limitation "
                        "not valid in POSTROUTING and OUTPUT\n");
                return -EINVAL;
@@ -105,7 +106,7 @@ static struct xt_match addrtype_mt_reg[] __read_mostly = {
                .name           = "addrtype",
                .family         = NFPROTO_IPV4,
                .match          = addrtype_mt_v0,
-               .matchsize      = sizeof(struct ipt_addrtype_info),
+               .matchsize      = sizeof(struct xt_addrtype_info),
                .me             = THIS_MODULE
        },
        {
@@ -114,7 +115,7 @@ static struct xt_match addrtype_mt_reg[] __read_mostly = {
                .revision       = 1,
                .match          = addrtype_mt_v1,
                .checkentry     = addrtype_mt_checkentry_v1,
-               .matchsize      = sizeof(struct ipt_addrtype_info_v1),
+               .matchsize      = sizeof(struct xt_addrtype_info_v1),
                .me             = THIS_MODULE
        }
 };