From: Donald Sharp Date: Wed, 21 Nov 2018 21:13:25 +0000 (-0500) Subject: vtysh: Don't attempt to reconnect the non-instanced ospf process X-Git-Tag: frr-7.1-dev~163^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b2443937b06d79f1caa46cdb7625e3d6831b2166;p=mirror%2Ffrr.git 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 --- diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index cd78551cb4..f57a4d9ddf 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -577,7 +577,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