summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLaszlo Attila Toth <panther@balabit.hu>2007-12-04 23:28:46 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:55:56 -0800
commit0553811612a6178365f3b062c30234913b218a96 (patch)
tree81e4fa4f6d0a8beeb7ace09e7e4cb2375c9bfea1 /net
parent0265ab44bacc1a1e0e3f5873d8ca2d5a29e33db2 (diff)
downloadop-kernel-dev-0553811612a6178365f3b062c30234913b218a96.zip
op-kernel-dev-0553811612a6178365f3b062c30234913b218a96.tar.gz
[IPV4]: Add inet_dev_addr_type()
Address type search can be limited to an interface by inet_dev_addr_type function. Signed-off-by: Laszlo Attila Toth <panther@balabit.hu> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/fib_frontend.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index e02aba5..d90b42f 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -155,7 +155,12 @@ out:
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 fib_result res;
@@ -175,13 +180,24 @@ unsigned inet_addr_type(__be32 addr)
if (local_table) {
ret = RTN_UNICAST;
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);
}
}
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):
- (main) check, that source is valid i.e. not broadcast or our local
address.
@@ -940,4 +956,5 @@ void __init ip_fib_init(void)
}
EXPORT_SYMBOL(inet_addr_type);
+EXPORT_SYMBOL(inet_dev_addr_type);
EXPORT_SYMBOL(ip_dev_find);
OpenPOWER on IntegriCloud