diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-03-09 11:01:44 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-03-09 11:02:55 +0100 |
| commit | 24773af9e099530aa6ccf4c730ad31c452284228 (patch) | |
| tree | 373d1835e6b16a4946690fa467f89eba8b0a58b7 /nest/rt-attr.c | |
| parent | 83d9920f90738e4df75b3cf57335b43c094051cd (diff) | |
| parent | e42eedb912428aa9af450b0426e53b0a7004dfb1 (diff) | |
Merge commit 'e42eedb9' into haugesund
Diffstat (limited to 'nest/rt-attr.c')
| -rw-r--r-- | nest/rt-attr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nest/rt-attr.c b/nest/rt-attr.c index 4057bf37..1bece201 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -61,7 +61,6 @@ const adata null_adata; /* adata of length 0 */ const char * const rta_src_names[RTS_MAX] = { - [RTS_DUMMY] = "", [RTS_STATIC] = "static", [RTS_INHERIT] = "inherit", [RTS_DEVICE] = "device", @@ -541,8 +540,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) @@ -1260,7 +1259,7 @@ rta_do_cow(rta *o, linpool *lp) void rta_dump(rta *a) { - static char *rts[] = { "RTS_DUMMY", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE", + static char *rts[] = { "", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE", "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP", "RTS_OSPF", "RTS_OSPF_IA", "RTS_OSPF_EXT1", "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" }; |