From db0632a8aeb717cb715c444ae203f38ec42a92e6 Mon Sep 17 00:00:00 2001 From: Chris Hall Date: Wed, 16 Jun 2010 21:02:37 +0100 Subject: 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. --- lib/vty_cli.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/vty_cli.c') diff --git a/lib/vty_cli.c b/lib/vty_cli.c index fab266b1..b4791365 100644 --- a/lib/vty_cli.c +++ b/lib/vty_cli.c @@ -349,6 +349,9 @@ uty_cli_start(vty_io vio) extern void uty_cli_close(vty_io vio) { + VTY_ASSERT_LOCKED() ; + assert(vio->type == VTY_TERM) ; + cq_revoke(vio->vty) ; vio->cli_blocked = 1 ; /* don't attempt any more */ -- cgit v1.2.3