Merge pull request FRRouting#14243 from opensourcerouting/fix/bgpd_eb…

…gp_multihop_vty_out bgpd: Do not explicitly print MAXTTL value for ebgp-multihop vty output
donaldsharp · Aug 29, 2023 · dccd9ab · dccd9ab
2 parents 3bd869f + 767aaa3
commit dccd9ab
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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);
 		}
 	}