ldpd: json support for show commands

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

1 files changed, 324 insertions, 121 deletions

diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c
index a57cf3c3f..061bbeaa5 100644
--- a/ldpd/ldp_vty_exec.c
+++ b/ldpd/ldp_vty_exec.c
@@ -27,6 +27,7 @@
 #include "lde.h"
 #include "log.h"
 #include "ldp_vty.h"
+#include "lib/json.h"
 
 #include "command.h"
 #include "vty.h"
@@ -50,29 +51,31 @@ struct show_filter {
 #define LDPBUFSIZ	65535
 
 static int		 show_interface_msg(struct vty *, struct imsg *,
-			    struct show_filter *);
+			    struct show_filter *, json_object *);
 static void		 show_discovery_adj(struct vty *, char *,
-			    struct ctl_adj *);
+			    struct ctl_adj *, json_object *);
 static int		 show_discovery_msg(struct vty *, struct imsg *,
-			    struct show_filter *);
-static void		 show_nbr_adj(struct vty *, char *, struct ctl_adj *);
+			    struct show_filter *, json_object *);
+static void		 show_nbr_adj(struct vty *, char *, struct ctl_adj *,
+                                      json_object *);
 static int		 show_nbr_msg(struct vty *, struct imsg *,
-			    struct show_filter *);
+			    struct show_filter *, json_object *, struct in_addr *);
 static int		 show_lib_msg(struct vty *, struct imsg *,
-			    struct show_filter *);
+			    struct show_filter *, json_object *);
 static int		 show_l2vpn_binding_msg(struct vty *, struct imsg *);
 static int		 show_l2vpn_pw_msg(struct vty *, struct imsg *);
 static int		 ldp_vty_connect(struct imsgbuf *);
 static int		 ldp_vty_dispatch(struct vty *, struct imsgbuf *,
-			    enum show_command, struct show_filter *);
+			    enum show_command, struct show_filter *, u_char);
 static int		 ldp_vty_get_af(const char *, int *);
 
 static int
 show_interface_msg(struct vty *vty, struct imsg *imsg,
-    struct show_filter *filter)
+    struct show_filter *filter, json_object *json)
 {
 	struct ctl_iface	*iface;
 	char			 timers[BUFSIZ];
+        json_object *json_iface = NULL;
 
 	switch (imsg->hdr.type) {
 	case IMSG_CTL_SHOW_INTERFACE:
@@ -81,14 +84,25 @@ show_interface_msg(struct vty *vty, struct imsg *imsg,
 		if (filter->family != AF_UNSPEC && filter->family != iface->af)
 			break;
 
-		snprintf(timers, sizeof(timers), "%u/%u",
-		    iface->hello_interval, iface->hello_holdtime);
-
-		vty_out(vty, "%-4s %-11s %-6s %-8s %-12s %3u%s",
-		    af_name(iface->af), iface->name,
-		    if_state_name(iface->state), iface->uptime == 0 ?
-		    "00:00:00" : log_time(iface->uptime), timers,
-		    iface->adj_cnt, VTY_NEWLINE);
+                if (json) {
+                        json_iface = json_object_new_object();
+                        json_object_string_add(json_iface, "addressFamily", af_name(iface->af));
+                        json_object_string_add(json_iface, "state", if_state_name(iface->state));
+                        json_object_string_add(json_iface, "uptime", log_time(iface->uptime));
+                        json_object_int_add(json_iface, "helloInterval", iface->hello_interval);
+                        json_object_int_add(json_iface, "holdtime", iface->hello_holdtime);
+                        json_object_int_add(json_iface, "adjacencyCount", iface->adj_cnt);
+                        json_object_object_add(json, iface->name, json_iface);
+                } else {
+                        snprintf(timers, sizeof(timers), "%u/%u",
+                                 iface->hello_interval, iface->hello_holdtime);
+
+                        vty_out(vty, "%-4s %-11s %-6s %-8s %-12s %3u%s",
+                                af_name(iface->af), iface->name,
+                                if_state_name(iface->state), iface->uptime == 0 ?
+                                "00:00:00" : log_time(iface->uptime), timers,
+                                iface->adj_cnt, VTY_NEWLINE);
+                }
 		break;
 	case IMSG_CTL_END:
 		vty_out(vty, "%s", VTY_NEWLINE);
@@ -101,22 +115,52 @@ show_interface_msg(struct vty *vty, struct imsg *imsg,
 }
 
 static void
-show_discovery_adj(struct vty *vty, char *buffer, struct ctl_adj *adj)
+show_discovery_adj(struct vty *vty, char *buffer, struct ctl_adj *adj, json_object *json)
 {
 	size_t	 buflen = strlen(buffer);
-
-	snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-	    "      LDP Id: %s:0, Transport address: %s%s",
-	    inet_ntoa(adj->id), log_addr(adj->af,
-	    &adj->trans_addr), VTY_NEWLINE);
-	buflen = strlen(buffer);
-	snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-	    "          Hold time: %u sec%s", adj->holdtime, VTY_NEWLINE);
+        json_object *json_adj = NULL;
+        json_object *json_array = NULL;
+
+        if (json) {
+                switch(adj->type) {
+                case HELLO_LINK:
+                        json_object_object_get_ex(json, "adjacencyLink", &json_array);
+
+                        if (!json_array) {
+                                json_array = json_object_new_array();
+                                json_object_object_add(json, "adjacencyLink", json_array);
+                        }
+                        break;
+                case HELLO_TARGETED:
+                        json_object_object_get_ex(json, "adjacencyTargeted", &json_array);
+
+                        if (!json_array) {
+                                json_array = json_object_new_array();
+                                json_object_object_add(json, "adjacencyTargeted", json_array);
+                        }
+                        break;
+                }
+
+                json_adj = json_object_new_object();
+                json_object_string_add(json_adj, "id", inet_ntoa(adj->id));
+                json_object_string_add(json_adj, "transportAddress", log_addr(adj->af, &adj->trans_addr));
+                json_object_int_add(json_adj, "holdtime", adj->holdtime);
+                json_object_array_add(json_array, json_adj);
+
+        } else {
+                snprintf(buffer + buflen, LDPBUFSIZ - buflen,
+                         "      LDP Id: %s:0, Transport address: %s%s",
+                         inet_ntoa(adj->id), log_addr(adj->af,
+                         &adj->trans_addr), VTY_NEWLINE);
+                buflen = strlen(buffer);
+                snprintf(buffer + buflen, LDPBUFSIZ - buflen,
+                         "          Hold time: %u sec%s", adj->holdtime, VTY_NEWLINE);
+        }
 }
 
 static int
 show_discovery_msg(struct vty *vty, struct imsg *imsg,
-    struct show_filter *filter)
+    struct show_filter *filter, json_object *json)
 {
 	struct ctl_adj		*adj;
 	struct ctl_disc_if	*iface;
@@ -126,6 +170,10 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg,
 	size_t			 buflen;
 	static char		 ifaces_buffer[LDPBUFSIZ];
 	static char		 tnbrs_buffer[LDPBUFSIZ];
+        json_object *json_interface = NULL;
+        json_object *json_interfaces = NULL;
+        json_object *json_target = NULL;
+        json_object *json_targets = NULL;
 
 	switch (imsg->hdr.type) {
 	case IMSG_CTL_SHOW_DISCOVERY:
@@ -140,10 +188,28 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg,
 		    (filter->family == AF_INET6 && !iface->active_v6)))
 			break;
 
