From 39d69112fcec114fde34955ceb41555221d3ba11 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 27 Nov 2019 11:42:13 -0500 Subject: api: multiple connections per process Type: feature Signed-off-by: Dave Barach Change-Id: I2272521d6e69edcd385ef684af6dd4eea5eaa953 --- src/vat/api_format.c | 8 ++++---- src/vat/main.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/vat') diff --git a/src/vat/api_format.c b/src/vat/api_format.c index e362672bbb2..218ae95e615 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -1100,7 +1100,7 @@ vl_api_cli_reply_t_handler_json (vl_api_cli_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); void *oldheap; u8 *reply; @@ -2710,7 +2710,7 @@ static void vl_api_get_node_graph_reply_t_handler (vl_api_get_node_graph_reply_t * mp) { vat_main_t *vam = &vat_main; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); i32 retval = ntohl (mp->retval); u8 *pvt_copy, *reply; void *oldheap; @@ -2773,7 +2773,7 @@ static void vl_api_get_node_graph_reply_t_handler_json (vl_api_get_node_graph_reply_t * mp) { vat_main_t *vam = &vat_main; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); void *oldheap; vat_json_node_t node; u8 *reply; @@ -21333,7 +21333,7 @@ value_sort_cmp (void *a1, void *a2) static int dump_msg_api_table (vat_main_t * vam) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); name_sort_t *nses = 0, *ns; hash_pair_t *hp; int i; diff --git a/src/vat/main.c b/src/vat/main.c index 893a1022ab7..996fb1ed6a8 100644 --- a/src/vat/main.c +++ b/src/vat/main.c @@ -31,7 +31,7 @@ int connect_to_vpe (char *name) { vat_main_t *vam = &vat_main; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0) return -1; @@ -185,7 +185,7 @@ do_one_file (vat_main_t * vam) if (vam->client_index_invalid) { vat_main_t *vam = &vat_main; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); vam->vl_input_queue = am->shmem_hdr->vl_input_queue; vam->my_client_index = am->my_client_index; -- cgit 1.2.3-korg