summaryrefslogtreecommitdiffstats
path: root/src/vlibmemory
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-05-26 11:19:28 -0400
committerFlorin Coras <florin.coras@gmail.com>2020-05-27 20:53:57 +0000
commit7f475bf4b77ae2e74d65c62a22dc550329bb59c1 (patch)
treec93fe64b721ff42cedc10bab9335c7776b7f65a3 /src/vlibmemory
parentec3a3f16e4cd3b33e2a409fb01b8d8826e05f9fa (diff)
dhcp: vat support for the dhcp_client_dump API
Also: permanently solve ordering issues with the vpp builtin vat plugin loader, by explicitly loading vat plugins once we're sure that all data plane plugins have registered their APIs / API message handlers. Fix compilation / link errors when the vpp builtin vat plugin loader is disbled by cmake configuration. Type: fix Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: Id553c63ae860ebfc196c5ad4b55c19e08fec2c9e Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vlibmemory')
-rw-r--r--src/vlibmemory/CMakeLists.txt1
-rw-r--r--src/vlibmemory/vlib_api.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/src/vlibmemory/CMakeLists.txt b/src/vlibmemory/CMakeLists.txt
index 64fcb2d58fb..b48ff7b5766 100644
--- a/src/vlibmemory/CMakeLists.txt
+++ b/src/vlibmemory/CMakeLists.txt
@@ -16,6 +16,7 @@ add_vpp_library (vlibmemory
memory_api.c
memory_shared.c
memory_client.c
+ socket_client.c
socket_api.c
vlib_api.c
vlib_api_cli.c
diff --git a/src/vlibmemory/vlib_api.c b/src/vlibmemory/vlib_api.c
index 582016852a7..51378a5675e 100644
--- a/src/vlibmemory/vlib_api.c
+++ b/src/vlibmemory/vlib_api.c
@@ -248,6 +248,13 @@ vl_api_save_msg_table (void)
vec_free (serialized_message_table);
}
+clib_error_t *vat_builtin_main_init (vlib_main_t * vm) __attribute__ ((weak));
+clib_error_t *
+vat_builtin_main_init (vlib_main_t * vm)
+{
+ return 0;
+}
+
static uword
vl_api_clnt_process (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * f)
@@ -287,6 +294,10 @@ vl_api_clnt_process (vlib_main_t * vm, vlib_node_runtime_t * node,
if (e)
clib_error_report (e);
+ e = vat_builtin_main_init (vm);
+ if (e)
+ clib_error_report (e);
+
sleep_time = 10.0;
dead_client_scan_time = vlib_time_now (vm) + 10.0;