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

bgpd: Create peer_sort_lookup()

Browse Source 
The act of peer_sort() being called always set this value
even when we are just looking it up.  We need to seperate
out the idea of lookup from set.

For those places that this is immediately obvious that
this is a lookup switch over to using this function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2020-02-12 13:26:19 -05:00
parent efa618369a
commit bf0d28dcf7
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_network.c
View File

@ -203,7 +203,7 @@ int bgp_set_socket_ttl(struct peer *peer, int bgp_sock)
int ret = 0;
/* In case of peer is EBGP, we should set TTL for this connection. */
if (!peer->gtsm_hops && (peer_sort(peer) == BGP_PEER_EBGP)) {
if (!peer->gtsm_hops && (peer_sort_lookup(peer) == BGP_PEER_EBGP)) {
ret = sockopt_ttl(peer->su.sa.sa_family, bgp_sock, peer->ttl);
if (ret) {
flog_err(

4
bgpd/bgp_route.c
View File

@ -914,8 +914,8 @@ static int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
pair (newm, existm) with the cluster list length. Prefer the
path with smaller cluster list length. */
if (newm == existm) {
if (peer_sort(new->peer) == BGP_PEER_IBGP
&& peer_sort(exist->peer) == BGP_PEER_IBGP
if (peer_sort_lookup(new->peer) == BGP_PEER_IBGP
&& peer_sort_lookup(exist->peer) == BGP_PEER_IBGP
&& (mpath_cfg == NULL
|| CHECK_FLAG(
mpath_cfg->ibgp_flags,

5
bgpd/bgpd.c
View File

@ -961,6 +961,11 @@ bgp_peer_sort_t peer_sort(struct peer *peer)
return peer->sort;
}
bgp_peer_sort_t peer_sort_lookup(struct peer *peer)
{
return peer->sort;
}
static void peer_free(struct peer *peer)
{
afi_t afi;

2
bgpd/bgpd.h
View File

@ -1731,6 +1731,8 @@ extern struct peer *peer_unlock_with_caller(const char *, struct peer *);
#define peer_lock(B) peer_lock_with_caller(__FUNCTION__, (B))
extern bgp_peer_sort_t peer_sort(struct peer *peer);
extern bgp_peer_sort_t peer_sort_lookup(struct peer *peer);
extern int peer_active(struct peer *);
extern int peer_active_nego(struct peer *);
extern void bgp_recalculate_all_bestpaths(struct bgp *bgp);