-		buflen = strlen(ifaces_buffer);
-		snprintf(ifaces_buffer + buflen, LDPBUFSIZ - buflen,
-		     "    %s: %s%s", iface->name, (iface->no_adj) ?
-		    "xmit" : "xmit/recv", VTY_NEWLINE);
+                if (json) {
+                        json_object_object_get_ex(json, "interfaces", &json_interfaces);
+
+                        if (!json_interfaces) {
+                                json_interfaces = json_object_new_object();
+                                json_object_object_add(json, "interfaces", json_interfaces);
+                        }
+
+                        json_interface = json_object_new_object();
+                        json_object_boolean_true_add(json_interface, "transmit");
+
+                        if (iface->no_adj)
+                                json_object_boolean_true_add(json_interface, "receive");
+
+                        json_object_object_add(json_interfaces, iface->name, json_interface);
+
+                } else {
+                        buflen = strlen(ifaces_buffer);
+                        snprintf(ifaces_buffer + buflen, LDPBUFSIZ - buflen,
+                                 "    %s: %s%s", iface->name, (iface->no_adj) ?
+                                 "xmit" : "xmit/recv", VTY_NEWLINE);
+                }
 		break;
 	case IMSG_CTL_SHOW_DISC_TNBR:
 		tnbr = imsg->data;
