zebra: Move zebrad initialization outside of cli init

The zebrad initialization does not need to be part of cli
initialization and should be done separately.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/zebra/main.c b/zebra/main.c
index 36c931c4ee9b6ded7afbf86be069d0aa2cd43227..872f119baf7bb05ae2483b4d745772697f098fa5 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -295,6 +295,7 @@ int main(int argc, char **argv)
        zebrad.master = frr_init();
 
        /* Zebra related initialize. */
+       zserv_init();
        zebra_init();
        rib_init();
        zebra_if_init();

diff --git a/zebra/zserv.c b/zebra/zserv.c
index b6d70084c0c389c6c379f11e954884918b732ed3..f0ba0eca6e3a1fa699100d8a39c96d308c6a5a0a 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -3298,13 +3298,16 @@ void zserv_read_file(char *input)
 }
 #endif
 
-/* Initialisation of zebra and installation of commands. */
-void zebra_init(void)
+void zserv_init(void)
 {
        /* Client list init. */
        zebrad.client_list = list_new();
        zebrad.client_list->del = (void (*)(void *))zebra_client_free;
+}
 
+/* Initialisation of zebra and installation of commands. */
+void zebra_init(void)
+{
        /* Install configuration write function. */
        install_node(&table_node, config_write_table);
        install_node(&forwarding_node, config_write_forwarding);

diff --git a/zebra/zserv.h b/zebra/zserv.h
index 6077dc105a42e26cb50c55d2d14d03ae42bf9302..c7466219c0477897ff7a292212f44b37d377c17c 100644 (file)
--- a/zebra/zserv.h
+++ b/zebra/zserv.h
@@ -148,6 +148,7 @@ extern struct zebra_t zebrad;
 extern unsigned int multipath_num;
 
 /* Prototypes. */
+extern void zserv_init(void);
 extern void zebra_init(void);
 extern void zebra_if_init(void);
 extern void zebra_zserv_socket_init(char *path);