Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

include/net/route.h

+1 −0
Original line number Diff line number Diff line
@@ -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 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 int		ip_rt_ioctl(unsigned int cmd, void __user *arg);

extern void		ip_rt_get_source(u8 *src, struct rtable *rt);

net/ipv4/fib_frontend.c

+19 −2
Original line number Diff line number Diff line
@@ -155,7 +155,12 @@ struct net_device * ip_dev_find(__be32 addr) 
	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,6 +180,7 @@ unsigned inet_addr_type(__be32 addr) 
	if (local_table) {

		ret = RTN_UNICAST;

		if (!local_table->tb_lookup(local_table, &fl, &res)) {

			if (!dev || dev == res.fi->fib_dev)

				ret = res.type;

			fib_res_put(&res);

		}
@@ -182,6 +188,16 @@ unsigned inet_addr_type(__be32 addr) 
	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);