netfilter: netns-aware ipt_addrtype
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
5f7340eff8
commit
d4ec52bae7
|
@ -23,24 +23,25 @@ MODULE_LICENSE("GPL");
|
||||||
MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
|
MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
|
||||||
MODULE_DESCRIPTION("Xtables: address type match for IPv4");
|
MODULE_DESCRIPTION("Xtables: address type match for IPv4");
|
||||||
|
|
||||||
static inline bool match_type(const struct net_device *dev, __be32 addr,
|
static inline bool match_type(struct net *net, const struct net_device *dev,
|
||||||
u_int16_t mask)
|
__be32 addr, u_int16_t mask)
|
||||||
{
|
{
|
||||||
return !!(mask & (1 << inet_dev_addr_type(&init_net, dev, addr)));
|
return !!(mask & (1 << inet_dev_addr_type(net, dev, addr)));
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
addrtype_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
|
addrtype_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
|
||||||
{
|
{
|
||||||
|
struct net *net = dev_net(par->in ? par->in : par->out);
|
||||||
const struct ipt_addrtype_info *info = par->matchinfo;
|
const struct ipt_addrtype_info *info = par->matchinfo;
|
||||||
const struct iphdr *iph = ip_hdr(skb);
|
const struct iphdr *iph = ip_hdr(skb);
|
||||||
bool ret = true;
|
bool ret = true;
|
||||||
|
|
||||||
if (info->source)
|
if (info->source)
|
||||||
ret &= match_type(NULL, iph->saddr, info->source) ^
|
ret &= match_type(net, NULL, iph->saddr, info->source) ^
|
||||||
info->invert_source;
|
info->invert_source;
|
||||||
if (info->dest)
|
if (info->dest)
|
||||||
ret &= match_type(NULL, iph->daddr, info->dest) ^
|
ret &= match_type(net, NULL, iph->daddr, info->dest) ^
|
||||||
info->invert_dest;
|
info->invert_dest;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -49,6 +50,7 @@ addrtype_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
|
||||||
static bool
|
static bool
|
||||||
addrtype_mt_v1(const struct sk_buff *skb, const struct xt_match_param *par)
|
addrtype_mt_v1(const struct sk_buff *skb, const struct xt_match_param *par)
|
||||||
{
|
{
|
||||||
|
struct net *net = dev_net(par->in ? par->in : par->out);
|
||||||
const struct ipt_addrtype_info_v1 *info = par->matchinfo;
|
const struct ipt_addrtype_info_v1 *info = par->matchinfo;
|
||||||
const struct iphdr *iph = ip_hdr(skb);
|
const struct iphdr *iph = ip_hdr(skb);
|
||||||
const struct net_device *dev = NULL;
|
const struct net_device *dev = NULL;
|
||||||
|
@ -60,10 +62,10 @@ addrtype_mt_v1(const struct sk_buff *skb, const struct xt_match_param *par)
|
||||||
dev = par->out;
|
dev = par->out;
|
||||||
|
|
||||||
if (info->source)
|
if (info->source)
|
||||||
ret &= match_type(dev, iph->saddr, info->source) ^
|
ret &= match_type(net, dev, iph->saddr, info->source) ^
|
||||||
(info->flags & IPT_ADDRTYPE_INVERT_SOURCE);
|
(info->flags & IPT_ADDRTYPE_INVERT_SOURCE);
|
||||||
if (ret && info->dest)
|
if (ret && info->dest)
|
||||||
ret &= match_type(dev, iph->daddr, info->dest) ^
|
ret &= match_type(net, dev, iph->daddr, info->dest) ^
|
||||||
!!(info->flags & IPT_ADDRTYPE_INVERT_DEST);
|
!!(info->flags & IPT_ADDRTYPE_INVERT_DEST);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue