mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

Channel feeding request respects the subnet tries

Browse Source
This commit is contained in:
Maria Matejka 2023-10-04 10:39:46 +02:00
parent 5e733a764d
commit 45e8629f53
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nest/proto.c
View File

@ -357,6 +357,12 @@ channel_roa_in_changed(struct settle *se)
channel_request_reload(c); channel_request_reload(c);
} }
static void
channel_roa_out_reload_done(struct channel_feeding_request *req)
{
rfree(req->trie->lp);
}
static void static void
channel_roa_out_changed(struct settle *se) channel_roa_out_changed(struct settle *se)
{ {
@ -365,25 +371,15 @@ channel_roa_out_changed(struct settle *se)
CD(c, "Feeding triggered by RPKI change"); CD(c, "Feeding triggered by RPKI change");
/* TODO feed by trie */ struct channel_feeding_request *cfr = lp_alloc(s->trie->lp, sizeof *cfr);
*cfr = (struct channel_feeding_request) {
.type = CFRT_AUXILIARY,
.trie = s->trie,
.done = channel_roa_out_reload_done,
};
channel_request_feeding(c, cfr);
/* Refeed already pending */ s->trie = f_new_trie(lp_new(c->proto->pool), 0);
if ((s->cfr[0].state == CFRS_PENDING) || (s->cfr[1].state == CFRS_PENDING))
return;
/* First refeed inactive */
if (s->cfr[0].state == CFRS_INACTIVE)
{
s->cfr[0].type = CFRT_AUXILIARY;
channel_request_feeding(c, &s->cfr[0]);
}
else
{
/* Second refeed MUST be inactive */
ASSERT_DIE(s->cfr[1].state == CFRS_INACTIVE);
s->cfr[1].type = CFRT_AUXILIARY;
channel_request_feeding(c, &s->cfr[1]);
}
} }
static void static void

20
nest/protocol.h
View File

@ -678,6 +678,7 @@ static inline void channel_close(struct channel *c) { channel_set_state(c, CS_ST
struct channel_feeding_request { struct channel_feeding_request {
struct channel_feeding_request *next; /* Next in request chain */ struct channel_feeding_request *next; /* Next in request chain */
void (*done)(struct channel_feeding_request *); /* Called when refeed finishes */ void (*done)(struct channel_feeding_request *); /* Called when refeed finishes */
struct f_trie *trie; /* Reload only matching nets */
PACKED enum channel_feeding_request_type { PACKED enum channel_feeding_request_type {
CFRT_DIRECT = 1, /* Refeed by export restart */ CFRT_DIRECT = 1, /* Refeed by export restart */
CFRT_AUXILIARY, /* Refeed by auxiliary request */ CFRT_AUXILIARY, /* Refeed by auxiliary request */
@ -694,12 +695,29 @@ void channel_request_feeding(struct channel *c, struct channel_feeding_request *
void channel_request_feeding_dynamic(struct channel *c, enum channel_feeding_request_type); void channel_request_feeding_dynamic(struct channel *c, enum channel_feeding_request_type);
static inline int channel_net_is_refeeding(struct channel *c, const net_addr *n) static inline int channel_net_is_refeeding(struct channel *c, const net_addr *n)
{ return (c->refeeding && c->refeed_trie && !trie_match_net(c->refeed_trie, n)); } {
/* Not refeeding if not refeeding at all */
if (!c->refeeding || !c->refeed_trie)
return 0;
/* Not refeeding if already refed */
if (trie_match_net(c->refeed_trie, n))
return 0;
/* Refeeding if matching any request */
for (struct channel_feeding_request *cfr = c->refeeding; cfr; cfr = cfr->next)
if (!cfr->trie || trie_match_net(cfr->trie, n))
return 1;
/* Not matching any request */
return 0;
}
static inline void channel_net_mark_refed(struct channel *c, const net_addr *n) static inline void channel_net_mark_refed(struct channel *c, const net_addr *n)
{ {
ASSERT_DIE(c->refeeding && c->refeed_trie); ASSERT_DIE(c->refeeding && c->refeed_trie);
trie_add_prefix(c->refeed_trie, n, n->pxlen, n->pxlen); trie_add_prefix(c->refeed_trie, n, n->pxlen, n->pxlen);
} }
void *channel_config_new(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto); void *channel_config_new(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto); void *channel_config_get(const struct channel_class *cc, const char *name, uint net_type, struct proto_config *proto);
int channel_reconfigure(struct channel *c, struct channel_config *cf); int channel_reconfigure(struct channel *c, struct channel_config *cf);