diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2023-08-29 22:25:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 22:25:31 -0500 |
| commit | 40ca922da062247eca7133c0131a16cc25a69c3c (patch) | |
| tree | 19f72ee2199f6615be5d88377d9cd9fdc17e017b | |
| parent | 0c4d2fdbfd90bafadc1f6f25cf00e687672acc45 (diff) | |
| parent | 73ed77f59fb6d5c0114f55a286c7cdcb5666107e (diff) | |
Merge pull request #14291 from FRRouting/mergify/bp/stable/9.0/pr-14243
bgpd: Do not explicitly print MAXTTL value for ebgp-multihop vty output (backport #14243)
| -rw-r--r-- | bgpd/bgp_vty.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index ab5eff8d07..8f7293ba9c 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -17684,8 +17684,12 @@ static void bgp_config_write_peer_global(struct vty *vty, struct bgp *bgp, && !(peer->gtsm_hops != BGP_GTSM_HOPS_DISABLED && peer->ttl == MAXTTL)) { if (!peer_group_active(peer) || g_peer->ttl != peer->ttl) { - vty_out(vty, " neighbor %s ebgp-multihop %d\n", addr, - peer->ttl); + if (peer->ttl != MAXTTL) + vty_out(vty, " neighbor %s ebgp-multihop %d\n", + addr, peer->ttl); + else + vty_out(vty, " neighbor %s ebgp-multihop\n", + addr); } } |