summaryrefslogtreecommitdiff
path: root/lib/vty.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2017-06-21 20:06:44 +0000
committerQuentin Young <qlyoung@cumulusnetworks.com>2017-06-21 20:06:44 +0000
commite82a17c61b49e4bfa462bceac08ed7ae2a54e254 (patch)
tree5c628c50fd51c04ab893440776b6fd529ad62f06 /lib/vty.c
parent8ea37652c714edcd913d5dc02a0bfc5968fdc45e (diff)
lib: actually exit when asked to do so
When vtysh sends 'exit' to a daemon, we set the vty->status to VTY_CLOSE but never actually close the connection. Lovely. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'lib/vty.c')
-rw-r--r--lib/vty.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 19f9223d37..54a5f727e1 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2212,7 +2212,10 @@ vtysh_read (struct thread *thread)
}
}
- vty_event (VTYSH_READ, sock, vty);
+ if (vty->status == VTY_CLOSE)
+ vty_close (vty);
+ else
+ vty_event (VTYSH_READ, sock, vty);
return 0;
}