2003-06-15 Paul Jakma <paul@dishone.st>

	* 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().
diff --git a/zebra/zserv.h b/zebra/zserv.h
index ec3c9f4..42fb64c 100644
--- a/zebra/zserv.h
+++ b/zebra/zserv.h
@@ -56,6 +56,18 @@
   u_char ifinfo;
 };
 
+/* Zebra instance */
+struct zebra_t
+{
+  /* Thread master */
+  struct thread_master *master;
+  list client_list;
+
+  /* default table */
+  int rtm_table_default;
+  
+};
+
 /* Count prefix size from mask length */
 #define PSIZE(a) (((a) + 7) / (8))