diff options
| author | Ondrej Filip <feela@network.cz> | 2018-02-27 06:08:03 +0100 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2018-02-27 06:08:03 +0100 |
| commit | 44062812600bd29f8edf30ebc871ff218069c5a2 (patch) | |
| tree | 656c5cfcfe340cc8a12e7a88d930cfe839f7b97e /nest/rt-show.c | |
| parent | 6f46465af1b3d21ca67e3b4379640c008fc9d1a1 (diff) | |
| parent | 1561ee799cfe79d208ce9588e487da4b62a88dad (diff) | |
Merge branch 'int-new' of ssh://gitlab.labs.nic.cz/labs/bird into int-new
Diffstat (limited to 'nest/rt-show.c')
| -rw-r--r-- | nest/rt-show.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nest/rt-show.c b/nest/rt-show.c index 41a141a2..1f1b73d2 100644 --- a/nest/rt-show.c +++ b/nest/rt-show.c @@ -74,7 +74,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm char weight[16] = ""; if (nh->labels) - { + { lsp += bsprintf(lsp, " mpls %d", nh->label[0]); for (int i=1;i<nh->labels; i++) lsp += bsprintf(lsp, "/%d", nh->label[i]); @@ -129,7 +129,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) /* Special case for merged export */ if ((d->export_mode == RSEM_EXPORT) && (ec->ra_mode == RA_MERGED)) - { + { rte *rt_free; e = rt_export_merged(ec, n, &rt_free, &tmpa, c->show_pool, 1); pass = 1; @@ -156,7 +156,8 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) * command may change the export filter and do not update routes. */ int do_export = (ic > 0) || - (f_run(ec->out_filter, &e, &tmpa, c->show_pool, FF_FORCE_TMPATTR) <= F_ACCEPT); + (f_run(ec->out_filter, &e, &tmpa, c->show_pool, + FF_FORCE_TMPATTR | FF_SILENT) <= F_ACCEPT); if (do_export != (d->export_mode == RSEM_EXPORT)) goto skip; @@ -418,4 +419,3 @@ rt_show(struct rt_show_data *d) cli_msg(8001, "Network not found"); } } - |