mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-23 02:01:55 +00:00
fixup! fixup! partial import seems working
This commit is contained in:
parent
64e7edaf41
commit
95c3ac5d8b
@ -358,7 +358,6 @@ channel_roa_in_reload_done(struct channel_import_request *req)
|
|||||||
static void
|
static void
|
||||||
channel_roa_in_changed(struct settle *se)
|
channel_roa_in_changed(struct settle *se)
|
||||||
{
|
{
|
||||||
log("channel_roa in changed");
|
|
||||||
struct roa_subscription *s = SKIP_BACK(struct roa_subscription, settle, se);
|
struct roa_subscription *s = SKIP_BACK(struct roa_subscription, settle, se);
|
||||||
struct channel *c = s->c;
|
struct channel *c = s->c;
|
||||||
|
|
||||||
@ -761,10 +760,7 @@ channel_refeed_prefilter(const struct rt_prefilter *p, const net_addr *n)
|
|||||||
ASSERT_DIE(c->refeeding);
|
ASSERT_DIE(c->refeeding);
|
||||||
for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next)
|
for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next)
|
||||||
if (!cfr->trie || trie_match_net(cfr->trie, n))
|
if (!cfr->trie || trie_match_net(cfr->trie, n))
|
||||||
{
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
|
||||||
log(L_TRACE "%N filtered out of export", n);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -879,7 +875,6 @@ channel_schedule_reload(struct channel *c, struct channel_import_request *cir)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CD(c, "Import with trie");
|
|
||||||
c->reload_req.prefilter.mode = TE_ADDR_HOOK;
|
c->reload_req.prefilter.mode = TE_ADDR_HOOK;
|
||||||
c->reload_req.prefilter.hook = channel_import_prefilter;
|
c->reload_req.prefilter.hook = channel_import_prefilter;
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,6 @@ pipe_import_by_refeed_free(struct channel_feeding_request *cfr)
|
|||||||
{
|
{
|
||||||
struct import_to_export_reload *reload = SKIP_BACK(struct import_to_export_reload, cfr, cfr);
|
struct import_to_export_reload *reload = SKIP_BACK(struct import_to_export_reload, cfr, cfr);
|
||||||
reload->cir->done(reload->cir);
|
reload->cir->done(reload->cir);
|
||||||
log("free is done");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
Loading…
Reference in New Issue
Block a user