From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Mon, 18 Sep 2017 16:35:10 +0000 (-0400)
Subject: vtysh: warn on cli targeting non-running daemon
X-Git-Tag: frr-4.0-dev~302^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F1195%2Fhead;p=mirror%2Ffrr.git

vtysh: warn on cli targeting non-running daemon

Presently CLI entered for daemons which are not running is accepted
quietly, which can be confusing for users. This patch warns about it
when possible.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index e8968ab896..78e64c1509 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -425,6 +425,12 @@ static int vtysh_execute_func(const char *line, int pager)
 		cmd_stat = CMD_SUCCESS;
 		for (i = 0; i < array_size(vtysh_client); i++) {
 			if (cmd->daemon & vtysh_client[i].flag) {
+				if (vtysh_client[i].fd < 0
+				    && (cmd->daemon == vtysh_client[i].flag)) {
+					fprintf(stderr, "%s is not running\n",
+						vtysh_client[i].name);
+					continue;
+				}
 				cmd_stat = vtysh_client_execute(
 					&vtysh_client[i], line, fp);
 				if (cmd_stat != CMD_SUCCESS)