From b84bce2ad145ea70cc65345a1f18ca14652cfeb2 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 21 Nov 2018 16:13:25 -0500 Subject: [PATCH] vtysh: Don't attempt to reconnect the non-instanced ospf process When running ospf instances we should not attempt to reconnect the default ospf instance on running a command. This commit should be targeted enough because in the case of normal operation we connect to everything we should and only set the VTYSH_WAS_ACTIVE flag for those we truly have lost connection too. Before: donna.cumulusnetworks.com# config t donna.cumulusnetworks.com(config)# router ospf 100 Warning: connecting to ospfd...failed! donna.cumulusnetworks.com(config-router)# After: donna.cumulusnetworks.com# conf t donna.cumulusnetworks.com(config)# router ospf 100 donna.cumulusnetworks.com(config-router)# end donna.cumulusnetworks.com# Signed-off-by: Donald Sharp --- vtysh/vtysh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 8f998f84d2..b42b56e9ef 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -576,7 +576,7 @@ static int vtysh_execute_func(const char *line, int pager) && (cmd->daemon == vtysh_client[i].flag)) { for (vc = &vtysh_client[i]; vc; vc = vc->next) - if (vc->fd < 0) + if (vc->fd == VTYSH_WAS_ACTIVE) vtysh_reconnect(vc); } if (vtysh_client[i].fd < 0 -- 2.39.5