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

bgpd: Do not send routes back received from a peer

Browse Source 
Before this patch, we needed to explicitly define a neighbor to be SOLO
(= separate update-group). Let's ease this functionality for an operator to
avoid confusions.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2023-01-05 10:25:38 +02:00
parent c7fe4786dc
commit 25851bf0a1
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_route.c
View File

@ -2188,12 +2188,12 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
} }
/* AS path loop check. */ /* AS path loop check. */
if (onlypeer && onlypeer->as_path_loop_detection if (peer->as_path_loop_detection &&
&& aspath_loop_check(piattr->aspath, onlypeer->as)) { aspath_loop_check(piattr->aspath, peer->as)) {
if (bgp_debug_update(NULL, p, subgrp->update_group, 0)) if (bgp_debug_update(NULL, p, subgrp->update_group, 0))
zlog_debug( zlog_debug(
"%pBP [Update:SEND] suppress announcement to peer AS %u that is part of AS path.", "%pBP [Update:SEND] suppress announcement to peer AS %u that is part of AS path.",
onlypeer, onlypeer->as); peer, peer->as);
return false; return false;
} }

9
bgpd/bgp_updgrp.c
View File

@ -164,6 +164,7 @@ static void conf_copy(struct peer *dst, struct peer *src, afi_t afi,
dst->change_local_as = src->change_local_as; dst->change_local_as = src->change_local_as;
dst->shared_network = src->shared_network; dst->shared_network = src->shared_network;
dst->local_role = src->local_role; dst->local_role = src->local_role;
dst->as_path_loop_detection = src->as_path_loop_detection;
if (src->soo[afi][safi]) { if (src->soo[afi][safi]) {
ecommunity_free(&dst->soo[afi][safi]); ecommunity_free(&dst->soo[afi][safi]);
@ -360,6 +361,9 @@ static unsigned int updgrp_hash_key_make(const void *p)
key = jhash_1word(peer->max_packet_size, key); key = jhash_1word(peer->max_packet_size, key);
key = jhash_1word(peer->pmax_out[afi][safi], key); key = jhash_1word(peer->pmax_out[afi][safi], key);
if (peer->as_path_loop_detection)
key = jhash_2words(peer->as, peer->as_path_loop_detection, key);
if (peer->group) if (peer->group)
key = jhash_1word(jhash(peer->group->name, key = jhash_1word(jhash(peer->group->name,
strlen(peer->group->name), SEED1), strlen(peer->group->name), SEED1),
@ -454,12 +458,13 @@ static unsigned int updgrp_hash_key_make(const void *p)
(intmax_t)CHECK_FLAG(peer->flags, PEER_UPDGRP_FLAGS), (intmax_t)CHECK_FLAG(peer->flags, PEER_UPDGRP_FLAGS),
(intmax_t)CHECK_FLAG(flags, PEER_UPDGRP_AF_FLAGS)); (intmax_t)CHECK_FLAG(flags, PEER_UPDGRP_AF_FLAGS));
zlog_debug( zlog_debug(
"%pBP Update Group Hash: addpath: %u UpdGrpCapFlag: %u UpdGrpCapAFFlag: %u route_adv: %u change local as: %u", "%pBP Update Group Hash: addpath: %u UpdGrpCapFlag: %u UpdGrpCapAFFlag: %u route_adv: %u change local as: %u, as_path_loop_detection: %d",
peer, (uint32_t)peer->addpath_type[afi][safi], peer, (uint32_t)peer->addpath_type[afi][safi],
CHECK_FLAG(peer->cap, PEER_UPDGRP_CAP_FLAGS), CHECK_FLAG(peer->cap, PEER_UPDGRP_CAP_FLAGS),
CHECK_FLAG(peer->af_cap[afi][safi], CHECK_FLAG(peer->af_cap[afi][safi],
PEER_UPDGRP_AF_CAP_FLAGS), PEER_UPDGRP_AF_CAP_FLAGS),
peer->v_routeadv, peer->change_local_as); peer->v_routeadv, peer->change_local_as,
peer->as_path_loop_detection);
zlog_debug( zlog_debug(
"%pBP Update Group Hash: max packet size: %u pmax_out: %u Peer Group: %s rmap out: %s", "%pBP Update Group Hash: max packet size: %u pmax_out: %u Peer Group: %s rmap out: %s",
peer, peer->max_packet_size, peer->pmax_out[afi][safi], peer, peer->max_packet_size, peer->pmax_out[afi][safi],