1 files changed, 11 insertions, 10 deletions

diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index d95e677f6f..999bc49d91 100644
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -87,7 +87,8 @@ static int ospf_mpls_te_del_if(struct interface *ifp);
 static void ospf_mpls_te_ism_change(struct ospf_interface *oi, int old_status);
 static void ospf_mpls_te_nsm_change(struct ospf_neighbor *nbr, int old_status);
 static void ospf_mpls_te_config_write_router(struct vty *vty);
-static void ospf_mpls_te_show_info(struct vty *vty, struct ospf_lsa *lsa);
+static void ospf_mpls_te_show_info(struct vty *vty, struct json_object *json,
+				   struct ospf_lsa *lsa);
 static int ospf_mpls_te_lsa_originate_area(void *arg);
 static int ospf_mpls_te_lsa_inter_as_as(void *arg);
 static int ospf_mpls_te_lsa_inter_as_area(void *arg);
@@ -2170,7 +2171,7 @@ static int ospf_te_parse_te(struct ls_ted *ted, struct ospf_lsa *lsa)
 	if ((len == 0) || (ntohs(tlvh->type) != TE_TLV_LINK))
 		return 0;
 
-	sum = 0;
+	sum = sizeof(struct tlv_header);
 	/* Browse sub-TLV and fulfill Link State Attributes */
 	for (tlvh = TLV_DATA(tlvh); sum < len; tlvh = TLV_HDR_NEXT(tlvh)) {
 		uint32_t val32, tab32[2];
@@ -2376,7 +2377,7 @@ static int ospf_te_delete_te(struct ls_ted *ted, struct ospf_lsa *lsa)
 	if (ntohs(tlvh->type) == TE_TLV_ROUTER_ADDR)
 		tlvh = TLV_HDR_NEXT(tlvh);
 	len = TLV_BODY_SIZE(tlvh);
-	sum = 0;
+	sum = sizeof(struct tlv_header);
 
 	/* Browse sub-TLV to find Link ID */
 	for (tlvh = TLV_DATA(tlvh); sum < len; tlvh = TLV_HDR_NEXT(tlvh)) {
@@ -3783,7 +3784,8 @@ static uint16_t ospf_mpls_te_show_link_subtlv(struct vty *vty,
 	return sum;
 }
 
-static void ospf_mpls_te_show_info(struct vty *vty, struct ospf_lsa *lsa)
+static void ospf_mpls_te_show_info(struct vty *vty, struct json_object *json,
+				   struct ospf_lsa *lsa)
 {
 	struct lsa_header *lsah = lsa->data;
 	struct tlv_header *tlvh, *next;
@@ -3791,6 +3793,9 @@ static void ospf_mpls_te_show_info(struct vty *vty, struct ospf_lsa *lsa)
 	uint16_t (*subfunc)(struct vty * vty, struct tlv_header * tlvh,
 			    uint16_t subtotal, uint16_t total) = NULL;
 
+	if (json)
+		return;
+
 	sum = 0;
 	total = lsa->size - OSPF_LSA_HEADER_SIZE;
 
@@ -4427,12 +4432,8 @@ DEFUN (show_ip_ospf_mpls_te_db,
 		ls_show_ted(OspfMplsTE.ted, vty, json, verbose);
 	}
 
-	if (uj) {
-		vty_out(vty, "%s\n",
-			json_object_to_json_string_ext(
-				json, JSON_C_TO_STRING_PRETTY));
-		json_object_free(json);
-	}
+	if (uj)
+		vty_json(vty, json);
 	return CMD_SUCCESS;
 }