summaryrefslogtreecommitdiffstats
path: root/lib/vty_io.c
diff options
context:
space:
mode:
authorChris Hall <GMCH@hestia.halldom.com>2010-06-16 21:02:37 +0100
committerChris Hall <GMCH@hestia.halldom.com>2010-06-16 21:02:37 +0100
commitdb0632a8aeb717cb715c444ae203f38ec42a92e6 (patch)
treed4da01a34a2e41796c09c2389de58fe0ccc38ee9 /lib/vty_io.c
parentd0dcbe07baffdbff39521e5ae8eca3f80a8d6f3e (diff)
downloadquagga-db0632a8aeb717cb715c444ae203f38ec42a92e6.tar.bz2
quagga-db0632a8aeb717cb715c444ae203f38ec42a92e6.tar.xz
Fixes to vty stuff so that zebra runs.
Changes to vty handling require the library to behave one way when running as part of the new (threaded) bgpd and another way when running as part of any of the other Quagga daemons. Code to revoke things from the command queue failed to test whether it was running as part of the new bgpd or not.
Diffstat (limited to 'lib/vty_io.c')
-rw-r--r--lib/vty_io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/vty_io.c b/lib/vty_io.c
index 9fd9ff2a..2eadc2d1 100644
--- a/lib/vty_io.c
+++ b/lib/vty_io.c
@@ -775,7 +775,8 @@ uty_close (vty_io vio)
{
uty_half_close(vio, NULL) ; /* place on death watch -- if not
already done */
- uty_cli_close(vio) ; /* tell the CLI to stop */
+ if (vio->type == VTY_TERM)
+ uty_cli_close(vio) ; /* tell the CLI to stop */
vio->closed = 1 ; /* now closed (stop uty_write()
from recursing) */