0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-08 12:18:42 +00:00

fixup! fixup! fixup! fixup! fixup! rt-feed-by-fib: addr to trie

This commit is contained in:
katerina.kubecova 2023-10-02 12:43:28 +02:00
parent 8a7d3a202d
commit 8dea76367b

View File

@ -335,9 +335,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_addr* copy = lp_alloc(s->linpool, sizeof(net_addr));
net_copy(copy, net); net_copy(copy, net);
struct f_trie * trie = f_new_trie(s->linpool, 0); struct f_trie * trie = f_new_trie(s->linpool, 0);
if ( net->type == NET_IP4 || net->type == NET_VPN4 || net->type == NET_ROA4 ){ if ( net->type == NET_IP4 || net->type == NET_VPN4 || net->type == NET_ROA4 )
trie_add_prefix(trie, net, net_pxlen(net), 48); trie_add_prefix(trie, net, net_pxlen(net), 32);
}
else trie_add_prefix(trie, net, net_pxlen(net), 128); else trie_add_prefix(trie, net, net_pxlen(net), 128);
s->trie = trie; s->trie = trie;
@ -533,10 +532,10 @@ channel_start_export(struct channel *c)
if(c->out_subprefix!=0){ if(c->out_subprefix!=0){
c->reqv_trie_lp = lp_new(c->proto->pool); c->reqv_trie_lp = lp_new(c->proto->pool);
struct f_trie * trie = f_new_trie(c->reqv_trie_lp, 0); struct f_trie * trie = f_new_trie(c->reqv_trie_lp, 0);
if (c->out_subprefix->type == NET_IP4 || c->out_subprefix->type == NET_VPN4 || c->out_subprefix->type == NET_ROA4){ if ( c->out_subprefix->type == NET_IP4 || c->out_subprefix->type == NET_VPN4 || c->out_subprefix->type == NET_ROA4 )
trie_add_prefix(trie, c->out_subprefix, net_pxlen(c->out_subprefix), 48); trie_add_prefix(trie, c->out_subprefix, net_pxlen(c->out_subprefix), 32);
}
else trie_add_prefix(trie, c->out_subprefix, net_pxlen(c->out_subprefix), 128); else trie_add_prefix(trie, c->out_subprefix, net_pxlen(c->out_subprefix), 128);
c->out_req.prefilter.net_filter_trie = trie; c->out_req.prefilter.net_filter_trie = trie;
} }
bmap_init(&c->export_map, c->proto->pool, 16); bmap_init(&c->export_map, c->proto->pool, 16);