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

rt-feed-by-fib: addr to trie

Browse Source
This commit is contained in:
katerina.kubecova 2023-09-29 16:09:03 +02:00
parent adb5fb98e4
commit 6d58ca731f
6 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nest/proto.c
View File

@ -339,9 +339,8 @@ channel_export_one_roa(struct rt_export_request *req, const net_addr *net, struc
net_addr* copy = lp_alloc(s->linpool, sizeof(net_addr));
net_copy(copy, net);
struct f_trie * trie = f_new_trie(s->linpool, 0);
log_msg(L_DEBUG "min len %i", net_pxlen(net));
if (net->type == NET_IP4 || net->type == NET_VPN4 || net->type == NET_ROA4){
trie_add_prefix(trie, net, net_pxlen(net), net_pxlen(net)+5);
trie_add_prefix(trie, net, net_pxlen(net), 48);
}
else trie_add_prefix(trie, net, net_pxlen(net), 128);
s->trie = trie;
@ -524,13 +523,17 @@ channel_start_export(struct channel *c)
ASSERT(c->channel_state == CS_UP);
c->reqv_trie_lp = lp_new(c->proto->pool);
struct f_trie * trie = f_new_trie(c->reqv_trie_lp, 0);
trie_add_prefix(trie, c->out_subprefix, net_pxlen(c->out_subprefix), net_pxlen(c->out_subprefix));
c->out_req = (struct rt_export_request) {
.name = mb_sprintf(c->proto->pool, "%s.%s", c->proto->name, c->name),
.list = proto_work_list(c->proto),
.pool = c->proto->pool,
.feed_block_size = c->feed_block_size,
.addr = c->out_subprefix,
.addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
.prefilter.net_filter_trie = trie,
.prefilter.addr_mode = c->out_subprefix ? TE_ADDR_IN : TE_ADDR_NONE,
.trace_routes = c->debug | c->proto->debug,
.dump_req = channel_dump_export_req,
.log_state_change = channel_export_log_state_change,
@ -1038,7 +1041,11 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
// c->ra_mode = cf->ra_mode;
c->merge_limit = cf->merge_limit;
c->preference = cf->preference;
c->out_req.addr = c->out_subprefix = cf->out_subprefix;
c->out_subprefix = cf->out_subprefix;
c->reqv_trie_lp = lp_new(c->proto->pool);
struct f_trie *trie = f_new_trie(c->reqv_trie_lp, 0);
trie_add_prefix(trie, c->out_subprefix, net_pxlen(c->out_subprefix), net_pxlen(c->out_subprefix));
c->out_req.prefilter.net_filter_trie = trie;
c->debug = cf->debug;
c->in_req.trace_routes = c->out_req.trace_routes = c->debug | c->proto->debug;
c->rpki_reload = cf->rpki_reload;

2
nest/protocol.h
View File

@ -560,6 +560,8 @@ struct channel {
struct rt_import_request in_req; /* Table import connection */
struct rt_export_request out_req; /* Table export connection */
linpool * reqv_trie_lp;
u32 refeed_count; /* Number of routes exported during refeed regardless of out_limit */
uint feed_block_size; /* How many routes to feed at once */

4
nest/rt-show.c
View File

@ -285,14 +285,14 @@ rt_show_cont(struct rt_show_data *d)
}
d->req = (struct rt_export_request) {
.addr = d->addr,
.prefilter.addr = d->addr,
.name = "CLI Show Route",
.list = &global_work_list,
.pool = c->pool,
.export_bulk = rt_show_net_export_bulk,
.dump_req = rt_show_dump_req,
.log_state_change = rt_show_log_state_change,
.addr_mode = d->addr_mode,
.prefilter.addr_mode = d->addr_mode,
};
d->table_counter++;

20
nest/rt-table.c
View File

@ -1204,19 +1204,19 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
goto ignore; /* Seen already */
const net_addr *n = rpe->new_best ? rpe->new_best->rte.net : rpe->old_best->rte.net;
switch (hook->req->addr_mode)
ASSERT_DIE(1);
switch (hook->req->prefilter.addr_mode)
{
case TE_ADDR_NONE:
break;
case TE_ADDR_IN:
if (!net_in_netX(n, hook->req->addr))
if (!net_in_netX(n, hook->req->prefilter.addr))
goto ignore;
break;
case TE_ADDR_EQUAL:
if (!net_equal(n, hook->req->addr))
if (!net_equal(n, hook->req->prefilter.addr))
goto ignore;
break;
@ -1224,7 +1224,7 @@ rte_export(struct rt_table_export_hook *th, struct rt_pending_export *rpe)
bug("Continuos export of best prefix match not implemented yet.");
default:
bug("Strange table export address mode: %d", hook->req->addr_mode);
bug("Strange table export address mode: %d", hook->req->prefilter.addr_mode);
}
if (rpe->new)
@ -2156,7 +2156,7 @@ rt_table_export_start_feed(struct rtable_private *tab, struct rt_table_export_ho
struct rt_export_request *req = hook->h.req;
/* stats zeroed by mb_allocz */
switch (req->addr_mode)
switch (req->prefilter.addr_mode)
{
case TE_ADDR_IN:
if (tab->trie && net_val_match(tab->addr_type, NB_IP))
@ -2253,7 +2253,7 @@ rt_table_export_stop_locked(struct rt_export_hook *hh)
rt_trace(tab, D_EVENTS, "Stopping export hook %s must wait for uncorking", hook->h.req->name);
return 0;
case TES_FEEDING:
switch (hh->req->addr_mode)
switch (hh->req->prefilter.addr_mode)
{
case TE_ADDR_IN:
if (hook->walk_lock)
@ -4346,7 +4346,7 @@ rt_feed_by_fib(void *data)
FIB_ITERATE_START(&tab->fib, fit, net, n)
{
if ((c->h.req->addr_mode == TE_ADDR_NONE) || net_in_netX(n->n.addr, c->h.req->addr))
if ((c->h.req->prefilter.addr_mode == TE_ADDR_NONE) || trie_match_net( c->h.req->prefilter.net_filter_trie, n->n.addr) )/*net_in_netX(n->n.addr, c->h.req->addr)) net n trie_match_net(const struct f_trie *t, const net_addr *n)*/
{
if (!rt_prepare_feed(c, n, &block))
{
@ -4421,7 +4421,7 @@ rt_feed_equal(void *data)
RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
{
ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_EQUAL);
ASSERT_DIE(c->h.req->prefilter.addr_mode == TE_ADDR_EQUAL);
if (n = net_find(tab, c->h.req->addr))
ASSERT_DIE(rt_prepare_feed(c, n, &block));
@ -4443,7 +4443,7 @@ rt_feed_for(void *data)
RT_LOCKED(RT_PUB(SKIP_BACK(struct rtable_private, exporter, c->table)), tab)
{
ASSERT_DIE(atomic_load_explicit(&c->h.export_state, memory_order_relaxed) == TES_FEEDING);
ASSERT_DIE(c->h.req->addr_mode == TE_ADDR_FOR);
ASSERT_DIE(c->h.req->prefilter.addr_mode == TE_ADDR_FOR);
if (n = net_route(tab, c->h.req->addr))
ASSERT_DIE(rt_prepare_feed(c, n, &block));

10
nest/rt.h
View File

@ -286,13 +286,21 @@ struct rt_pending_export {
u64 seq; /* Sequential ID (table-local) of the pending export */
};
struct rt_prefilter_address{
union{
const struct f_trie *net_filter_trie;
const net_addr *addr; /* Network prefilter address */
};
u8 addr_mode; /* Network prefilter mode (TE_ADDR_*) */
}PACKED;
struct rt_export_request {
struct rt_export_hook *hook; /* Table part of the export */
char *name;
const net_addr *addr; /* Network prefilter address */
u8 trace_routes;
u8 addr_mode; /* Network prefilter mode (TE_ADDR_*) */
uint feed_block_size; /* How many routes to feed at once */
struct rt_prefilter_address prefilter;
event_list *list; /* Where to schedule export events */
pool *pool; /* Pool to use for allocations */

4
proto/bgp/attrs.c
View File

@ -1896,13 +1896,13 @@ bgp_out_table_feed(void *data)
int max = 512;
const net_addr *neq = (hook->h.req->addr_mode == TE_ADDR_EQUAL) ? hook->h.req->addr : NULL;
const net_addr *neq = (hook->h.req->prefilter.addr_mode == TE_ADDR_EQUAL) ? hook->h.req->addr : NULL;
const net_addr *cand = NULL;
do {
HASH_WALK_ITER(c->prefix_hash, PXH, n, hook->hash_iter)
{
switch (hook->h.req->addr_mode)
switch (hook->h.req->prefilter.addr_mode)
{
case TE_ADDR_IN:
if (!net_in_netX(n->net, hook->h.req->addr))