Commit b63bbc50 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[NEIGH]: Move netlink neighbour table bits to linux/neighbour.h 



rtnetlink_rcv_msg() is not longer required to parse attributes
for the neighbour tables layer, remove dependency on obsolete and
buggy rta_buf.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca860fb3

include/linux/neighbour.h

+94 −0
Original line number Diff line number Diff line
@@ -62,4 +62,98 @@ struct nda_cacheinfo 
	__u32		ndm_refcnt;

};



/*****************************************************************

 *		Neighbour tables specific messages.

 *

 * To retrieve the neighbour tables send RTM_GETNEIGHTBL with the

 * NLM_F_DUMP flag set. Every neighbour table configuration is

 * spread over multiple messages to avoid running into message

 * size limits on systems with many interfaces. The first message

 * in the sequence transports all not device specific data such as

 * statistics, configuration, and the default parameter set.

 * This message is followed by 0..n messages carrying device

 * specific parameter sets.

 * Although the ordering should be sufficient, NDTA_NAME can be

 * used to identify sequences. The initial message can be identified

 * by checking for NDTA_CONFIG. The device specific messages do

 * not contain this TLV but have NDTPA_IFINDEX set to the

 * corresponding interface index.

 *

 * To change neighbour table attributes, send RTM_SETNEIGHTBL

 * with NDTA_NAME set. Changeable attribute include NDTA_THRESH[1-3],

 * NDTA_GC_INTERVAL, and all TLVs in NDTA_PARMS unless marked

 * otherwise. Device specific parameter sets can be changed by

 * setting NDTPA_IFINDEX to the interface index of the corresponding

 * device.

 ****/



struct ndt_stats

{

	__u64		ndts_allocs;

	__u64		ndts_destroys;

	__u64		ndts_hash_grows;

	__u64		ndts_res_failed;

	__u64		ndts_lookups;

	__u64		ndts_hits;

	__u64		ndts_rcv_probes_mcast;

	__u64		ndts_rcv_probes_ucast;

	__u64		ndts_periodic_gc_runs;

	__u64		ndts_forced_gc_runs;

};



enum {

	NDTPA_UNSPEC,

	NDTPA_IFINDEX,			/* u32, unchangeable */

	NDTPA_REFCNT,			/* u32, read-only */

	NDTPA_REACHABLE_TIME,		/* u64, read-only, msecs */

	NDTPA_BASE_REACHABLE_TIME,	/* u64, msecs */

	NDTPA_RETRANS_TIME,		/* u64, msecs */

	NDTPA_GC_STALETIME,		/* u64, msecs */

	NDTPA_DELAY_PROBE_TIME,		/* u64, msecs */

	NDTPA_QUEUE_LEN,		/* u32 */

	NDTPA_APP_PROBES,		/* u32 */

	NDTPA_UCAST_PROBES,		/* u32 */

	NDTPA_MCAST_PROBES,		/* u32 */

	NDTPA_ANYCAST_DELAY,		/* u64, msecs */

	NDTPA_PROXY_DELAY,		/* u64, msecs */

	NDTPA_PROXY_QLEN,		/* u32 */

	NDTPA_LOCKTIME,			/* u64, msecs */

	__NDTPA_MAX

};

#define NDTPA_MAX (__NDTPA_MAX - 1)



struct ndtmsg

{

	__u8		ndtm_family;

	__u8		ndtm_pad1;

	__u16		ndtm_pad2;

};



struct ndt_config

{

	__u16		ndtc_key_len;

	__u16		ndtc_entry_size;

	__u32		ndtc_entries;

	__u32		ndtc_last_flush;	/* delta to now in msecs */

	__u32		ndtc_last_rand;		/* delta to now in msecs */

	__u32		ndtc_hash_rnd;

	__u32		ndtc_hash_mask;

	__u32		ndtc_hash_chain_gc;

	__u32		ndtc_proxy_qlen;

};



enum {

	NDTA_UNSPEC,

	NDTA_NAME,			/* char *, unchangeable */

	NDTA_THRESH1,			/* u32 */

	NDTA_THRESH2,			/* u32 */

	NDTA_THRESH3,			/* u32 */

	NDTA_CONFIG,			/* struct ndt_config, read-only */

	NDTA_PARMS,			/* nested TLV NDTPA_* */

	NDTA_STATS,			/* struct ndt_stats, read-only */

	NDTA_GC_INTERVAL,		/* u64, msecs */

	__NDTA_MAX

};

#define NDTA_MAX (__NDTA_MAX - 1)



#endif

include/linux/rtnetlink.h

+0 −101
Original line number Diff line number Diff line
@@ -384,107 +384,6 @@ struct rta_session 
	} u;

};