@@ -151,13 +217,31 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg,
 		if (filter->family != AF_UNSPEC && filter->family != tnbr->af)
 			break;
 
-		trans_addr = &(ldp_af_conf_get(ldpd_conf,
-		    tnbr->af))->trans_addr;
-		buflen = strlen(tnbrs_buffer);
-		snprintf(tnbrs_buffer + buflen, LDPBUFSIZ - buflen,
-		    "    %s -> %s: %s%s", log_addr(tnbr->af, trans_addr),
-		    log_addr(tnbr->af, &tnbr->addr), (tnbr->no_adj) ? "xmit" :
-		    "xmit/recv", VTY_NEWLINE);
+		trans_addr = &(ldp_af_conf_get(ldpd_conf, tnbr->af))->trans_addr;
+
+                if (json) {
+                        json_object_object_get_ex(json, "targeted", &json_targets);
+
+                        if (!json_targets) {
+                                json_targets = json_object_new_array();
+                                json_object_object_add(json, "targeted", json_targets);
+                        }
+
+                        json_target = json_object_new_object();
+                        json_object_string_add(json_target, "sourceAddress", log_addr(tnbr->af, trans_addr));
+                        json_object_boolean_true_add(json_target, "transmit");
+
+                        if (tnbr->no_adj)
+                                json_object_boolean_true_add(json_target, "receive");
+
+                        json_object_object_add(json_targets, log_addr(tnbr->af, &tnbr->addr), json_interface);
+                } else {
+                        buflen = strlen(tnbrs_buffer);
+                        snprintf(tnbrs_buffer + buflen, LDPBUFSIZ - buflen,
+                                 "    %s -> %s: %s%s", log_addr(tnbr->af, trans_addr),
+                                 log_addr(tnbr->af, &tnbr->addr), (tnbr->no_adj) ? "xmit" :
+                                 "xmit/recv", VTY_NEWLINE);
+                }
 		break;
 	case IMSG_CTL_SHOW_DISC_ADJ:
 		adj = imsg->data;
@@ -167,24 +251,29 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg,
 
 		switch(adj->type) {
 		case HELLO_LINK:
-			show_discovery_adj(vty, ifaces_buffer, adj);
+			show_discovery_adj(vty, ifaces_buffer, adj, json);
 			break;
 		case HELLO_TARGETED:
-			show_discovery_adj(vty, tnbrs_buffer, adj);
+			show_discovery_adj(vty, tnbrs_buffer, adj, json);
 			break;
 		}
 		break;
 	case IMSG_CTL_END:
 		rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf);
-		vty_out(vty, "Local LDP Identifier: %s:0%s", inet_ntoa(rtr_id),
-		    VTY_NEWLINE);
-		vty_out(vty, "Discovery Sources:%s", VTY_NEWLINE);
-		vty_out(vty, "  Interfaces:%s", VTY_NEWLINE);
-		vty_out(vty, "%s", ifaces_buffer);
-		vty_out(vty, "  Targeted Hellos:%s", VTY_NEWLINE);
-		vty_out(vty, "%s", tnbrs_buffer);
-		vty_out(vty, "%s", VTY_NEWLINE);
-		return (1);
+
+                if (json) {
+                        json_object_string_add(json, "id", inet_ntoa(rtr_id));
+                } else {
+                        vty_out(vty, "Local LDP Identifier: %s:0%s", inet_ntoa(rtr_id),
+                                VTY_NEWLINE);
+                        vty_out(vty, "Discovery Sources:%s", VTY_NEWLINE);
+                        vty_out(vty, "  Interfaces:%s", VTY_NEWLINE);
+                        vty_out(vty, "%s", ifaces_buffer);
+                        vty_out(vty, "  Targeted Hellos:%s", VTY_NEWLINE);
+                        vty_out(vty, "%s", tnbrs_buffer);
+                        vty_out(vty, "%s", VTY_NEWLINE);
+                }
+                return (1);
 	default:
 		break;
 	}
