diff options
| author | Maria Matejka <mq@ucw.cz> | 2021-09-14 19:53:03 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2021-10-13 19:09:04 +0200 |
| commit | 6e13df70fdaeb0f08ae5171f62240402501783ea (patch) | |
| tree | 21de274fe3c23110cf3becd4a91e2522f2ce7cad /nest | |
| parent | d471d5fc7ce587ed836ca7fa10a79331bc181d45 (diff) | |
Extended route attributes may include also pointers
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/route.h | 7 | ||||
| -rw-r--r-- | nest/rt-attr.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nest/route.h b/nest/route.h index 1dea058f..67df1ce0 100644 --- a/nest/route.h +++ b/nest/route.h @@ -501,8 +501,8 @@ typedef struct eattr { byte flags; /* Protocol-dependent flags */ byte type; /* Attribute type and several flags (EAF_...) */ union { - u32 data; - const struct adata *ptr; /* Attribute data elsewhere */ + uintptr_t data; + const struct adata *ptr; /* Attribute data elsewhere */ } u; } eattr; @@ -533,6 +533,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 */ @@ -587,7 +588,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 */ diff --git a/nest/rt-attr.c b/nest/rt-attr.c index 4057bf37..00744bea 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -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) |