From be8d17335fed750196a9907dfd75140d6ff6b167 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Fri, 10 Jun 2022 16:50:24 +0300 Subject: [PATCH] bgpd: Show TTL value unconditionally for neighbors If GTSM configured - show this value, otherwise TTL. Signed-off-by: Donatas Abraitis --- bgpd/bgp_vty.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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); } } -- 2.39.5