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

Added and explicit target table to the ROA subscription object

Browse Source
This commit is contained in:
Maria Matejka 2024-02-08 14:34:54 +01:00
parent 10f41cda87
commit cb2c9c8cc0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nest/proto.c
View File

@ -434,6 +434,7 @@ struct roa_subscription {
node roa_node; node roa_node;
struct settle settle; struct settle settle;
struct channel *c; struct channel *c;
rtable *tab;
struct rt_export_request req; struct rt_export_request req;
struct f_trie *trie; struct f_trie *trie;
}; };
@ -518,12 +519,11 @@ channel_dump_roa_req(struct rt_export_request *req)
{ {
struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req); struct roa_subscription *s = SKIP_BACK(struct roa_subscription, req, req);
struct channel *c = s->c; struct channel *c = s->c;
struct rtable_private *tab = SKIP_BACK(struct rtable_private, exporter.e, req->hook->table);
debug(" Channel %s.%s ROA %s change notifier from table %s request %p\n", debug(" Channel %s.%s ROA %s change notifier request %p\n",
c->proto->name, c->name, c->proto->name, c->name,
(s->settle.hook == channel_roa_in_changed) ? "import" : "export", (s->settle.hook == channel_roa_in_changed) ? "import" : "export",
tab->name, req); req);
} }
static int static int
@ -536,8 +536,7 @@ channel_roa_is_subscribed(struct channel *c, rtable *tab, int dir)
node *n; node *n;
WALK_LIST2(s, n, c->roa_subscriptions, roa_node) WALK_LIST2(s, n, c->roa_subscriptions, roa_node)
if ((tab == SKIP_BACK(rtable, priv.exporter.e, s->req.hook->table)) if ((tab == s->tab) && (s->settle.hook == hook))
&& (s->settle.hook == hook))
return 1; return 1;
return 0; return 0;
@ -555,6 +554,7 @@ channel_roa_subscribe(struct channel *c, rtable *tab, int dir)
.settle = SETTLE_INIT(&c->roa_settle, dir ? channel_roa_in_changed : channel_roa_out_changed, NULL), .settle = SETTLE_INIT(&c->roa_settle, dir ? channel_roa_in_changed : channel_roa_out_changed, NULL),
.c = c, .c = c,
.trie = f_new_trie(lp_new(c->proto->pool), 0), .trie = f_new_trie(lp_new(c->proto->pool), 0),
.tab = tab,
.req = { .req = {
.name = mb_sprintf(c->proto->pool, "%s.%s.roa-%s.%s", .name = mb_sprintf(c->proto->pool, "%s.%s.roa-%s.%s",
c->proto->name, c->name, dir ? "in" : "out", tab->name), c->proto->name, c->name, dir ? "in" : "out", tab->name),
@ -588,6 +588,7 @@ channel_roa_unsubscribe(struct roa_subscription *s)
rfree(s->trie->lp); rfree(s->trie->lp);
rt_stop_export(&s->req, channel_roa_unsubscribed); rt_stop_export(&s->req, channel_roa_unsubscribed);
settle_cancel(&s->settle); settle_cancel(&s->settle);
s->settle.hook = NULL;
} }
static void static void