Commit 05538116 authored by Laszlo Attila Toth's avatar Laszlo Attila Toth Committed by David S. Miller

[IPV4]: Add inet_dev_addr_type()

Address type search can be limited to an interface by
inet_dev_addr_type function.
Signed-off-by: default avatarLaszlo Attila Toth <panther@balabit.hu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0265ab44
...@@ -118,6 +118,7 @@ extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mt ...@@ -118,6 +118,7 @@ extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mt
extern void ip_rt_send_redirect(struct sk_buff *skb); extern void ip_rt_send_redirect(struct sk_buff *skb);
extern unsigned inet_addr_type(__be32 addr); extern unsigned inet_addr_type(__be32 addr);
extern unsigned inet_dev_addr_type(const struct net_device *dev, __be32 addr);
extern void ip_rt_multicast_event(struct in_device *); extern void ip_rt_multicast_event(struct in_device *);
extern int ip_rt_ioctl(unsigned int cmd, void __user *arg); extern int ip_rt_ioctl(unsigned int cmd, void __user *arg);
extern void ip_rt_get_source(u8 *src, struct rtable *rt); extern void ip_rt_get_source(u8 *src, struct rtable *rt);
......
...@@ -155,7 +155,12 @@ struct net_device * ip_dev_find(__be32 addr) ...@@ -155,7 +155,12 @@ struct net_device * ip_dev_find(__be32 addr)
return dev; return dev;
} }
unsigned inet_addr_type(__be32 addr) /*
* Find address type as if only "dev" was present in the system. If
* on_dev is NULL then all interfaces are taken into consideration.
*/
static inline unsigned __inet_dev_addr_type(const struct net_device *dev,
__be32 addr)
{ {
struct flowi fl = { .nl_u = { .ip4_u = { .daddr = addr } } }; struct flowi fl = { .nl_u = { .ip4_u = { .daddr = addr } } };
struct fib_result res; struct fib_result res;
...@@ -175,13 +180,24 @@ unsigned inet_addr_type(__be32 addr) ...@@ -175,13 +180,24 @@ unsigned inet_addr_type(__be32 addr)
if (local_table) { if (local_table) {
ret = RTN_UNICAST; ret = RTN_UNICAST;
if (!local_table->tb_lookup(local_table, &fl, &res)) { if (!local_table->tb_lookup(local_table, &fl, &res)) {
ret = res.type; if (!dev || dev == res.fi->fib_dev)
ret = res.type;
fib_res_put(&res); fib_res_put(&res);
} }
} }
return ret; return ret;
} }
unsigned int inet_addr_type(__be32 addr)
{
return __inet_dev_addr_type(NULL, addr);
}
unsigned int inet_dev_addr_type(const struct net_device *dev, __be32 addr)
{
return __inet_dev_addr_type(dev, addr);
}
/* Given (packet source, input interface) and optional (dst, oif, tos): /* Given (packet source, input interface) and optional (dst, oif, tos):
- (main) check, that source is valid i.e. not broadcast or our local - (main) check, that source is valid i.e. not broadcast or our local
address. address.
...@@ -940,4 +956,5 @@ void __init ip_fib_init(void) ...@@ -940,4 +956,5 @@ void __init ip_fib_init(void)
} }
EXPORT_SYMBOL(inet_addr_type); EXPORT_SYMBOL(inet_addr_type);
EXPORT_SYMBOL(inet_dev_addr_type);
EXPORT_SYMBOL(ip_dev_find); EXPORT_SYMBOL(ip_dev_find);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment