From b21b19c5785487f2ff4a6ce38f45c2e6c35f4363 Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 15 Jun 2003 01:28:29 +0000 Subject: 2003-06-15 Paul Jakma * lib/vty.{c,h}: Remove vty layer depending on a 'master' global, pass the thread master in explicitly to vty_init. Sort out some header dependency problems with lib/command.h * zebra/: Move globals to struct zebrad. Update vty_init(). * (.*)/\1_main.c: update call to vty_init(). --- lib/vty.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/vty.c') diff --git a/lib/vty.c b/lib/vty.c index 4d6eb304..c38ae946 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -23,16 +23,17 @@ #include #include "linklist.h" +#include "thread.h" #include "buffer.h" #include "version.h" #include "command.h" #include "sockunion.h" -#include "thread.h" #include "memory.h" #include "str.h" #include "log.h" #include "prefix.h" #include "filter.h" +#include "vty.h" #include "privs.h" /* Vty events */ @@ -2342,8 +2343,7 @@ vty_config_unlock (struct vty *vty) } /* Master of the threads. */ -extern struct thread_master *master; -/* struct thread_master *master; */ +static struct thread_master *master; static void vty_event (enum event event, int sock, struct vty *vty) @@ -2791,13 +2791,15 @@ vty_init_vtysh () /* Install vty's own commands like `who' command. */ void -vty_init () +vty_init (struct thread_master *master_thread) { /* For further configuration read, preserve current directory. */ vty_save_cwd (); vtyvec = vector_init (VECTOR_MIN_SIZE); + master = master_thread; + /* Initilize server thread vector. */ Vvty_serv_thread = vector_init (VECTOR_MIN_SIZE); -- cgit v1.2.3