mirror of
https://gitlab.labs.nic.cz/labs/bird.git
synced 2024-05-11 16:54:54 +00:00
Merge commit 'beb5f78a' into backport
This commit is contained in:
@@ -725,7 +725,7 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
|
||||
rt = rt0;
|
||||
*rt_free = NULL;
|
||||
|
||||
v = p->preexport ? p->preexport(p, rt) : 0;
|
||||
v = p->preexport ? p->preexport(c, rt) : 0;
|
||||
if (v < 0)
|
||||
{
|
||||
if (silent)
|
||||
@@ -1683,8 +1683,9 @@ rte_modify(rte *old)
|
||||
|
||||
/* Check rtable for best route to given net whether it would be exported do p */
|
||||
int
|
||||
rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter)
|
||||
rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter)
|
||||
{
|
||||
struct proto *p = c->proto;
|
||||
net *n = net_find(t, a);
|
||||
rte *rt = n ? n->routes : NULL;
|
||||
|
||||
@@ -1694,7 +1695,7 @@ rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter)
|
||||
rte_update_lock();
|
||||
|
||||
/* Rest is stripped down export_filter() */
|
||||
int v = p->preexport ? p->preexport(p, rt) : 0;
|
||||
int v = p->preexport ? p->preexport(c, rt) : 0;
|
||||
if (v == RIC_PROCESS)
|
||||
v = (f_run(filter, &rt, rte_update_pool, FF_SILENT) <= F_ACCEPT);
|
||||
|
||||
|
Reference in New Issue
Block a user