@@ -193,75 +282,131 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg,
 }
 
 static void
-show_nbr_adj(struct vty *vty, char *buffer, struct ctl_adj *adj)
+show_nbr_adj(struct vty *vty, char *buffer, struct ctl_adj *adj, json_object *json_nbr)
 {
 	size_t	 buflen = strlen(buffer);
+        json_object *json_adj_link = NULL;
+        json_object *json_adj_targeted = NULL;
 
 	switch (adj->type) {
 	case HELLO_LINK:
-		snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-		    "      Interface: %s%s", adj->ifname, VTY_NEWLINE);
+                if (json_nbr) {
+                        json_object_object_get_ex(json_nbr, "adjacencyLink", &json_adj_link);
+
+                        if (!json_adj_link) {
+                                json_adj_link = json_object_new_array();
+                                json_object_object_add(json_nbr, "adjacencyLink", json_adj_link);
+                        }
+
+                        json_object_array_add(json_adj_link, json_object_new_string(adj->ifname));
+                } else {
+                        snprintf(buffer + buflen, LDPBUFSIZ - buflen,
+                                 "      Interface: %s%s", adj->ifname, VTY_NEWLINE);
+                }
 		break;
 	case HELLO_TARGETED:
-		snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-		    "      Targeted Hello: %s%s", log_addr(adj->af,
-		    &adj->src_addr), VTY_NEWLINE);
+                if (json_nbr) {
+                        json_object_object_get_ex(json_nbr, "adjacencyTargeted", &json_adj_targeted);
+
+                        if (!json_adj_targeted) {
+                                json_adj_targeted = json_object_new_array();
+                                json_object_object_add(json_nbr, "adjacencyTargeted", json_adj_targeted);
+                        }
+
+                        json_object_array_add(json_adj_targeted,
+                                              json_object_new_string(log_addr(adj->af, &adj->src_addr)));
+                } else {
+                        snprintf(buffer + buflen, LDPBUFSIZ - buflen,
+                                 "      Targeted Hello: %s%s", log_addr(adj->af,
+                                 &adj->src_addr), VTY_NEWLINE);
+                }
 		break;
 	}
 }
 
 static int
