diff options
| author | Maria Matejka <mq@ucw.cz> | 2019-03-18 12:54:40 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2019-03-18 12:54:40 +0100 |
| commit | 8d65add626b34256879a3e83855af3c0fa8ce4e7 (patch) | |
| tree | dafa110c47bc328f4006d4298fd641e8210381b4 /nest/rt-show.c | |
| parent | 2f02c25e36f3946019c24dafe9b894a9e195350d (diff) | |
| parent | 5d511948cddee415c2f0f1103bda0468a193f2d6 (diff) | |
Merge branch 'master' into HEAD
Diffstat (limited to 'nest/rt-show.c')
| -rw-r--r-- | nest/rt-show.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nest/rt-show.c b/nest/rt-show.c index c7bcdf2f..002a6039 100644 --- a/nest/rt-show.c +++ b/nest/rt-show.c @@ -45,10 +45,11 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d) else from[0] = 0; - get_route_info = a->src->proto->proto->get_route_info; /* Need to normalize the extended attributes */ - if ((get_route_info || d->verbose) && !rta_is_cached(a)) + if (d->verbose && !rta_is_cached(a) && a->eattrs) ea_normalize(a->eattrs); + + get_route_info = a->src->proto->proto->get_route_info; if (get_route_info) get_route_info(e, info); else @@ -114,7 +115,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) continue; ee = e; - rte_make_tmp_attrs(&e, c->show_pool); + rte_make_tmp_attrs(&e, c->show_pool, NULL); /* Export channel is down, do not try to export routes to it */ if (ec && (ec->export_state == ES_DOWN)) |