bgpd: shuffle qobj_init()

bgp_master_init is called first thing in main(), so we need to wedge a
qobj_init() call in there...  this needs some improvement...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 5ed630b49d9e791c360051f47d9ed2aa65251709..30f6e0d859a51aa4ea18414a8d07d4d534ece340 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -7477,6 +7477,8 @@ bgp_config_write (struct vty *vty)
 void
 bgp_master_init (void)
 {
+  qobj_init ();
+
   memset (&bgp_master, 0, sizeof (struct bgp_master));
 
   bm = &bgp_master;

diff --git a/lib/qobj.c b/lib/qobj.c
index aeae52e0297467dfd456e2561f091fdcddbe9ad3..8a386d24862e35a0cdf5e81c34f49d56a35aaaf0 100644 (file)
--- a/lib/qobj.c
+++ b/lib/qobj.c
@@ -73,7 +73,8 @@ void *qobj_get_typed(uint64_t id, struct qobj_nodetype *type)
 
 void qobj_init (void)
 {
-  nodes = hash_create (qobj_key, qobj_cmp);
+  if (!nodes)
+    nodes = hash_create (qobj_key, qobj_cmp);
 }
 
 void qobj_finish (void)