/*****************************************************************

 *		Neighbour tables specific messages.

 *

 * To retrieve the neighbour tables send RTM_GETNEIGHTBL with the

 * NLM_F_DUMP flag set. Every neighbour table configuration is

 * spread over multiple messages to avoid running into message

 * size limits on systems with many interfaces. The first message

 * in the sequence transports all not device specific data such as

 * statistics, configuration, and the default parameter set.

 * This message is followed by 0..n messages carrying device

 * specific parameter sets.

 * Although the ordering should be sufficient, NDTA_NAME can be

 * used to identify sequences. The initial message can be identified

 * by checking for NDTA_CONFIG. The device specific messages do

 * not contain this TLV but have NDTPA_IFINDEX set to the

 * corresponding interface index.

 *

 * To change neighbour table attributes, send RTM_SETNEIGHTBL

 * with NDTA_NAME set. Changeable attribute include NDTA_THRESH[1-3],

 * NDTA_GC_INTERVAL, and all TLVs in NDTA_PARMS unless marked

 * otherwise. Device specific parameter sets can be changed by

 * setting NDTPA_IFINDEX to the interface index of the corresponding

 * device.

 ****/



struct ndt_stats

{

	__u64		ndts_allocs;

	__u64		ndts_destroys;

	__u64		ndts_hash_grows;

	__u64		ndts_res_failed;

	__u64		ndts_lookups;

	__u64		ndts_hits;

	__u64		ndts_rcv_probes_mcast;

	__u64		ndts_rcv_probes_ucast;

	__u64		ndts_periodic_gc_runs;

	__u64		ndts_forced_gc_runs;

};



enum {

	NDTPA_UNSPEC,

	NDTPA_IFINDEX,			/* u32, unchangeable */

	NDTPA_REFCNT,			/* u32, read-only */

	NDTPA_REACHABLE_TIME,		/* u64, read-only, msecs */

	NDTPA_BASE_REACHABLE_TIME,	/* u64, msecs */

	NDTPA_RETRANS_TIME,		/* u64, msecs */

	NDTPA_GC_STALETIME,		/* u64, msecs */

	NDTPA_DELAY_PROBE_TIME,		/* u64, msecs */

	NDTPA_QUEUE_LEN,		/* u32 */

	NDTPA_APP_PROBES,		/* u32 */

	NDTPA_UCAST_PROBES,		/* u32 */

	NDTPA_MCAST_PROBES,		/* u32 */

	NDTPA_ANYCAST_DELAY,		/* u64, msecs */

	NDTPA_PROXY_DELAY,		/* u64, msecs */

	NDTPA_PROXY_QLEN,		/* u32 */

	NDTPA_LOCKTIME,			/* u64, msecs */

	__NDTPA_MAX

};

#define NDTPA_MAX (__NDTPA_MAX - 1)



struct ndtmsg

{

	__u8		ndtm_family;

	__u8		ndtm_pad1;

	__u16		ndtm_pad2;

};



struct ndt_config

{

	__u16		ndtc_key_len;

	__u16		ndtc_entry_size;

	__u32		ndtc_entries;

	__u32		ndtc_last_flush;	/* delta to now in msecs */

	__u32		ndtc_last_rand;		/* delta to now in msecs */

	__u32		ndtc_hash_rnd;

	__u32		ndtc_hash_mask;

	__u32		ndtc_hash_chain_gc;

	__u32		ndtc_proxy_qlen;

};



enum {

	NDTA_UNSPEC,

	NDTA_NAME,			/* char *, unchangeable */

	NDTA_THRESH1,			/* u32 */

	NDTA_THRESH2,			/* u32 */

	NDTA_THRESH3,			/* u32 */

	NDTA_CONFIG,			/* struct ndt_config, read-only */

	NDTA_PARMS,			/* nested TLV NDTPA_* */

	NDTA_STATS,			/* struct ndt_stats, read-only */

	NDTA_GC_INTERVAL,		/* u64, msecs */

	__NDTA_MAX

};

#define NDTA_MAX (__NDTA_MAX - 1)



#define NDTA_RTA(r) ((struct rtattr*)(((char*)(r)) + \

		     NLMSG_ALIGN(sizeof(struct ndtmsg))))

#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg))





/****

 *		General form of address family dependent message.

 ****/

net/core/rtnetlink.c

+0 −2
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static const int rtm_min[RTM_NR_FAMILIES] = 
	[RTM_FAM(RTM_NEWPREFIX)]    = NLMSG_LENGTH(sizeof(struct rtgenmsg)),

	[RTM_FAM(RTM_GETMULTICAST)] = NLMSG_LENGTH(sizeof(struct rtgenmsg)),

	[RTM_FAM(RTM_GETANYCAST)]   = NLMSG_LENGTH(sizeof(struct rtgenmsg)),

	[RTM_FAM(RTM_NEWNEIGHTBL)]  = NLMSG_LENGTH(sizeof(struct ndtmsg)),

};



static const int rta_max[RTM_NR_FAMILIES] =
@@ -125,7 +124,6 @@ static const int rta_max[RTM_NR_FAMILIES] = 
	[RTM_FAM(RTM_NEWTCLASS)]    = TCA_MAX,

	[RTM_FAM(RTM_NEWTFILTER)]   = TCA_MAX,

	[RTM_FAM(RTM_NEWACTION)]    = TCAA_MAX,

	[RTM_FAM(RTM_NEWNEIGHTBL)]  = NDTA_MAX,

};



void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data)