diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-21 09:26:59 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-21 09:26:59 +0200 |
| commit | 6c84554b671fce473fe333ab3d8b548a0768882b (patch) | |
| tree | fff55c05f21325230e5470825bd03d48742875c1 /nest/rt-table.c | |
| parent | f434d19174cb2d3054a00248ca609aa87bf8c263 (diff) | |
| parent | 4d176e14509c71823a539b3c8b6103e254296d4f (diff) | |
| download | bird-6c84554b671fce473fe333ab3d8b548a0768882b.tar bird-6c84554b671fce473fe333ab3d8b548a0768882b.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'nest/rt-table.c')
| -rw-r--r-- | nest/rt-table.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nest/rt-table.c b/nest/rt-table.c index 3fa5267..4a04a0a 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -979,11 +979,13 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) struct ea_list *tmpa, *old_tmpa; struct proto *p0 = e->attrs->proto; struct proto *p1 = d->import_protocol; + struct proto *p2 = d->show_protocol; d->rt_counter++; ee = e; rte_update_lock(); /* We use the update buffer for filtering */ old_tmpa = tmpa = p0->make_tmp_attrs ? p0->make_tmp_attrs(e, rte_update_pool) : NULL; ok = (d->filter == FILTER_ACCEPT || f_run(d->filter, &e, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) <= F_ACCEPT); + if (p2 && p2 != p0) ok = 0; if (ok && d->import_mode) { int ic = (p1->import_control ? p1->import_control(p1, &e, &tmpa, rte_update_pool) : 0); |