Allow a generic pointer in route extended attributes (7c3a91cf) · Commits · 戴 / Bird

nest/route.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -512,7 +512,7 @@ typedef struct eattr {
		byte flags; /* Protocol-dependent flags */
		byte type; /* Attribute type and several flags (EAF_...) */
		union {
		u32 data;
		uintptr_t data;
		const struct adata ptr; / Attribute data elsewhere */
		} u;
		} eattr;
		@@ -544,6 +544,7 @@ const char *ea_custom_name(uint ea);
		#define EAF_TYPE_AS_PATH 0x06 /* BGP AS path (encoding per RFC 1771:4.3) */
		#define EAF_TYPE_BITFIELD 0x09 /* 32-bit embedded bitfield */
		#define EAF_TYPE_INT_SET 0x0a /* Set of u32's (e.g., a community list) */
		#define EAF_TYPE_PTR 0x0d /* Pointer to an object */
		#define EAF_TYPE_EC_SET 0x0e /* Set of pairs of u32's - ext. community list */
		#define EAF_TYPE_LC_SET 0x12 /* Set of triplets of u32's - large community list */
		#define EAF_TYPE_UNDEF 0x1f /* `force undefined' entry */
		@@ -598,7 +599,7 @@ struct ea_walk_state {

		eattr ea_find(ea_list , unsigned ea);
		eattr ea_walk(struct ea_walk_state s, uint id, uint max);
		int ea_get_int(ea_list *, unsigned ea, int def);
		uintptr_t ea_get_int(ea_list *, unsigned ea, uintptr_t def);
		void ea_dump(ea_list *);
		void ea_sort(ea_list ); / Sort entries in all sub-lists */
		unsigned ea_scan(ea_list ); / How many bytes do we need for merged ea_list */

+2 −2

Original line number	Diff line number	Diff line
		@@ -541,8 +541,8 @@ ea_walk(struct ea_walk_state *s, uint id, uint max)
		* by calling ea_find() to find the attribute, extracting its value or returning
		* a provided default if no such attribute is present.
		*/
		int
		ea_get_int(ea_list *e, unsigned id, int def)
		uintptr_t
		ea_get_int(ea_list *e, unsigned id, uintptr_t def)
		{
		eattr *a = ea_find(e, id);
		if (!a)

+2 −2

Original line number	Diff line number	Diff line
		@@ -2811,9 +2811,9 @@ if_local_addr(ip_addr a, struct iface *i)
		u32
		rt_get_igp_metric(rte *rt)
		{
		eattr *ea = ea_find(rt->attrs->eattrs, EA_GEN_IGP_METRIC);
		eattr *ea;

		if (ea)
		if (ea = ea_find(rt->attrs->eattrs, EA_GEN_IGP_METRIC))
		return ea->u.data;

		rta *a = rt->attrs;