proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 20:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Move bgp_aggregate_delete to a better location

Browse Source 
The function bgp_aggregate_delete function was forward
declared and not static.  Move it so we can clean that
up.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-06-06 12:46:14 -04:00
parent c701010e1f
commit 3b7db17342
1 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
bgpd/bgp_route.c
View File

@ -5610,8 +5610,50 @@ static void bgp_aggregate_route(struct bgp *bgp, struct prefix *p,
} }
} }
void bgp_aggregate_delete(struct bgp *, struct prefix *, afi_t, safi_t, static void bgp_aggregate_delete(struct bgp *bgp, struct prefix *p, afi_t afi,
struct bgp_aggregate *); safi_t safi, struct bgp_aggregate *aggregate)
{
struct bgp_table *table;
struct bgp_node *top;
struct bgp_node *rn;
struct bgp_info *ri;
unsigned long match;
table = bgp->rib[afi][safi];
/* If routes exists below this node, generate aggregate routes. */
top = bgp_node_get(table, p);
for (rn = bgp_node_get(table, p); rn;
rn = bgp_route_next_until(rn, top)) {
if (rn->p.prefixlen <= p->prefixlen)
continue;
match = 0;
for (ri = rn->info; ri; ri = ri->next) {
if (BGP_INFO_HOLDDOWN(ri))
continue;
if (ri->sub_type == BGP_ROUTE_AGGREGATE)
continue;
if (aggregate->summary_only && ri->extra) {
ri->extra->suppress--;
if (ri->extra->suppress == 0) {
bgp_info_set_flag(
rn, ri, BGP_INFO_ATTR_CHANGED);
match++;
}
}
aggregate->count--;
}
/* If this node was suppressed, process the change. */
if (match)
bgp_process(bgp, rn, afi, safi);
}
bgp_unlock_node(top);
}
void bgp_aggregate_increment(struct bgp *bgp, struct prefix *p, void bgp_aggregate_increment(struct bgp *bgp, struct prefix *p,
struct bgp_info *ri, afi_t afi, safi_t safi) struct bgp_info *ri, afi_t afi, safi_t safi)
@ -5783,51 +5825,6 @@ static void bgp_aggregate_add(struct bgp *bgp, struct prefix *p, afi_t afi,
} }
} }
void bgp_aggregate_delete(struct bgp *bgp, struct prefix *p, afi_t afi,
safi_t safi, struct bgp_aggregate *aggregate)
{
struct bgp_table *table;
struct bgp_node *top;
struct bgp_node *rn;
struct bgp_info *ri;
unsigned long match;
table = bgp->rib[afi][safi];
/* If routes exists below this node, generate aggregate routes. */
top = bgp_node_get(table, p);
for (rn = bgp_node_get(table, p); rn;
rn = bgp_route_next_until(rn, top)) {
if (rn->p.prefixlen <= p->prefixlen)
continue;
match = 0;
for (ri = rn->info; ri; ri = ri->next) {
if (BGP_INFO_HOLDDOWN(ri))
continue;
if (ri->sub_type == BGP_ROUTE_AGGREGATE)
continue;
if (aggregate->summary_only && ri->extra) {
ri->extra->suppress--;
if (ri->extra->suppress == 0) {
bgp_info_set_flag(
rn, ri, BGP_INFO_ATTR_CHANGED);
match++;
}
}
aggregate->count--;
}
/* If this node was suppressed, process the change. */
if (match)
bgp_process(bgp, rn, afi, safi);
}
bgp_unlock_node(top);
}
/* Aggregate route attribute. */ /* Aggregate route attribute. */
#define AGGREGATE_SUMMARY_ONLY 1 #define AGGREGATE_SUMMARY_ONLY 1
#define AGGREGATE_AS_SET 1 #define AGGREGATE_AS_SET 1