summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2020-04-30 21:33:11 +0200
committerDavid Lamparter <equinox@diac24.net>2021-02-01 17:18:51 +0100
commitb2fa8c0fa30eaa72943c07786312923614ef355a (patch)
treeb73ed193a3c2151cc9d614ce45da58b96bc3a80f
parent8e427c293860576df43ead3639bac807e2a43b03 (diff)
lib/xref: put setup calls in libraries
Our "true" libraries (i.e. not modules) don't invoke neither FRR_DAEMON_INFO nor FRR_MODULE_SETUP, hence XREF_SETUP isn't invoked either. Invoke it directly to get things working. Signed-off-by: David Lamparter <equinox@diac24.net>
-rw-r--r--lib/agentx.c3
-rw-r--r--lib/resolver.c3
-rw-r--r--ospfclient/ospf_apiclient.c3
3 files changed, 9 insertions, 0 deletions
diff --git a/lib/agentx.c b/lib/agentx.c
index 603d8d6172..f049d699a8 100644
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -32,6 +32,9 @@
#include "linklist.h"
#include "version.h"
#include "lib_errors.h"
+#include "xref.h"
+
+XREF_SETUP()
static int agentx_enabled = 0;
diff --git a/lib/resolver.c b/lib/resolver.c
index e5caadb2d0..c01284e29e 100644
--- a/lib/resolver.c
+++ b/lib/resolver.c
@@ -19,6 +19,9 @@
#include "lib_errors.h"
#include "resolver.h"
#include "command.h"
+#include "xref.h"
+
+XREF_SETUP()
struct resolver_state {
ares_channel channel;
diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c
index d4f0dc953c..1b9b66d745 100644
--- a/ospfclient/ospf_apiclient.c
+++ b/ospfclient/ospf_apiclient.c
@@ -34,6 +34,7 @@
#include "stream.h"
#include "log.h"
#include "memory.h"
+#include "xref.h"
/* work around gcc bug 69981, disable MTYPEs in libospf */
#define _QUAGGA_OSPF_MEMORY_H
@@ -57,6 +58,8 @@
#include "ospfd/ospf_dump_api.c"
#include "ospfd/ospf_api.c"
+XREF_SETUP()
+
DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient")
DEFINE_MTYPE_STATIC(OSPFCLIENT, OSPF_APICLIENT, "OSPF-API client")