-show_nbr_msg(struct vty *vty, struct imsg *imsg, struct show_filter *filter)
+show_nbr_msg(struct vty *vty, struct imsg *imsg, struct show_filter *filter,
+             json_object *json, struct in_addr *nbr_id)
 {
 	struct ctl_adj		*adj;
 	struct ctl_nbr		*nbr;
 	static char		 v4adjs_buffer[LDPBUFSIZ];
 	static char		 v6adjs_buffer[LDPBUFSIZ];
+        json_object             *json_nbr = NULL;
 
 	switch (imsg->hdr.type) {
 	case IMSG_CTL_SHOW_NBR:
 		nbr = imsg->data;
 
-		v4adjs_buffer[0] = '\0';
-		v6adjs_buffer[0] = '\0';
-		vty_out(vty, "Peer LDP Identifier: %s:0%s", inet_ntoa(nbr->id),
-		    VTY_NEWLINE);
-		vty_out(vty, "  TCP connection: %s:%u - %s:%u%s",
-		    log_addr(nbr->af, &nbr->laddr), ntohs(nbr->lport),
-		    log_addr(nbr->af, &nbr->raddr), ntohs(nbr->rport),
-		    VTY_NEWLINE);
-		vty_out(vty, "  Session Holdtime: %u sec%s", nbr->holdtime,
-		    VTY_NEWLINE);
-		vty_out(vty, "  State: %s; Downstream-Unsolicited%s",
-		    nbr_state_name(nbr->nbr_state), VTY_NEWLINE);
-		vty_out(vty, "  Up time: %s%s", log_time(nbr->uptime),
-		    VTY_NEWLINE);
+                if (json) {
+                        /* Remember the nbr->id so when we are in the other
+                         * case statements below we know what nbr we are
+                         * dealing with
+                         */
+                        *nbr_id = nbr->id;
+                        json_nbr = json_object_new_object();
+                        json_object_string_add(json_nbr, "peerId", inet_ntoa(nbr->id));
+                        json_object_string_add(json_nbr, "tcpLocalAddress", log_addr(nbr->af, &nbr->laddr));
+                        json_object_int_add(json_nbr, "tcpLocalPort", ntohs(nbr->lport));
+                        json_object_string_add(json_nbr, "tcpRemoteAddress", log_addr(nbr->af, &nbr->raddr));
+                        json_object_int_add(json_nbr, "tcpRemotePort", ntohs(nbr->rport));
+                        json_object_int_add(json_nbr, "holdtime", nbr->holdtime);
+                        json_object_string_add(json_nbr, "state", nbr_state_name(nbr->nbr_state));
+                        json_object_boolean_true_add(json_nbr, "downstreamUnsolicited");
+                        json_object_string_add(json_nbr, "upTime", log_time(nbr->uptime));
+                        json_object_object_add(json, inet_ntoa(nbr->id), json_nbr);
+
+                } else {
+                        v4adjs_buffer[0] = '\0';
+                        v6adjs_buffer[0] = '\0';
+                        vty_out(vty, "Peer LDP Identifier: %s:0%s", inet_ntoa(nbr->id),
+                            VTY_NEWLINE);
+                        vty_out(vty, "  TCP connection: %s:%u - %s:%u%s",
+                            log_addr(nbr->af, &nbr->laddr), ntohs(nbr->lport),
+                            log_addr(nbr->af, &nbr->raddr), ntohs(nbr->rport),
+                            VTY_NEWLINE);
+                        vty_out(vty, "  Session Holdtime: %u sec%s", nbr->holdtime,
+                            VTY_NEWLINE);
+                        vty_out(vty, "  State: %s; Downstream-Unsolicited%s",
+                            nbr_state_name(nbr->nbr_state), VTY_NEWLINE);
+                        vty_out(vty, "  Up time: %s%s", log_time(nbr->uptime),
+                            VTY_NEWLINE);
+                }
 		break;
 	case IMSG_CTL_SHOW_NBR_DISC:
 		adj = imsg->data;
 
+                /* get the json_nbr by looking for the nbr_id key */
+                if (json)
+                        json_object_object_get_ex(json, inet_ntoa(*nbr_id), &json_nbr);
+
 		switch (adj->af) {
 		case AF_INET:
-			show_nbr_adj(vty, v4adjs_buffer, adj);
+			show_nbr_adj(vty, v4adjs_buffer, adj, json_nbr);
 			break;
 		case AF_INET6:
-			show_nbr_adj(vty, v6adjs_buffer, adj);
+			show_nbr_adj(vty, v6adjs_buffer, adj, json_nbr);
 			break;
 		default:
 			fatalx("show_nbr_msg: unknown af");
-		}
+                }
 		break;
 	case IMSG_CTL_SHOW_NBR_END:
-		vty_out(vty, "  LDP Discovery Sources:%s", VTY_NEWLINE);
-		if (v4adjs_buffer[0] != '\0') {
-			vty_out(vty, "    IPv4:%s", VTY_NEWLINE);
-			vty_out(vty, "%s", v4adjs_buffer);
-		}
-		if (v6adjs_buffer[0] != '\0') {
-			vty_out(vty, "    IPv6:%s", VTY_NEWLINE);
-			vty_out(vty, "%s", v6adjs_buffer);
-		}
-		vty_out(vty, "%s", VTY_NEWLINE);
+                /* For the json scenario the adjacencies were already added
+                 * in show_nbr_adj
+                 */
+                if (!json) {
+                        vty_out(vty, "  LDP Discovery Sources:%s", VTY_NEWLINE);
+                        if (v4adjs_buffer[0] != '\0') {
+                                vty_out(vty, "    IPv4:%s", VTY_NEWLINE);
+                                vty_out(vty, "%s", v4adjs_buffer);
+                        }
+                        if (v6adjs_buffer[0] != '\0') {
+                                vty_out(vty, "    IPv6:%s", VTY_NEWLINE);
+                                vty_out(vty, "%s", v6adjs_buffer);
+                        }
+                        vty_out(vty, "%s", VTY_NEWLINE);
+                }
 		break;
 	case IMSG_CTL_END:
 		return (1);
@@ -273,10 +418,13 @@ show_nbr_msg(struct vty *vty, struct imsg *imsg, struct show_filter *filter)
 }
 
 static int
