mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Using ea_lookup_tmp() for temporarily keeping attribute references

Browse Source 
To avoid needs for keeping local temporary references for attributes,
now one can use ea_lookup_tmp() to ensure that the attributes are
valid and stored until the task ends. After that, the attributes are
automatically unref'd and also deallocated if needed.
This commit is contained in:
Maria Matejka
2024-04-23 18:28:34 +02:00
parent 21c7debff8
commit 7fd70908e5
5 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nest/rt-table.c
View File

@@ -1871,11 +1871,9 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
ASSERT(c->channel_state == CS_UP);
ea_list *ea_prefilter = NULL, *ea_postfilter = NULL;
/* Storing prefilter routes as an explicit layer */
if (new && (c->in_keep & RIK_PREFILTER))
ea_prefilter = new->attrs = ea_lookup(new->attrs, 0, EALS_PREIMPORT);
new->attrs = ea_lookup_tmp(new->attrs, 0, EALS_PREIMPORT);
#if 0
debug("%s.%s -(prefilter)-> %s: %N ", c->proto->name, c->name, c->table->name, n);
@@ -1918,8 +1916,8 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
if (new)
{
ea_postfilter = new->attrs = ea_lookup(new->attrs,
ea_prefilter ? BIT32_ALL(EALS_PREIMPORT) : 0, EALS_FILTERED);
new->attrs = ea_lookup_tmp(new->attrs,
(c->in_keep & RIK_PREFILTER) ? BIT32_ALL(EALS_PREIMPORT) : 0, EALS_FILTERED);
if (net_is_flow(n))
rt_flowspec_resolve_rte(new, c);
@@ -1944,11 +1942,6 @@ rte_update(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
mpls_unlock_fec(fec);
DBGL( "Unlock FEC %p (rte_update %N)", fec, n);
}
/* Now the route attributes are kept by the in-table cached version
* and we may drop the local handles */
ea_free(ea_prefilter);
ea_free(ea_postfilter);
}
void