summaryrefslogtreecommitdiff
path: root/bgpd/bgp_vty.c
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2023-08-29 08:57:51 -0400
committerGitHub <noreply@github.com>2023-08-29 08:57:51 -0400
commitdccd9ab84858b593eeceaf5208a3f24fc283c90d (patch)
tree6f75bf1abc56935d1d6bb98092a41b7dca52cedf /bgpd/bgp_vty.c
parent3bd869f63b32d4bca15791926d37936f661141cc (diff)
parent767aaa3a80489bfc4ff097f932fc347e3db25b89 (diff)
Merge pull request #14243 from opensourcerouting/fix/bgpd_ebgp_multihop_vty_out
bgpd: Do not explicitly print MAXTTL value for ebgp-multihop vty output
Diffstat (limited to 'bgpd/bgp_vty.c')
-rw-r--r--bgpd/bgp_vty.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 445dea92d5..08bec9f09f 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -17749,8 +17749,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);
}
}