-show_lib_msg(struct vty *vty, struct imsg *imsg, struct show_filter *filter)
+show_lib_msg(struct vty *vty, struct imsg *imsg, struct show_filter *filter, json_object *json)
 {
 	struct ctl_rt	*rt;
 	char		 dstnet[BUFSIZ];
+        json_object *json_binding = NULL;
+        json_object *json_remote_label = NULL;
+        json_object *json_remote_labels = NULL;
 
 	switch (imsg->hdr.type) {
 	case IMSG_CTL_SHOW_LIB:
@@ -286,27 +434,50 @@ show_lib_msg(struct vty *vty, struct imsg *imsg, struct show_filter *filter)
 			break;
 
 		snprintf(dstnet, sizeof(dstnet), "%s/%d",
-		    log_addr(rt->af, &rt->prefix), rt->prefixlen);
-
-		if (rt->first) {
-			vty_out(vty, "%s%s", dstnet, VTY_NEWLINE);
-			vty_out(vty, "%-8sLocal binding: label: %s%s", "",
-			    log_label(rt->local_label), VTY_NEWLINE);
-
-			if (rt->remote_label != NO_LABEL) {
-				vty_out(vty, "%-8sRemote bindings:%s", "",
-				    VTY_NEWLINE);
-				vty_out(vty, "%-12sPeer                Label%s",
-				    "", VTY_NEWLINE);
-				vty_out(vty, "%-12s-----------------   "
-				    "---------%s", "", VTY_NEWLINE);
-			} else
-				vty_out(vty, "%-8sNo remote bindings%s", "",
-				    VTY_NEWLINE);
-		}
-		if (rt->remote_label != NO_LABEL)
-			vty_out(vty, "%12s%-20s%s%s", "", inet_ntoa(rt->nexthop),
-			    log_label(rt->remote_label), VTY_NEWLINE);
+		         log_addr(rt->af, &rt->prefix), rt->prefixlen);
+
+                if (json) {
+                        if (rt->first) {
+                                json_binding = json_object_new_object();
+                                json_object_string_add(json_binding, "localLabel", log_label(rt->local_label));
+
+                                json_remote_labels = json_object_new_array();
+                                json_object_object_add(json_binding, "remoteLabel", json_remote_labels);
+
+                                json_object_object_add(json, dstnet, json_binding);
+                        } else {
+                                json_object_object_get_ex(json, dstnet, &json_binding);
+                        }
+
+                        if (rt->remote_label != NO_LABEL) {
+                                json_object_object_get_ex(json_binding, "remoteLabel", &json_remote_labels);
+                                json_remote_label = json_object_new_object();
+                                json_object_string_add(json_remote_label, "nexthop", inet_ntoa(rt->nexthop));
+                                json_object_string_add(json_remote_label, "label", log_label(rt->remote_label));
+                                json_object_array_add(json_remote_labels, json_remote_label);
+                        }
+
+                } else {
+                        if (rt->first) {
+                                vty_out(vty, "%s%s", dstnet, VTY_NEWLINE);
+                                vty_out(vty, "%-8sLocal binding: label: %s%s", "",
+                                        log_label(rt->local_label), VTY_NEWLINE);
+
+                                if (rt->remote_label != NO_LABEL) {
+                                        vty_out(vty, "%-8sRemote bindings:%s", "",
+                                                VTY_NEWLINE);
+                                        vty_out(vty, "%-12sPeer                Label%s",
+                                                "", VTY_NEWLINE);
+                                        vty_out(vty, "%-12s-----------------   "
+                                                "---------%s", "", VTY_NEWLINE);
+                                } else
+                                        vty_out(vty, "%-8sNo remote bindings%s", "",
+                                                VTY_NEWLINE);
+                        }
+                        if (rt->remote_label != NO_LABEL)
+                                vty_out(vty, "%12s%-20s%s%s", "", inet_ntoa(rt->nexthop),
+                                        log_label(rt->remote_label), VTY_NEWLINE);
+                }
 		break;
 	case IMSG_CTL_END:
 		vty_out(vty, "%s", VTY_NEWLINE);
@@ -419,10 +590,12 @@ ldp_vty_connect(struct imsgbuf *ibuf)
 
 static int
 ldp_vty_dispatch(struct vty *vty, struct imsgbuf *ibuf, enum show_command cmd,
-    struct show_filter *filter)
+    struct show_filter *filter, u_char uj)
 {
 	struct imsg		 imsg;
 	int			 n, done = 0;
+        struct in_addr           nbr_id;
+        json_object              *json = NULL;
 
 	while (ibuf->w.queued)
 		if (msgbuf_write(&ibuf->w) <= 0 && errno != EAGAIN) {
@@ -431,15 +604,30 @@ ldp_vty_dispatch(struct vty *vty, struct imsgbuf *ibuf, enum show_command cmd,
 			return (CMD_WARNING);
 		}
 
+        if (uj)
+                json = json_object_new_object();
+
 	while (!done) {
 		if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN) {
 			log_warnx("imsg_read error");
 			close(ibuf->fd);
+                        if (json) {
+                                vty_out (vty, "%s%s",
+                                         json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY),
+                                         VTY_NEWLINE);
+                                json_object_free(json);
+                        }
 			return (CMD_WARNING);
 		}
 		if (n == 0) {
 			log_warnx("pipe closed");
 			close(ibuf->fd);
+                        if (json) {
+                                vty_out (vty, "%s%s",
+                                         json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY),
+                                         VTY_NEWLINE);
+                                json_object_free(json);
+                        }
 			return (CMD_WARNING);
 		}
 
