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

bgpd: Allow setting attributes over route-maps for conditional advertisements

Browse Source 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2022-02-15 18:08:32 +02:00
parent 5cb526136a
commit cb290e57c7
6 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bgpd/bgp_conditional_adv.c
View File

@ -82,7 +82,7 @@ static void bgp_conditional_adv_routes(struct peer *peer, afi_t afi,
struct peer_af *paf;
const struct prefix *dest_p;
struct update_subgroup *subgrp;
struct attr dummy_attr = {0}, attr = {0};
struct attr advmap_attr = {0}, attr = {0};
struct bgp_path_info_extra path_extra = {0};
route_map_result_t ret;
@ -110,22 +110,22 @@ static void bgp_conditional_adv_routes(struct peer *peer, afi_t afi,
assert(dest_p);
for (pi = bgp_dest_get_bgp_path_info(dest); pi; pi = pi->next) {
dummy_attr = *pi->attr;
advmap_attr = *pi->attr;
/* Fill temp path_info */
prep_for_rmap_apply(&path, &path_extra, dest, pi,
pi->peer, &dummy_attr);
pi->peer, &advmap_attr);
RESET_FLAG(dummy_attr.rmap_change_flags);
RESET_FLAG(advmap_attr.rmap_change_flags);
ret = route_map_apply(rmap, dest_p, &path);
bgp_attr_flush(&dummy_attr);
if (ret != RMAP_PERMITMATCH)
continue;
if (bgp_check_selected(pi, peer, addpath_capable, afi,
if (ret != RMAP_PERMITMATCH ||
!bgp_check_selected(pi, peer, addpath_capable, afi,
safi)) {
bgp_attr_flush(&advmap_attr);
continue;
}
/* Skip route-map checks in
* subgroup_announce_check while executing from
* the conditional advertise scanner process.
@ -133,23 +133,21 @@ static void bgp_conditional_adv_routes(struct peer *peer, afi_t afi,
* on same peer, routes in advertise-map may not
* be advertised as expected.
*/
if ((update_type == ADVERTISE)
&& subgroup_announce_check(dest, pi, subgrp,
dest_p, &attr,
true))
bgp_adj_out_set_subgroup(dest, subgrp,
&attr, pi);
else {
if (update_type == ADVERTISE &&
subgroup_announce_check(dest, pi, subgrp, dest_p,
&attr, &advmap_attr)) {
bgp_adj_out_set_subgroup(dest, subgrp, &attr,
pi);
} else {
/* If default originate is enabled for
* the peer, do not send explicit
* withdraw. This will prevent deletion
* of default route advertised through
* default originate.
*/
if (CHECK_FLAG(
peer->af_flags[afi][safi],
PEER_FLAG_DEFAULT_ORIGINATE)
&& is_default_prefix(dest_p))
if (CHECK_FLAG(peer->af_flags[afi][safi],
PEER_FLAG_DEFAULT_ORIGINATE) &&
is_default_prefix(dest_p))
break;
bgp_adj_out_unset_subgroup(
@ -158,7 +156,7 @@ static void bgp_conditional_adv_routes(struct peer *peer, afi_t afi,
peer, afi, safi,
&pi->tx_addpath));
}
}
bgp_attr_flush(&advmap_attr);
}
}
UNSET_FLAG(subgrp->sflags, SUBGRP_STATUS_TABLE_REPARSING);

18
bgpd/bgp_route.c
View File

@ -1836,7 +1836,7 @@ void subgroup_announce_reset_nhop(uint8_t family, struct attr *attr)
bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
struct update_subgroup *subgrp,
const struct prefix *p, struct attr *attr,
bool skip_rmap_check)
struct attr *post_attr)
{
struct bgp_filter *filter;
struct peer *from;
@ -2067,7 +2067,15 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
}
}
/* For modify attribute, copy it to temporary structure. */
/* For modify attribute, copy it to temporary structure.
* post_attr comes from BGP conditional advertisements, where
* attributes are already processed by advertise-map route-map,
* and this needs to be saved instead of overwriting from the
* path attributes.
*/
if (post_attr)
*attr = *post_attr;
else
*attr = *piattr;
/* If local-preference is not set. */
@ -2162,8 +2170,8 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
bgp_peer_as_override(bgp, afi, safi, peer, attr);
/* Route map & unsuppress-map apply. */
if (!skip_rmap_check
&& (ROUTE_MAP_OUT_NAME(filter) || bgp_path_suppressed(pi))) {
if (!post_attr &&
(ROUTE_MAP_OUT_NAME(filter) || bgp_path_suppressed(pi))) {
struct bgp_path_info rmap_path = {0};
struct bgp_path_info_extra dummy_rmap_path_extra = {0};
struct attr dummy_attr = {0};
@ -2696,7 +2704,7 @@ void subgroup_process_announce_selected(struct update_subgroup *subgrp,
if (selected) {
if (subgroup_announce_check(dest, selected, subgrp, p, &attr,
false)) {
NULL)) {
/* Route is selected, if the route is already installed
* in FIB, then it is advertised
*/

2
bgpd/bgp_route.h
View File

@ -785,7 +785,7 @@ extern bool subgroup_announce_check(struct bgp_dest *dest,
struct bgp_path_info *pi,
struct update_subgroup *subgrp,
const struct prefix *p, struct attr *attr,
bool skip_rmap_check);
struct attr *post_attr);
extern void bgp_peer_clear_node_queue_drain_immediate(struct peer *peer);
extern void bgp_process_queues_drain_immediate(void);

4
bgpd/bgp_updgrp_adv.c
View File

@ -691,7 +691,7 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
safi)) {
if (subgroup_announce_check(dest, ri, subgrp,
dest_p, &attr,
false)) {
NULL)) {
/* Check if route can be advertised */
if (advertise) {
if (!bgp_check_withdrawal(bgp,
@ -910,7 +910,7 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
if (subgroup_announce_check(
dest, pi, subgrp,
bgp_dest_get_prefix(dest),
&attr, false))
&attr, NULL))
bgp_adj_out_set_subgroup(
dest, subgrp, &attr,
pi);

1
tests/topotests/bgp_conditional_advertisement/r2/bgpd.conf
View File

@ -19,6 +19,7 @@ route-map ADV-MAP-1 permit 20
!
route-map ADV-MAP-2 permit 10
match ip address prefix-list IP2
set metric 911
!
route-map EXIST-MAP permit 10
match community DEFAULT-ROUTE

2
tests/topotests/bgp_conditional_advertisement/test_bgp_conditional_advertisement.py
View File

@ -334,7 +334,7 @@ def test_bgp_conditional_advertisement():
"192.0.2.1/32": None,
"192.0.2.5/32": None,
"10.139.224.0/20": None,
"203.0.113.1/32": [{"protocol": "bgp"}],
"203.0.113.1/32": [{"protocol": "bgp", "metric": 911}],
}
return topotest.json_cmp(output, expected)