From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laszlo Attila Toth Subject: [PATCH 1/2] Find address type on a specific or on any interface Date: Fri, 12 Oct 2007 16:07:19 +0200 Message-ID: <11921980402340-git-send-email-panther@balabit.hu> References: <470F7EB1.2080309@balabit.hu> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?utf-8?q?T=C3=B3th=20L=C3=A1szl=C3=B3=20Attila?= To: netfilter-devel@vger.kernel.org Return-path: Received: from www.balabit.hu ([212.92.18.33]:39227 "EHLO lists.balabit.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753502AbXJLOHZ (ORCPT ); Fri, 12 Oct 2007 10:07:25 -0400 Received: from balabit.hu (unknown [10.80.0.254]) by lists.balabit.hu (Postfix) with ESMTP id 75D1CC11B5 for ; Fri, 12 Oct 2007 16:07:24 +0200 (CEST) In-Reply-To: <470F7EB1.2080309@balabit.hu> Sender: netfilter-devel-owner@vger.kernel.org List-Id: netfilter-devel.vger.kernel.org =46rom: T=C3=B3th L=C3=A1szl=C3=B3 Attila Address type search can be limited to any interface by inet_addr_type_on_dev function. Signed-off-by: Laszlo Attila Toth --- include/net/route.h | 1 + net/ipv4/fib_frontend.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/net/route.h b/include/net/route.h index f7ce625..4a0e3bc 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -119,6 +119,7 @@ extern unsigned short ip_rt_frag_needed(struct iphd= r *iph, unsigned short new_mt extern void ip_rt_send_redirect(struct sk_buff *skb); =20 extern unsigned inet_addr_type(__be32 addr); +extern unsigned inet_addr_type_on_dev(__be32 addr, const struct net_d= evice *on_dev); extern void ip_rt_multicast_event(struct in_device *); extern int ip_rt_ioctl(unsigned int cmd, void __user *arg); extern void ip_rt_get_source(u8 *src, struct rtable *rt); diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index eff6bce..9d93a20 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -145,7 +145,11 @@ out: return dev; } =20 -unsigned inet_addr_type(__be32 addr) +/* + * Find address type as if only "on_dev" was present in the system. If + * on_dev is NULL then all interfaces are taken into consideration. + */ +static inline unsigned __inet_addr_type_on_dev(__be32 addr, const stru= ct net_device *on_dev) { struct flowi fl =3D { .nl_u =3D { .ip4_u =3D { .daddr =3D addr } } }= ; struct fib_result res; @@ -164,13 +168,25 @@ unsigned inet_addr_type(__be32 addr) ret =3D RTN_UNICAST; if (!ip_fib_local_table->tb_lookup(ip_fib_local_table, &fl, &res)) { - ret =3D res.type; + if ((!on_dev || on_dev =3D=3D res.fi->fib_dev)) { + ret =3D res.type; + } fib_res_put(&res); } } return ret; } =20 +unsigned inet_addr_type(__be32 addr) +{ + return __inet_addr_type_on_dev(addr, NULL); +} + +unsigned inet_addr_type_on_dev(__be32 addr, const struct net_device *o= n_dev) +{ + return __inet_addr_type_on_dev(addr, on_dev); +} + /* Given (packet source, input interface) and optional (dst, oif, tos)= : - (main) check, that source is valid i.e. not broadcast or our loca= l address. @@ -922,4 +938,5 @@ void __init ip_fib_init(void) } =20 EXPORT_SYMBOL(inet_addr_type); +EXPORT_SYMBOL(inet_addr_type_on_dev); EXPORT_SYMBOL(ip_dev_find); --=20 1.5.2.5 - To unsubscribe from this list: send the line "unsubscribe netfilter-dev= el" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html