@@ -447,22 +635,28 @@ ldp_vty_dispatch(struct vty *vty, struct imsgbuf *ibuf, enum show_command cmd,
 			if ((n = imsg_get(ibuf, &imsg)) == -1) {
 				log_warnx("imsg_get error");
 				close(ibuf->fd);
+                                if (json) {
+                                        vty_out (vty, "%s%s",
+                                                 json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY),
+                                                 VTY_NEWLINE);
+                                        json_object_free(json);
+                                }
 				return (CMD_WARNING);
 			}
 			if (n == 0)
 				break;
 			switch (cmd) {
 			case SHOW_IFACE:
-				done = show_interface_msg(vty, &imsg, filter);
+				done = show_interface_msg(vty, &imsg, filter, json);
 				break;
 			case SHOW_DISC:
-				done = show_discovery_msg(vty, &imsg, filter);
+				done = show_discovery_msg(vty, &imsg, filter, json);
 				break;
 			case SHOW_NBR:
-				done = show_nbr_msg(vty, &imsg, filter);
+				done = show_nbr_msg(vty, &imsg, filter, json, &nbr_id);
 				break;
 			case SHOW_LIB:
-				done = show_lib_msg(vty, &imsg, filter);
+				done = show_lib_msg(vty, &imsg, filter, json);
 				break;
 			case SHOW_L2VPN_PW:
 				done = show_l2vpn_pw_msg(vty, &imsg);
@@ -479,6 +673,13 @@ ldp_vty_dispatch(struct vty *vty, struct imsgbuf *ibuf, enum show_command cmd,
 
 	close(ibuf->fd);
 
+        if (json) {
+                vty_out (vty, "%s%s",
+                         json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY),
+                         VTY_NEWLINE);
+                json_object_free(json);
+        }
+
 	return (CMD_SUCCESS);
 }
 
@@ -500,7 +701,7 @@ ldp_vty_get_af(const char *str, int *af)
 }
 
 int
