From: Katerina Kubecova Date: Wed, 25 Oct 2023 11:41:23 +0000 (+0200) Subject: fixup! fixup! partial import seems working X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c3ac5d8bc30b2b00d5e24491cd21599d223c58;p=thirdparty%2Fbird.git fixup! fixup! partial import seems working --- diff --git a/nest/proto.c b/nest/proto.c index 857d27e45..932d337ab 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -358,7 +358,6 @@ channel_roa_in_reload_done(struct channel_import_request *req) static void channel_roa_in_changed(struct settle *se) { - log("channel_roa in changed"); struct roa_subscription *s = SKIP_BACK(struct roa_subscription, settle, se); 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); for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next) if (!cfr->trie || trie_match_net(cfr->trie, n)) - { return 1; - } - log(L_TRACE "%N filtered out of export", n); return 0; } @@ -879,7 +875,6 @@ channel_schedule_reload(struct channel *c, struct channel_import_request *cir) } else { - CD(c, "Import with trie"); c->reload_req.prefilter.mode = TE_ADDR_HOOK; c->reload_req.prefilter.hook = channel_import_prefilter; } diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c index cd2b3c9b1..c2cfa5a18 100644 --- a/proto/pipe/pipe.c +++ b/proto/pipe/pipe.c @@ -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); reload->cir->done(reload->cir); - log("free is done"); } static int