From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Fri, 10 Jun 2022 13:50:24 +0000 (+0300)
Subject: bgpd: Show TTL value unconditionally for neighbors
X-Git-Tag: base_8.4~365^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F11392%2Fhead;p=mirror%2Ffrr.git

bgpd: Show TTL value unconditionally for neighbors

If GTSM configured - show this value, otherwise TTL.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 0a4083e5f6..17ea915c27 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -13950,7 +13950,7 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
 				json_object_int_add(json_neigh,
 						    "externalBgpNbrMaxHopsAway",
 						    p->gtsm_hops);
-			else if (p->ttl > BGP_DEFAULT_TTL)
+			else
 				json_object_int_add(json_neigh,
 						    "externalBgpNbrMaxHopsAway",
 						    p->ttl);
@@ -13959,21 +13959,30 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
 				vty_out(vty,
 					"  External BGP neighbor may be up to %d hops away.\n",
 					p->gtsm_hops);
-			else if (p->ttl > BGP_DEFAULT_TTL)
+			else
 				vty_out(vty,
 					"  External BGP neighbor may be up to %d hops away.\n",
 					p->ttl);
 		}
 	} else {
-		if (p->gtsm_hops > BGP_GTSM_HOPS_DISABLED) {
-			if (use_json)
+		if (use_json) {
+			if (p->gtsm_hops > BGP_GTSM_HOPS_DISABLED)
 				json_object_int_add(json_neigh,
 						    "internalBgpNbrMaxHopsAway",
 						    p->gtsm_hops);
 			else
+				json_object_int_add(json_neigh,
+						    "internalBgpNbrMaxHopsAway",
+						    p->ttl);
+		} else {
+			if (p->gtsm_hops > BGP_GTSM_HOPS_DISABLED)
 				vty_out(vty,
 					"  Internal BGP neighbor may be up to %d hops away.\n",
 					p->gtsm_hops);
+			else
+				vty_out(vty,
+					"  Internal BGP neighbor may be up to %d hops away.\n",
+					p->ttl);
 		}
 	}