-ldp_vty_show_binding(struct vty *vty, struct vty_arg *args[])
+ldp_vty_show_binding(struct vty *vty, struct vty_arg *args[], u_char uj)
 {
 	struct imsgbuf		 ibuf;
 	struct show_filter	 filter;
@@ -519,11 +720,11 @@ ldp_vty_show_binding(struct vty *vty, struct vty_arg *args[])
 	memset(&filter, 0, sizeof(filter));
 	filter.family = af;
 
-	return (ldp_vty_dispatch(vty, &ibuf, SHOW_LIB, &filter));
+	return (ldp_vty_dispatch(vty, &ibuf, SHOW_LIB, &filter, uj));
 }
 
 int
-ldp_vty_show_discovery(struct vty *vty, struct vty_arg *args[])
+ldp_vty_show_discovery(struct vty *vty, struct vty_arg *args[], u_char uj)
 {
 	struct imsgbuf		 ibuf;
 	struct show_filter	 filter;
@@ -542,11 +743,11 @@ ldp_vty_show_discovery(struct vty *vty, struct vty_arg *args[])
 	memset(&filter, 0, sizeof(filter));
 	filter.family = af;
 
-	return (ldp_vty_dispatch(vty, &ibuf, SHOW_DISC, &filter));
+	return (ldp_vty_dispatch(vty, &ibuf, SHOW_DISC, &filter, uj));
 }
 
 int
-ldp_vty_show_interface(struct vty *vty, struct vty_arg *args[])
+ldp_vty_show_interface(struct vty *vty, struct vty_arg *args[], u_char uj)
 {
 	struct imsgbuf		 ibuf;
 	struct show_filter	 filter;
@@ -568,14 +769,16 @@ ldp_vty_show_interface(struct vty *vty, struct vty_arg *args[])
 	filter.family = af;
 
 	/* header */
-	vty_out(vty, "%-4s %-11s %-6s %-8s %-12s %3s%s", "AF",
-	    "Interface", "State", "Uptime", "Hello Timers", "ac", VTY_NEWLINE);
+        if (!uj) {
+	        vty_out(vty, "%-4s %-11s %-6s %-8s %-12s %3s%s", "AF",
+	                "Interface", "State", "Uptime", "Hello Timers", "ac", VTY_NEWLINE);
+        }
 
-	return (ldp_vty_dispatch(vty, &ibuf, SHOW_IFACE, &filter));
+	return (ldp_vty_dispatch(vty, &ibuf, SHOW_IFACE, &filter, uj));
 }
 
 int
-ldp_vty_show_neighbor(struct vty *vty, struct vty_arg *args[])
+ldp_vty_show_neighbor(struct vty *vty, struct vty_arg *args[], u_char uj)
 {
 	struct imsgbuf		 ibuf;
 	struct show_filter	 filter;
@@ -588,7 +791,7 @@ ldp_vty_show_neighbor(struct vty *vty, struct vty_arg *args[])
 	/* not used */
 	memset(&filter, 0, sizeof(filter));
 
-	return (ldp_vty_dispatch(vty, &ibuf, SHOW_NBR, &filter));
+	return (ldp_vty_dispatch(vty, &ibuf, SHOW_NBR, &filter, uj));
 }
 
 int
@@ -605,7 +808,7 @@ ldp_vty_show_atom_binding(struct vty *vty, struct vty_arg *args[])
 	/* not used */
 	memset(&filter, 0, sizeof(filter));
 
-	return (ldp_vty_dispatch(vty, &ibuf, SHOW_L2VPN_BINDING, &filter));
+	return (ldp_vty_dispatch(vty, &ibuf, SHOW_L2VPN_BINDING, &filter, 0));
 }
 
 int
@@ -629,7 +832,7 @@ ldp_vty_show_atom_vc(struct vty *vty, struct vty_arg *args[])
 	    "---------", "---------------", "----------",
 	    "----------------", "----------", VTY_NEWLINE);
 
-	return (ldp_vty_dispatch(vty, &ibuf, SHOW_L2VPN_PW, &filter));
+	return (ldp_vty_dispatch(vty, &ibuf, SHOW_L2VPN_PW, &filter, 0));
 }
 
 int