From 39d69112fcec114fde34955ceb41555221d3ba11 Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Wed, 27 Nov 2019 11:42:13 -0500
Subject: api: multiple connections per process

Type: feature

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I2272521d6e69edcd385ef684af6dd4eea5eaa953
---
 src/vpp/api/api.c         | 8 ++++----
 src/vpp/api/api_main.c    | 4 ++--
 src/vpp/api/gmon.c        | 2 +-
 src/vpp/api/test_client.c | 2 +-
 src/vpp/api/test_ha.c     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/vpp')

diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index 51d1edbfdae..c62e7d05738 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -143,7 +143,7 @@ shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
   u8 **shmem_vecp = (u8 **) arg;
   u8 *shmem_vec;
   void *oldheap;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   u32 offset;
 
   shmem_vec = *shmem_vecp;
@@ -170,7 +170,7 @@ vl_api_cli_t_handler (vl_api_cli_t * mp)
   vl_api_cli_reply_t *rp;
   vl_api_registration_t *reg;
   vlib_main_t *vm = vlib_get_main ();
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   unformat_input_t input;
   u8 *shmem_vec = 0;
   void *oldheap;
@@ -439,7 +439,7 @@ vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
 {
   int rv = 0;
   u8 *vector = 0;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   vlib_main_t *vm = vlib_get_main ();
   void *oldheap;
   vl_api_get_node_graph_reply_t *rmp;
@@ -625,7 +625,7 @@ static void setup_message_id_table (api_main_t * am);
 static clib_error_t *
 vpe_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \
diff --git a/src/vpp/api/api_main.c b/src/vpp/api/api_main.c
index af31307d229..7fcbe7027f1 100644
--- a/src/vpp/api/api_main.c
+++ b/src/vpp/api/api_main.c
@@ -78,7 +78,7 @@ maybe_register_api_client (vat_main_t * vam)
   vl_api_registration_t *regp;
   svm_region_t *svm;
   void *oldheap;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
   if (vam->my_client_index != ~0)
     return;
@@ -260,7 +260,7 @@ api_cli_output (void *notused, const char *fmt, ...)
 u16
 vl_client_get_first_plugin_msg_id (const char *plugin_name)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   vl_api_msg_range_t *rp;
   uword *p;
 
diff --git a/src/vpp/api/gmon.c b/src/vpp/api/gmon.c
index f665a09c62a..044410f734b 100644
--- a/src/vpp/api/gmon.c
+++ b/src/vpp/api/gmon.c
@@ -158,7 +158,7 @@ static clib_error_t *
 gmon_init (vlib_main_t * vm)
 {
   gmon_main_t *gm = &gmon_main;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   pid_t *swp = 0;
   f64 *v = 0;
   clib_error_t *error;
diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c
index 14f98cdeb1e..f207bb0935c 100644
--- a/src/vpp/api/test_client.c
+++ b/src/vpp/api/test_client.c
@@ -1288,7 +1288,7 @@ l2_bridge (test_main_t * tm)
 int
 main (int argc, char **argv)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   test_main_t *tm = &test_main;
   int ch;
 
diff --git a/src/vpp/api/test_ha.c b/src/vpp/api/test_ha.c
index b9fc428d192..e05361b1d59 100644
--- a/src/vpp/api/test_ha.c
+++ b/src/vpp/api/test_ha.c
@@ -131,7 +131,7 @@ connect_to_vpe (char *name)
 {
   int rv = 0;
   test_main_t *tm = &test_main;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
   rv = vl_client_connect_to_vlib ("/vpe-api", name, 32);
   if (rv < 0)
@@ -174,7 +174,7 @@ int
 main (int argc, char **argv)
 {
   test_main_t *tm = &test_main;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   u32 swt_pid = 0;
   int connected = 0;
 
-- 
cgit 1.2.3-korg