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

Merge pull request #5228 from ton31337/fix/override_peers_ttl_if_peer_group_configured_7.1

Browse Source 
bgpd: [7.1] Override peer's TTL only if peer-group is configured with TTL
This commit is contained in:
Donald Sharp 2019-10-25 22:25:15 -04:00 committed by GitHub
commit 173360a40f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bgpd/bgpd.c
View File

@ -1588,7 +1588,7 @@ struct peer *peer_create(union sockunion *su, const char *conf_if,
peer->readtime = peer->resettime = bgp_clock();
/* Default TTL set. */
peer->ttl = (peer->sort == BGP_PEER_IBGP) ? MAXTTL : 1;
peer->ttl = (peer->sort == BGP_PEER_IBGP) ? MAXTTL : BGP_DEFAULT_TTL;
SET_FLAG(peer->flags, PEER_FLAG_CONFIG_NODE);
@ -1675,7 +1675,7 @@ void peer_as_change(struct peer *peer, as_t as, int as_specified)
if (peer_sort(peer) == BGP_PEER_IBGP)
peer->ttl = MAXTTL;
else if (type == BGP_PEER_IBGP)
peer->ttl = 1;
peer->ttl = BGP_DEFAULT_TTL;
/* reflector-client reset */
if (peer_sort(peer) != BGP_PEER_IBGP) {
@ -2435,7 +2435,7 @@ struct peer_group *peer_group_get(struct bgp *bgp, const char *name)
group->conf->host = XSTRDUP(MTYPE_BGP_PEER_HOST, name);
group->conf->group = group;
group->conf->as = 0;
group->conf->ttl = 1;
group->conf->ttl = BGP_DEFAULT_TTL;
group->conf->gtsm_hops = 0;
group->conf->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
SET_FLAG(group->conf->sflags, PEER_STATUS_GROUP);
@ -2460,8 +2460,9 @@ static void peer_group2peer_config_copy(struct peer_group *group,
if (!CHECK_FLAG(peer->flags_override, PEER_FLAG_LOCAL_AS))
peer->change_local_as = conf->change_local_as;
/* TTL */
peer->ttl = conf->ttl;
/* If peer-group has configured TTL then override it */
if (conf->ttl != BGP_DEFAULT_TTL)
peer->ttl = conf->ttl;
/* GTSM hops */
peer->gtsm_hops = conf->gtsm_hops;
@ -4383,7 +4384,7 @@ int peer_ebgp_multihop_unset(struct peer *peer)
if (peer_group_active(peer))
peer->ttl = peer->group->conf->ttl;
else
peer->ttl = 1;
peer->ttl = BGP_DEFAULT_TTL;
if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
if (BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
@ -4397,7 +4398,7 @@ int peer_ebgp_multihop_unset(struct peer *peer)
if (peer->sort == BGP_PEER_IBGP)
continue;
peer->ttl = 1;
peer->ttl = BGP_DEFAULT_TTL;
if (peer->fd >= 0) {
if (BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))

2
bgpd/bgpd.h
View File

@ -627,6 +627,8 @@ struct bgp_nexthop {
#define RMAP_OUT 1
#define RMAP_MAX 2
#define BGP_DEFAULT_TTL 1
#include "filter.h"
/* BGP filter structure. */