ldpd: Adding support for LDP IGP Synchronization

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

1 files changed, 119 insertions, 2 deletions

diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c
index d8ed5cccc..609598a76 100644
--- a/ldpd/ldp_vty_exec.c
+++ b/ldpd/ldp_vty_exec.c
@@ -37,7 +37,8 @@ enum show_command {
 	SHOW_NBR,
 	SHOW_LIB,
 	SHOW_L2VPN_PW,
-	SHOW_L2VPN_BINDING
+	SHOW_L2VPN_BINDING,
+	SHOW_LDP_SYNC
 };
 
 struct show_params {
@@ -86,6 +87,10 @@ static void		 show_discovery_detail_adj_json(json_object *,
 			    struct ctl_adj *);
 static int		 show_discovery_detail_msg_json(struct imsg *,
 			    struct show_params *, json_object *);
+static int		 show_ldp_sync_msg(struct vty *, struct imsg *,
+			    struct show_params *);
+static int		 show_ldp_sync_msg_json(struct imsg *,
+			    struct show_params *, json_object *);
 
 static int		 show_nbr_msg(struct vty *, struct imsg *,
 			    struct show_params *);
@@ -122,7 +127,6 @@ static int		 show_l2vpn_pw_msg(struct vty *, struct imsg *,
 			    struct show_params *);
 static int		 show_l2vpn_pw_msg_json(struct imsg *,
 			    struct show_params *, json_object *);
-static int		 ldp_vty_connect(struct imsgbuf *);
 static int		 ldp_vty_dispatch_msg(struct vty *, struct imsg *,
 			    enum show_command, struct show_params *,
 			    json_object *);
@@ -207,6 +211,87 @@ show_interface_msg_json(struct imsg *imsg, struct show_params *params,
 }
 
 static int
+show_ldp_sync_msg(struct vty *vty, struct imsg *imsg,
+    struct show_params *params)
+{
+	struct ctl_ldp_sync	*iface;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_LDP_SYNC:
+		iface = imsg->data;
+
+		vty_out (vty, "%s:\n", iface->name);
+		if (iface->in_sync)
+			vty_out (vty, "    Status: initial label exchange complete\n");
+		else
+			vty_out (vty, "    Status: label exchange not complete\n");
+
+		if (iface->timer_running) {
+			vty_out (vty, "    Wait time: %d seconds (%d seconds left)\n",
+				iface->wait_time, iface->wait_time_remaining);
+			vty_out (vty, "    Timer is running\n");
+		} else {
+			vty_out (vty, "    Wait time: %d seconds\n",
+				iface->wait_time);
+			vty_out (vty, "    Timer is not running\n");
+		}
+
+		if (iface->peer_ldp_id.s_addr)
+			vty_out (vty, "    Peer LDP Identifier: %s:0\n",
+				inet_ntoa(iface->peer_ldp_id));
+
+		break;
+	case IMSG_CTL_END:
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+static int
+show_ldp_sync_msg_json(struct imsg *imsg, struct show_params *params,
+    json_object *json)
+{
+	struct ctl_ldp_sync	*iface;
+	json_object		*json_iface;
+
+	switch (imsg->hdr.type) {
+	case IMSG_CTL_SHOW_LDP_SYNC:
+		iface = imsg->data;
+
+		json_iface = json_object_new_object();
+		json_object_string_add(json_iface, "state",
+		    iface->in_sync
+		    ? "labelExchangeComplete"
+		    : "labelExchangeNotComplete");
+		json_object_int_add(json_iface, "waitTime",
+		    iface->wait_time);
+		json_object_int_add(json_iface, "waitTimeRemaining",
+		    iface->wait_time_remaining);
+
+		if (iface->timer_running)
+			json_object_boolean_true_add(json_iface, "timerRunning");
+		else
+			json_object_boolean_false_add(json_iface, "timerRunning");
+
+		json_object_string_add(json_iface, "peerLdpId",
+		    iface->peer_ldp_id.s_addr ?
+		    inet_ntoa(iface->peer_ldp_id) : "");
+
+		json_object_object_add(json, iface->name, json_iface);
+		break;
+	case IMSG_CTL_END:
+		return (1);
+	default:
+		break;
+	}
+
+	return (0);
+}
+
+static int
 show_discovery_msg(struct vty *vty, struct imsg *imsg,
     struct show_params *params)
 {
@@ -1437,6 +1522,20 @@ ldp_vty_dispatch_iface(struct vty *vty, struct imsg *imsg,
 }
 
 static int
+ldp_vty_dispatch_ldp_sync(struct vty *vty, struct imsg *imsg,
+    struct show_params *params, json_object *json)
+{
+	int	 ret;
+
+	if (params->json)
+		ret = show_ldp_sync_msg_json(imsg, params, json);
+	else
+		ret = show_ldp_sync_msg(vty, imsg, params);
+
+	return (ret);
+}
+
+static int
 ldp_vty_dispatch_disc(struct vty *vty, struct imsg *imsg,
     struct show_params *params, json_object *json)
 {
@@ -1684,6 +1783,8 @@ ldp_vty_dispatch_msg(struct vty *vty, struct imsg *imsg, enum show_command cmd,
 	case SHOW_L2VPN_BINDING:
 		return (ldp_vty_dispatch_l2vpn_binding(vty, imsg, params,
 		    json));
+	case SHOW_LDP_SYNC:
+		return (ldp_vty_dispatch_ldp_sync(vty, imsg, params, json));
 	default:
 		return (0);
 	}
@@ -1946,6 +2047,22 @@ ldp_vty_show_neighbor(struct vty *vty, const char *lsr_id, int capabilities,
 }
 
 int
+ldp_vty_show_ldp_sync(struct vty *vty, const char *json)
+{
+	struct imsgbuf		 ibuf;
+	struct show_params	 params;
+
+	if (ldp_vty_connect(&ibuf) < 0)
+		return (CMD_WARNING);
+
+	memset(&params, 0, sizeof(params));
+	params.json = (json) ? 1 : 0;
+
+	imsg_compose(&ibuf, IMSG_CTL_SHOW_LDP_SYNC, 0, 0, -1, NULL, 0);
+	return (ldp_vty_dispatch(vty, &ibuf, SHOW_LDP_SYNC, &params));
+}
+
+int
 ldp_vty_show_atom_binding(struct vty *vty, const char *peer,
     unsigned long local_label, unsigned long remote_label, const char *json)
 {