diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-01-23 18:29:32 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-01-23 18:29:32 +0100 |
| commit | 75d98b6013c19598b1d3ba5e05e8f84525e8678a (patch) | |
| tree | 95089f2193c4097f26cddc0539f3a16e801fe0a5 /nest | |
| parent | ace3072e09e445b2fd8554492b80bea5cc1f3411 (diff) | |
| parent | d6cf996151307d083c30e4ecde0f1d7449b19253 (diff) | |
Merge branch 'master' into int-new
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/rt-show.c | 3 | ||||
| -rw-r--r-- | nest/rt-table.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nest/rt-show.c b/nest/rt-show.c index 41a141a2..70dabc1f 100644 --- a/nest/rt-show.c +++ b/nest/rt-show.c @@ -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; diff --git a/nest/rt-table.c b/nest/rt-table.c index b0dd6d3f..4640d6a9 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -387,7 +387,8 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, ea_list **tmpa, linpo } v = filter && ((filter == FILTER_REJECT) || - (f_run(filter, &rt, tmpa, pool, FF_FORCE_TMPATTR) > F_ACCEPT)); + (f_run(filter, &rt, tmpa, pool, + FF_FORCE_TMPATTR | (silent ? FF_SILENT : 0)) > F_ACCEPT)); if (v) { if (silent) @@ -1419,7 +1420,8 @@ rt_examine(rtable *t, net_addr *a, struct proto *p, struct filter *filter) ea_list *tmpa = rte_make_tmp_attrs(rt, rte_update_pool); int v = p->import_control ? p->import_control(p, &rt, &tmpa, rte_update_pool) : 0; if (v == RIC_PROCESS) - v = (f_run(filter, &rt, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) <= F_ACCEPT); + v = (f_run(filter, &rt, &tmpa, rte_update_pool, + FF_FORCE_TMPATTR | FF_SILENT) <= F_ACCEPT); /* Discard temporary rte */ if (rt != n->routes) |