|
@@ -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
|
|
|
}
|
|
|
};
|