From: lynne <lynne@voltanet.io>
Date: Fri, 18 Sep 2020 18:32:24 +0000 (-0400)
Subject: ospfd: updates to the ldp-sync ospf commands
X-Git-Tag: base_7.6~527^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9919bec70a65e68577fca31bf81217545858ce47;p=mirror%2Ffrr.git

ospfd: updates to the ldp-sync ospf commands

Improve the output of the show ip ospf mpls ldp-sync command.

Signed-off-by: Lynne Morrison <lynne@voltanet.io>
---

diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c
index a8c9df1c56..2c3b6705a3 100644
--- a/ospfd/ospf_ldp_sync.c
+++ b/ospfd/ospf_ldp_sync.c
@@ -710,8 +710,12 @@ static int show_ip_ospf_mpls_ldp_interface_common(struct vty *vty,
 			struct route_node *rn;
 			struct ospf_interface *oi;
 
-			if (ospf_oi_count(ifp) == 0)
+			if (ospf_oi_count(ifp) == 0 && !use_json) {
+				if (!if_is_up(ifp))
+					vty_out(vty, "%s\n  Interface down\n",
+						ifp->name);
 				continue;
+			}
 			for (rn = route_top(IF_OIFS(ifp)); rn;
 			     rn = route_next(rn)) {
 				oi = rn->info;
@@ -739,9 +743,12 @@ static int show_ip_ospf_mpls_ldp_interface_common(struct vty *vty,
 			struct ospf_interface *oi;
 
 			if (ospf_oi_count(ifp) == 0 && !use_json) {
-				vty_out(vty,
-					"  OSPF not enabled on this interface %s\n",
-					ifp->name);
+				if (if_is_up(ifp))
+					vty_out(vty, "%s\n  OSPF not enabled\n",
+						ifp->name);
+				else
+					vty_out(vty, "%s\n  Interface down\n",
+						ifp->name);
 				return CMD_SUCCESS;
 			}
 			for (rn = route_top(IF_OIFS(ifp)); rn;