Commit 25239cee authored by Patrick McHardy's avatar Patrick McHardy
Browse files

net: rtnetlink: decouple rtnetlink address families from real address families 



Decouple rtnetlink address families from real address families in socket.h to
be able to add rtnetlink interfaces to code that is not a real address family
without increasing AF_MAX/NPROTO.

This will be used to add support for multicast route dumping from all tables
as the proc interface can't be extended to support anything but the main table
without breaking compatibility.

This partialy undoes the patch to introduce independant families for routing
rules and converts ipmr routing rules to a new rtnetlink family. Similar to
that patch, values up to 127 are reserved for real address families, values
above that may be used arbitrarily.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 3d0c9c4e

include/linux/fib_rules.h

+0 −8
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ 
/* try to find source address in routing lookups */

#define FIB_RULE_FIND_SADDR	0x00010000



/* fib_rules families. values up to 127 are reserved for real address

 * families, values above 128 may be used arbitrarily.

 */

#define FIB_RULES_IPV4		AF_INET

#define FIB_RULES_IPV6		AF_INET6

#define FIB_RULES_DECNET	AF_DECnet

#define FIB_RULES_IPMR		128



struct fib_rule_hdr {

	__u8		family;

	__u8		dst_len;

include/linux/rtnetlink.h

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ 
#include <linux/if_addr.h>

#include <linux/neighbour.h>



/* rtnetlink families. Values up to 127 are reserved for real address

 * families, values above 128 may be used arbitrarily.

 */

#define RTNL_FAMILY_IPMR		128

#define RTNL_FAMILY_MAX			128



/****

 *		Routing/neighbour discovery messages.

 ****/

net/core/rtnetlink.c

+7 −7
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int lockdep_rtnl_is_held(void) 
EXPORT_SYMBOL(lockdep_rtnl_is_held);

#endif /* #ifdef CONFIG_PROVE_LOCKING */



static struct rtnl_link *rtnl_msg_handlers[NPROTO];

static struct rtnl_link *rtnl_msg_handlers[RTNL_FAMILY_MAX + 1];



static inline int rtm_msgindex(int msgtype)

{
@@ -118,7 +118,7 @@ static rtnl_doit_func rtnl_get_doit(int protocol, int msgindex) 
{

	struct rtnl_link *tab;



	if (protocol < NPROTO)

	if (protocol <= RTNL_FAMILY_MAX)

		tab = rtnl_msg_handlers[protocol];

	else

		tab = NULL;
@@ -133,7 +133,7 @@ static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex) 
{

	struct rtnl_link *tab;



	if (protocol < NPROTO)

	if (protocol <= RTNL_FAMILY_MAX)

		tab = rtnl_msg_handlers[protocol];

	else

		tab = NULL;
@@ -167,7 +167,7 @@ int __rtnl_register(int protocol, int msgtype, 
	struct rtnl_link *tab;

	int msgindex;



	BUG_ON(protocol < 0 || protocol >= NPROTO);

	BUG_ON(protocol < 0 || protocol > RTNL_FAMILY_MAX);

	msgindex = rtm_msgindex(msgtype);



	tab = rtnl_msg_handlers[protocol];
@@ -219,7 +219,7 @@ int rtnl_unregister(int protocol, int msgtype) 
{

	int msgindex;



	BUG_ON(protocol < 0 || protocol >= NPROTO);

	BUG_ON(protocol < 0 || protocol > RTNL_FAMILY_MAX);

	msgindex = rtm_msgindex(msgtype);



	if (rtnl_msg_handlers[protocol] == NULL)
@@ -241,7 +241,7 @@ EXPORT_SYMBOL_GPL(rtnl_unregister); 
 */

void rtnl_unregister_all(int protocol)

{

	BUG_ON(protocol < 0 || protocol >= NPROTO);

	BUG_ON(protocol < 0 || protocol > RTNL_FAMILY_MAX);



	kfree(rtnl_msg_handlers[protocol]);

	rtnl_msg_handlers[protocol] = NULL;
@@ -1384,7 +1384,7 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) 


	if (s_idx == 0)

		s_idx = 1;

	for (idx = 1; idx < NPROTO; idx++) {

	for (idx = 1; idx <= RTNL_FAMILY_MAX; idx++) {

		int type = cb->nlh->nlmsg_type-RTM_BASE;

		if (idx < s_idx || idx == PF_PACKET)

			continue;

net/decnet/dn_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops) 
}



static const struct fib_rules_ops __net_initdata dn_fib_rules_ops_template = {

	.family		= FIB_RULES_DECNET,

	.family		= AF_DECnet,

	.rule_size	= sizeof(struct dn_fib_rule),

	.addr_size	= sizeof(u16),

	.action		= dn_fib_rule_action,

net/ipv4/fib_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void fib4_rule_flush_cache(struct fib_rules_ops *ops) 
}



static const struct fib_rules_ops __net_initdata fib4_rules_ops_template = {

	.family		= FIB_RULES_IPV4,

	.family		= AF_INET,

	.rule_size	= sizeof(struct fib4_rule),

	.addr_size	= sizeof(u32),

	.action		= fib4_rule_action,

CRA Git | Maintained and supported by SUSTech CRA and CCSE