/*
- * Copyright (c) 2018 Cisco and/or its affiliates.
+ * Copyright (c) 2018-2019 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this
* You may obtain a copy of the License at:
#include <vcl/vcl_private.h>
#include <vlibmemory/api.h>
-#include <vpp/api/vpe_msg_enum.h>
-#define vl_typedefs /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
+#include <vnet/format_fns.h>
+#include <vnet/session/session.api_enum.h>
+#include <vnet/session/session.api_types.h>
-/* declare message handlers for each api */
+#define REPLY_MSG_ID_BASE msg_id_base
-#define vl_endianfun /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_printfun
+static u16 msg_id_base;
-u8 *
+static u8 *
format_api_error (u8 * s, va_list * args)
{
i32 error = va_arg (*args, u32);
vl_api_session_enable_disable_reply_t_handler
(vl_api_session_enable_disable_reply_t * mp)
{
+ vcl_worker_t *wrk = vcl_worker_get (0);
+
if (mp->retval)
{
clib_warning ("VCL<%d>: session_enable_disable failed: %U", getpid (),
format_api_error, ntohl (mp->retval));
}
else
- vcm->app_state = STATE_APP_ENABLED;
+ wrk->bapi_app_state = STATE_APP_ENABLED;
}
static void
-vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t *
- mp)
+vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp)
{
- static svm_fifo_segment_create_args_t _a;
- svm_fifo_segment_create_args_t *a = &_a;
- int rv;
+ vcl_worker_t *wrk = vcl_worker_get (0);
+ u64 segment_handle;
+ int *fds = 0, i, rv;
+ u32 n_fds = 0;
+ char *segment_name = 0;
- memset (a, 0, sizeof (*a));
if (mp->retval)
{
- clib_warning ("VCL<%d>: attach failed: %U", getpid (),
- format_api_error, ntohl (mp->retval));
- return;
+ VERR ("attach failed: %U", format_api_error, ntohl (mp->retval));
+ goto failed;
}
- if (mp->segment_name_length == 0)
+ vcl_set_worker_index (0);
+
+ segment_handle = clib_net_to_host_u64 (mp->segment_handle);
+ if (segment_handle == VCL_INVALID_SEGMENT_HANDLE)
{
- clib_warning ("VCL<%d>: segment_name_length zero", getpid ());
- return;
+ VERR ("invalid segment handle");
+ goto failed;
}
- a->segment_name = (char *) mp->segment_name;
- a->segment_size = mp->segment_size;
+ if (mp->n_fds)
+ {
+ vec_validate (fds, mp->n_fds);
+ if (vl_socket_client_recv_fd_msg2 (&wrk->bapi_sock_ctx, fds, mp->n_fds,
+ 5))
+ goto failed;
+
+ if (mp->fd_flags & SESSION_FD_F_VPP_MQ_SEGMENT)
+ if (vcl_segment_attach (vcl_vpp_worker_segment_handle (0),
+ "vpp-mq-seg", SSVM_SEGMENT_MEMFD,
+ fds[n_fds++]))
+ goto failed;
+
+ if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT)
+ {
+ segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name);
+ rv =
+ vcl_segment_attach (segment_handle, segment_name,
+ SSVM_SEGMENT_MEMFD, fds[n_fds++]);
+ vec_free (segment_name);
+ if (rv != 0)
+ goto failed;
+ }
- ASSERT (mp->app_event_queue_address);
+ vcl_segment_attach_mq (segment_handle, mp->app_mq, 0,
+ &wrk->app_event_queue);
- /* Attach to the segment vpp created */
- rv = svm_fifo_segment_attach (a);
- vec_reset_length (a->new_segment_indices);
- if (PREDICT_FALSE (rv))
+ if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD)
+ {
+ svm_msg_q_set_eventfd (wrk->app_event_queue, fds[n_fds]);
+ vcl_mq_epoll_add_evfd (wrk, wrk->app_event_queue);
+ n_fds++;
+ }
+
+ vcl_segment_discover_mqs (vcl_vpp_worker_segment_handle (0), fds + n_fds,
+ mp->n_fds - n_fds);
+ vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0),
+ mp->vpp_ctrl_mq, mp->vpp_ctrl_mq_thread,
+ &wrk->ctrl_mq);
+ vcm->ctrl_mq = wrk->ctrl_mq;
+
+ vec_free (fds);
+ }
+ else
{
- clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed",
- getpid (), mp->segment_name);
- return;
+ segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name);
+ rv =
+ vcl_segment_attach (segment_handle, segment_name, SSVM_SEGMENT_SHM,
+ -1);
+ vec_free (segment_name);
+ if (rv != 0)
+ goto failed;
}
- vcm->app_event_queue =
- uword_to_pointer (mp->app_event_queue_address, svm_msg_q_t *);
+ vcm->app_index = clib_net_to_host_u32 (mp->app_index);
+ wrk->bapi_app_state = STATE_APP_ATTACHED;
+ return;
- vcm->app_state = STATE_APP_ATTACHED;
+failed:
+ wrk->bapi_app_state = STATE_APP_FAILED;
+ for (i = clib_max (n_fds - 1, 0); i < vec_len (fds); i++)
+ close (fds[i]);
+ vec_free (fds);
}
static void
-vl_api_application_detach_reply_t_handler (vl_api_application_detach_reply_t *
+vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t *
mp)
{
- if (mp->retval)
- clib_warning ("VCL<%d>: detach failed: %U", getpid (), format_api_error,
- ntohl (mp->retval));
+ int n_fds = 0, *fds = 0, i, rv;
+ u64 segment_handle;
+ vcl_worker_t *wrk;
+ u32 wrk_index;
+ char *segment_name = 0;
- vcm->app_state = STATE_APP_ENABLED;
-}
+ if (!mp->is_add)
+ return;
-static void
-vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t *
- mp)
-{
- if (mp->retval)
- clib_warning ("VCL<%d>: vpp handle 0x%llx: disconnect session failed: %U",
- getpid (), mp->handle, format_api_error,
- ntohl (mp->retval));
-}
+ wrk_index = mp->context;
+ wrk = vcl_worker_get_if_valid (wrk_index);
+ if (!wrk)
+ return;
-static void
-vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp)
-{
- static svm_fifo_segment_create_args_t _a;
- svm_fifo_segment_create_args_t *a = &_a;
- int rv;
-
- memset (a, 0, sizeof (*a));
- a->segment_name = (char *) mp->segment_name;
- a->segment_size = mp->segment_size;
- /* Attach to the segment vpp created */
- rv = svm_fifo_segment_attach (a);
- vec_reset_length (a->new_segment_indices);
- if (PREDICT_FALSE (rv))
+ if (mp->retval)
{
- clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed",
- getpid (), mp->segment_name);
- return;
+ clib_warning ("VCL<%d>: add/del worker failed: %U", getpid (),
+ format_api_error, ntohl (mp->retval));
+ goto failed;
}
- VDBG (1, "VCL<%d>: mapped new segment '%s' size %d", getpid (),
- mp->segment_name, mp->segment_size);
-}
-
-static void
-vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp)
-{
-
-/*
- * XXX Need segment_name to session_id hash,
- * XXX - have sessionID by handle hash currently
- */
-
- VDBG (1, "Unmapped segment '%s'", mp->segment_name);
-}
+ vcl_set_worker_index (wrk_index);
+ wrk->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index);
+ wrk->ctrl_mq = vcm->ctrl_mq;
-static void
-vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp)
-{
- uword *p;
-
- p = hash_get (vcm->session_index_by_vpp_handles, mp->handle);
- if (p)
+ segment_handle = clib_net_to_host_u64 (mp->segment_handle);
+ if (segment_handle == VCL_INVALID_SEGMENT_HANDLE)
{
- int rv;
- vcl_session_t *session = 0;
- u32 session_index = p[0];
-
- VCL_SESSION_LOCK_AND_GET (session_index, &session);
- session->session_state = STATE_CLOSE_ON_EMPTY;
-
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: setting state to 0x%x "
- "(%s)", getpid (), mp->handle, session_index,
- session->session_state,
- vppcom_session_state_str (session->session_state));
- VCL_SESSION_UNLOCK ();
- return;
-
- done:
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session lookup failed!",
- getpid (), mp->handle, session_index);
+ clib_warning ("invalid segment handle");
+ goto failed;
}
- else
- clib_warning ("VCL<%d>: vpp handle 0x%llx: session lookup by "
- "handle failed!", getpid (), mp->handle);
-}
-static void
-vl_api_reset_session_t_handler (vl_api_reset_session_t * mp)
-{
- vcl_session_t *session = 0;
- vl_api_reset_session_reply_t *rmp;
- uword *p;
- int rv = 0;
-
- p = hash_get (vcm->session_index_by_vpp_handles, mp->handle);
- if (p)
+ if (mp->n_fds)
{
- int rval;
- VCL_SESSION_LOCK ();
- rval = vppcom_session_at_index (p[0], &session);
- if (PREDICT_FALSE (rval))
+ vec_validate (fds, mp->n_fds);
+ if (vl_socket_client_recv_fd_msg2 (&wrk->bapi_sock_ctx, fds, mp->n_fds,
+ 5))
+ goto failed;
+
+ if (mp->fd_flags & SESSION_FD_F_VPP_MQ_SEGMENT)
+ if (vcl_segment_attach (vcl_vpp_worker_segment_handle (wrk_index),
+ "vpp-worker-seg", SSVM_SEGMENT_MEMFD,
+ fds[n_fds++]))
+ goto failed;
+
+ if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT)
{
- rv = VNET_API_ERROR_INVALID_VALUE_2;
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
- "session lookup failed! returning %d %U",
- getpid (), mp->handle, p[0],
- rv, format_api_error, rv);
+ segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name);
+ rv =
+ vcl_segment_attach (segment_handle, segment_name,
+ SSVM_SEGMENT_MEMFD, fds[n_fds++]);
+ vec_free (segment_name);
+ if (rv != 0)
+ goto failed;
}
- else
+
+ vcl_segment_attach_mq (segment_handle, mp->app_event_queue_address, 0,
+ &wrk->app_event_queue);
+
+ if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD)
{
- /* TBD: should this disconnect immediately and
- * flush the fifos?
- */
- session->session_state = STATE_CLOSE_ON_EMPTY;
-
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: state set to %d "
- "(%s)!", getpid (), mp->handle, p[0], session->session_state,
- vppcom_session_state_str (session->session_state));
+ svm_msg_q_set_eventfd (wrk->app_event_queue, fds[n_fds]);
+ vcl_mq_epoll_add_evfd (wrk, wrk->app_event_queue);
+ n_fds++;
}
- VCL_SESSION_UNLOCK ();
+
+ vec_free (fds);
}
else
{
- rv = VNET_API_ERROR_INVALID_VALUE;
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx: session lookup "
- "failed! returning %d %U",
- getpid (), mp->handle, rv, format_api_error, rv);
+ segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name);
+ rv =
+ vcl_segment_attach (segment_handle, segment_name, SSVM_SEGMENT_SHM,
+ -1);
+ vec_free (segment_name);
+ if (rv != 0)
+ goto failed;
}
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs (VL_API_RESET_SESSION_REPLY);
- rmp->retval = htonl (rv);
- rmp->handle = mp->handle;
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp);
+ wrk->bapi_app_state = STATE_APP_READY;
+ VDBG (0, "worker %u vpp-worker %u added", wrk_index, wrk->vpp_wrk_index);
+ return;
+
+failed:
+ wrk->bapi_app_state = STATE_APP_FAILED;
+ for (i = clib_max (n_fds - 1, 0); i < vec_len (fds); i++)
+ close (fds[i]);
+ vec_free (fds);
}
static void
-vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp)
+vl_api_app_add_cert_key_pair_reply_t_handler (
+ vl_api_app_add_cert_key_pair_reply_t *mp)
{
- vcl_session_t *session = 0;
- u32 session_index;
- svm_fifo_t *rx_fifo, *tx_fifo;
- int rv = VPPCOM_OK;
+ vcl_worker_t *wrk = vcl_worker_get_current ();
- session_index = mp->context;
- VCL_SESSION_LOCK_AND_GET (session_index, &session);
-done:
if (mp->retval)
{
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: "
- "connect failed! %U",
- getpid (), mp->handle, session_index,
- format_api_error, ntohl (mp->retval));
- if (session)
- {
- session->session_state = STATE_FAILED;
- session->vpp_handle = mp->handle;
- }
- else
- {
- clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: "
- "Invalid session index (%u)!",
- getpid (), mp->handle, session_index);
- }
- goto done_unlock;
- }
-
- if (rv)
- goto done_unlock;
-
- /*
- * Setup session
- */
- if (vcm->session_io_thread.io_sessions_lockp)
- {
- // Add this connection to the active io sessions list
- VCL_IO_SESSIONS_LOCK ();
- u32 *active_session_index;
- pool_get (vcm->session_io_thread.active_session_indexes,
- active_session_index);
- *active_session_index = session_index;
- VCL_IO_SESSIONS_UNLOCK ();
+ VDBG (0, "Adding cert and key failed: %U", format_api_error,
+ ntohl (mp->retval));
+ return;
}
- session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address,
- svm_msg_q_t *);
-
- rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
- rx_fifo->client_session_index = session_index;
- tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
- tx_fifo->client_session_index = session_index;
-
- session->rx_fifo = rx_fifo;
- session->tx_fifo = tx_fifo;
- session->vpp_handle = mp->handle;
- session->transport.is_ip4 = mp->is_ip4;
- clib_memcpy (&session->transport.lcl_ip, mp->lcl_ip,
- sizeof (session->transport.rmt_ip));
- session->transport.lcl_port = mp->lcl_port;
- session->session_state = STATE_CONNECT;
-
- /* Add it to lookup table */
- hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index);
-
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: connect succeeded! "
- "session_rx_fifo %p, refcnt %d, session_tx_fifo %p, refcnt %d",
- getpid (), mp->handle, session_index, session->rx_fifo,
- session->rx_fifo->refcnt, session->tx_fifo, session->tx_fifo->refcnt);
-done_unlock:
- VCL_SESSION_UNLOCK ();
+ wrk->bapi_return = clib_net_to_host_u32 (mp->index);
+ wrk->bapi_app_state = STATE_APP_READY;
}
static void
-vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp)
+vl_api_app_del_cert_key_pair_reply_t_handler (
+ vl_api_app_del_cert_key_pair_reply_t *mp)
{
- vcl_session_t *session = 0;
- u32 session_index = mp->context;
- int rv;
-
- VCL_SESSION_LOCK_AND_GET (session_index, &session);
-done:
if (mp->retval)
{
- clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, "
- "sid %u: bind failed: %U",
- getpid (), mp->handle, session_index,
- format_api_error, ntohl (mp->retval));
- rv = vppcom_session_at_index (session_index, &session);
- if (rv == VPPCOM_OK)
- {
- session->session_state = STATE_FAILED;
- session->vpp_handle = mp->handle;
- }
- else
- {
- clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: "
- "Invalid session index (%u)!",
- getpid (), mp->handle, session_index);
- }
- goto done_unlock;
+ VDBG (0, "Deleting cert and key failed: %U", format_api_error,
+ ntohl (mp->retval));
+ return;
}
-
- session->vpp_handle = mp->handle;
- session->transport.is_ip4 = mp->lcl_is_ip4;
- clib_memcpy (&session->transport.lcl_ip, mp->lcl_ip,
- sizeof (ip46_address_t));
- session->transport.lcl_port = mp->lcl_port;
- vppcom_session_table_add_listener (mp->handle, session_index);
- session->session_state = STATE_LISTEN;
-
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!",
- getpid (), mp->handle, mp->context);
-done_unlock:
- VCL_SESSION_UNLOCK ();
}
-static void
-vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp)
-{
- if (mp->retval)
- clib_warning ("VCL<%d>: ERROR: sid %u: unbind failed: %U",
- getpid (), mp->context, format_api_error,
- ntohl (mp->retval));
-
- else
- VDBG (1, "VCL<%d>: sid %u: unbind succeeded!", getpid (), mp->context);
-}
+#define foreach_sock_msg \
+ _ (SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \
+ _ (APP_ATTACH_REPLY, app_attach_reply) \
+ _ (APP_ADD_CERT_KEY_PAIR_REPLY, app_add_cert_key_pair_reply) \
+ _ (APP_DEL_CERT_KEY_PAIR_REPLY, app_del_cert_key_pair_reply) \
+ _ (APP_WORKER_ADD_DEL_REPLY, app_worker_add_del_reply)
-static void
-vl_api_accept_session_t_handler (vl_api_accept_session_t * mp)
-{
- svm_fifo_t *rx_fifo, *tx_fifo;
- vcl_session_t *session, *listen_session;
- u32 session_index;
- vce_event_connect_request_t *ecr;
- vce_event_t *ev;
- int rv;
- u32 ev_idx;
- uword elts = 0;
+#define vl_print(handle, ...) fformat (handle, __VA_ARGS__)
+#define vl_endianfun /* define message structures */
+#include <vnet/session/session.api.h>
+#undef vl_endianfun
- VCL_SESSION_LOCK ();
+/* instantiate all the print functions we know about */
+#define vl_printfun
+#include <vnet/session/session.api.h>
+#undef vl_printfun
- VCL_ACCEPT_FIFO_LOCK ();
- elts = clib_fifo_free_elts (vcm->client_session_index_fifo);
- VCL_ACCEPT_FIFO_UNLOCK ();
+#define vl_api_version(n, v) static u32 api_version = v;
+#include <vnet/session/session.api.h>
+#undef vl_api_version
- if (!elts)
- {
- clib_warning ("VCL<%d>: client session queue is full!", getpid ());
- vppcom_send_accept_session_reply (mp->handle, mp->context,
- VNET_API_ERROR_QUEUE_FULL);
- VCL_SESSION_UNLOCK ();
- return;
- }
+static void
+vcl_bapi_hookup (void)
+{
+ u8 *msg_base_lookup_name = format (0, "session_%08x%c", api_version, 0);
- listen_session = vppcom_session_table_lookup_listener (mp->listener_handle);
- if (!listen_session)
- {
- clib_warning ("VCL<%d>: ERROR: couldn't find listen session: "
- "unknown vpp listener handle %llx",
- getpid (), mp->listener_handle);
- vppcom_send_accept_session_reply (mp->handle, mp->context,
- VNET_API_ERROR_INVALID_ARGUMENT);
- VCL_SESSION_UNLOCK ();
- return;
- }
+ REPLY_MSG_ID_BASE =
+ vl_client_get_first_plugin_msg_id ((char *) msg_base_lookup_name);
- /* TODO check listener depth and update */
- /* TODO on "child" fd close, update listener depth */
-
- /* Allocate local session and set it up */
- pool_get (vcm->sessions, session);
- memset (session, 0, sizeof (*session));
- session_index = (u32) (session - vcm->sessions);
-
- rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
- rx_fifo->client_session_index = session_index;
- tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
- tx_fifo->client_session_index = session_index;
-
- session->vpp_handle = mp->handle;
- session->client_context = mp->context;
- session->rx_fifo = rx_fifo;
- session->tx_fifo = tx_fifo;
- session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address,
- svm_msg_q_t *);
- session->session_state = STATE_ACCEPT;
- session->transport.rmt_port = mp->port;
- session->transport.is_ip4 = mp->is_ip4;
- clib_memcpy (&session->transport.rmt_ip, mp->ip, sizeof (ip46_address_t));
-
- /* Add it to lookup table */
- hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index);
- session->transport.lcl_port = listen_session->transport.lcl_port;
- session->transport.lcl_ip = listen_session->transport.lcl_ip;
-
- /* Create an event for handlers */
-
- VCL_EVENTS_LOCK ();
-
- pool_get (vcm->event_thread.vce_events, ev);
- ev_idx = (u32) (ev - vcm->event_thread.vce_events);
- ecr = vce_get_event_data (ev, sizeof (*ecr));
- ev->evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED;
- listen_session = vppcom_session_table_lookup_listener (mp->listener_handle);
- ev->evk.session_index = (u32) (listen_session - vcm->sessions);
- ecr->accepted_session_index = session_index;
-
- VCL_EVENTS_UNLOCK ();
-
- rv = vce_generate_event (&vcm->event_thread, ev_idx);
- ASSERT (rv == 0);
-
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: client accept request from %s"
- " address %U port %d queue %p!", getpid (), mp->handle, session_index,
- mp->is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &mp->ip,
- mp->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6,
- clib_net_to_host_u16 (mp->port), session->vpp_evt_q);
-
- vcl_evt (VCL_EVT_ACCEPT, session, listen_session, session_index);
- VCL_SESSION_UNLOCK ();
-}
+ vec_free (msg_base_lookup_name);
-#define foreach_sock_msg \
-_(SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \
-_(BIND_SOCK_REPLY, bind_sock_reply) \
-_(UNBIND_SOCK_REPLY, unbind_sock_reply) \
-_(ACCEPT_SESSION, accept_session) \
-_(CONNECT_SESSION_REPLY, connect_session_reply) \
-_(DISCONNECT_SESSION, disconnect_session) \
-_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \
-_(RESET_SESSION, reset_session) \
-_(APPLICATION_ATTACH_REPLY, application_attach_reply) \
-_(APPLICATION_DETACH_REPLY, application_detach_reply) \
-_(MAP_ANOTHER_SEGMENT, map_another_segment) \
-_(UNMAP_SEGMENT, unmap_segment)
+ if (REPLY_MSG_ID_BASE == (u16) ~0)
+ return;
-void
-vppcom_api_hookup (void)
-{
-#define _(N, n) \
- vl_msg_api_set_handlers(VL_API_##N, #n, \
- vl_api_##n##_t_handler, \
- vl_noop_handler, \
- vl_api_##n##_t_endian, \
- vl_api_##n##_t_print, \
- sizeof(vl_api_##n##_t), 1);
+#define _(N, n) \
+ vl_msg_api_set_handlers ( \
+ REPLY_MSG_ID_BASE + VL_API_##N, #n, vl_api_##n##_t_handler, \
+ vl_noop_handler, vl_api_##n##_t_endian, vl_api_##n##_t_print, \
+ sizeof (vl_api_##n##_t), 1, vl_api_##n##_t_print_json, \
+ vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson);
foreach_sock_msg;
#undef _
}
/*
* VPP-API message functions
*/
-void
-vppcom_send_session_enable_disable (u8 is_enable)
+static void
+vcl_bapi_send_session_enable_disable (u8 is_enable)
{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
vl_api_session_enable_disable_t *bmp;
bmp = vl_msg_api_alloc (sizeof (*bmp));
memset (bmp, 0, sizeof (*bmp));
- bmp->_vl_msg_id = ntohs (VL_API_SESSION_ENABLE_DISABLE);
- bmp->client_index = vcm->my_client_index;
+ bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_SESSION_ENABLE_DISABLE);
+ bmp->client_index = wrk->api_client_handle;
bmp->context = htonl (0xfeedface);
bmp->is_enable = is_enable;
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
+ vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp);
}
void
-vppcom_app_send_attach (void)
+vcl_bapi_send_attach (void)
{
- vl_api_application_attach_t *bmp;
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ u8 tls_engine = CRYPTO_ENGINE_OPENSSL;
+ vl_api_app_attach_t *bmp;
u8 nsid_len = vec_len (vcm->cfg.namespace_id);
u8 app_is_proxy = (vcm->cfg.app_proxy_transport_tcp ||
vcm->cfg.app_proxy_transport_udp);
+ tls_engine = vcm->cfg.tls_engine ? vcm->cfg.tls_engine : tls_engine;
+
bmp = vl_msg_api_alloc (sizeof (*bmp));
memset (bmp, 0, sizeof (*bmp));
- bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_ATTACH);
- bmp->client_index = vcm->my_client_index;
+ bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_ATTACH);
+ bmp->client_index = wrk->api_client_handle;
bmp->context = htonl (0xfeedface);
bmp->options[APP_OPTIONS_FLAGS] =
APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT |
(vcm->cfg.app_scope_local ? APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE : 0) |
(vcm->cfg.app_scope_global ? APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE : 0) |
(app_is_proxy ? APP_OPTIONS_FLAGS_IS_PROXY : 0) |
- APP_OPTIONS_FLAGS_USE_MQ_FOR_CTRL_MSGS;
+ (vcm->cfg.use_mq_eventfd ? APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD : 0);
bmp->options[APP_OPTIONS_PROXY_TRANSPORT] =
(u64) ((vcm->cfg.app_proxy_transport_tcp ? 1 << TRANSPORT_PROTO_TCP : 0) |
(vcm->cfg.app_proxy_transport_udp ? 1 << TRANSPORT_PROTO_UDP : 0));
bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] =
vcm->cfg.preallocated_fifo_pairs;
bmp->options[APP_OPTIONS_EVT_QUEUE_SIZE] = vcm->cfg.event_queue_size;
+ bmp->options[APP_OPTIONS_TLS_ENGINE] = tls_engine;
if (nsid_len)
{
- bmp->namespace_id_len = nsid_len;
- clib_memcpy (bmp->namespace_id, vcm->cfg.namespace_id, nsid_len);
+ vl_api_vec_to_api_string (vcm->cfg.namespace_id, &bmp->namespace_id);
bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret;
}
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
+ vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp);
}
void
-vppcom_app_send_detach (void)
+vcl_bapi_send_detach (void)
{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
vl_api_application_detach_t *bmp;
bmp = vl_msg_api_alloc (sizeof (*bmp));
memset (bmp, 0, sizeof (*bmp));
- bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_DETACH);
- bmp->client_index = vcm->my_client_index;
+ bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APPLICATION_DETACH);
+ bmp->client_index = wrk->api_client_handle;
bmp->context = htonl (0xfeedface);
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
-}
-
-void
-vppcom_send_connect_sock (vcl_session_t * session, u32 session_index)
-{
- vl_api_connect_sock_t *cmp;
-
- /* Assumes caller as acquired the spinlock: vcm->sessions_lockp */
- cmp = vl_msg_api_alloc (sizeof (*cmp));
- memset (cmp, 0, sizeof (*cmp));
- cmp->_vl_msg_id = ntohs (VL_API_CONNECT_SOCK);
- cmp->client_index = vcm->my_client_index;
- cmp->context = session_index;
-
- cmp->is_ip4 = session->transport.is_ip4;
- clib_memcpy (cmp->ip, &session->transport.rmt_ip, sizeof (cmp->ip));
- cmp->port = session->transport.rmt_port;
- cmp->proto = session->session_type;
- clib_memcpy (cmp->options, session->options, sizeof (cmp->options));
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & cmp);
+ vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp);
}
-void
-vppcom_send_disconnect_session_reply (u64 vpp_handle, u32 session_index,
- int rv)
+static void
+vcl_bapi_send_app_worker_add_del (u8 is_add)
{
- vl_api_disconnect_session_reply_t *rmp;
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ vl_api_app_worker_add_del_t *mp;
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect msg",
- getpid (), vpp_handle, session_index);
+ mp = vl_msg_api_alloc (sizeof (*mp));
+ memset (mp, 0, sizeof (*mp));
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+ mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_WORKER_ADD_DEL);
+ mp->client_index = wrk->api_client_handle;
+ mp->app_index = clib_host_to_net_u32 (vcm->app_index);
+ mp->context = wrk->wrk_index;
+ mp->is_add = is_add;
+ if (!is_add)
+ mp->wrk_index = clib_host_to_net_u32 (wrk->vpp_wrk_index);
- rmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION_REPLY);
- rmp->retval = htonl (rv);
- rmp->handle = vpp_handle;
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp);
+ vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp);
}
-void
-vppcom_send_disconnect_session (u64 vpp_handle, u32 session_index)
+static void
+vcl_bapi_send_child_worker_del (vcl_worker_t * child_wrk)
{
- vl_api_disconnect_session_t *dmp;
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ vl_api_app_worker_add_del_t *mp;
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect msg",
- getpid (), vpp_handle, session_index);
-
- dmp = vl_msg_api_alloc (sizeof (*dmp));
- memset (dmp, 0, sizeof (*dmp));
- dmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION);
- dmp->client_index = vcm->my_client_index;
- dmp->handle = vpp_handle;
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & dmp);
-}
-
-/* VPP combines bind and listen as one operation. VCL manages the separation
- * of bind and listen locally via vppcom_session_bind() and
- * vppcom_session_listen() */
-void
-vppcom_send_bind_sock (vcl_session_t * session, u32 session_index)
-{
- vl_api_bind_sock_t *bmp;
+ mp = vl_msg_api_alloc (sizeof (*mp));
+ memset (mp, 0, sizeof (*mp));
- /* Assumes caller has acquired spinlock: vcm->sessions_lockp */
- bmp = vl_msg_api_alloc (sizeof (*bmp));
- memset (bmp, 0, sizeof (*bmp));
+ mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_WORKER_ADD_DEL);
+ mp->client_index = wrk->api_client_handle;
+ mp->app_index = clib_host_to_net_u32 (vcm->app_index);
+ mp->context = wrk->wrk_index;
+ mp->is_add = 0;
+ mp->wrk_index = clib_host_to_net_u32 (child_wrk->vpp_wrk_index);
- bmp->_vl_msg_id = ntohs (VL_API_BIND_SOCK);
- bmp->client_index = vcm->my_client_index;
- bmp->context = session_index;
- bmp->is_ip4 = session->transport.is_ip4;
- clib_memcpy (bmp->ip, &session->transport.lcl_ip, sizeof (bmp->ip));
- bmp->port = session->transport.lcl_port;
- bmp->proto = session->session_type;
- clib_memcpy (bmp->options, session->options, sizeof (bmp->options));
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
+ vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp);
}
-void
-vppcom_send_unbind_sock (u64 vpp_handle)
+static void
+vcl_bapi_send_app_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair)
{
- vl_api_unbind_sock_t *ump;
-
- ump = vl_msg_api_alloc (sizeof (*ump));
- memset (ump, 0, sizeof (*ump));
-
- ump->_vl_msg_id = ntohs (VL_API_UNBIND_SOCK);
- ump->client_index = vcm->my_client_index;
- ump->handle = vpp_handle;
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & ump);
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ u32 cert_len = ckpair->cert_len;
+ u32 key_len = ckpair->key_len;
+ vl_api_app_add_cert_key_pair_t *bmp;
+
+ bmp = vl_msg_api_alloc (sizeof (*bmp) + cert_len + key_len);
+ clib_memset (bmp, 0, sizeof (*bmp) + cert_len + key_len);
+
+ bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_ADD_CERT_KEY_PAIR);
+ bmp->client_index = wrk->api_client_handle;
+ bmp->context = wrk->wrk_index;
+ bmp->cert_len = clib_host_to_net_u16 (cert_len);
+ bmp->certkey_len = clib_host_to_net_u16 (key_len + cert_len);
+ clib_memcpy_fast (bmp->certkey, ckpair->cert, cert_len);
+ clib_memcpy_fast (bmp->certkey + cert_len, ckpair->key, key_len);
+
+ vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) &bmp);
}
-void
-vppcom_send_accept_session_reply (u64 handle, u32 context, int retval)
+static void
+vcl_bapi_send_app_del_cert_key_pair (u32 ckpair_index)
{
- vl_api_accept_session_reply_t *rmp;
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs (VL_API_ACCEPT_SESSION_REPLY);
- rmp->retval = htonl (retval);
- rmp->context = context;
- rmp->handle = handle;
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp);
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ vl_api_app_del_cert_key_pair_t *bmp;
+ bmp = vl_msg_api_alloc (sizeof (*bmp));
+ clib_memset (bmp, 0, sizeof (*bmp));
+
+ bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_DEL_CERT_KEY_PAIR);
+ bmp->client_index = wrk->api_client_handle;
+ bmp->context = wrk->wrk_index;
+ bmp->index = clib_host_to_net_u32 (ckpair_index);
+ vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) &bmp);
}
u32
-vcl_max_nsid_len (void)
+vcl_bapi_max_nsid_len (void)
{
- vl_api_application_attach_t *mp;
+ vl_api_app_attach_t *mp;
return (sizeof (mp->namespace_id) - 1);
}
-void
-vppcom_init_error_string_table (void)
+static void
+vcl_bapi_init_error_string_table (void)
{
vcm->error_string_by_error_number = hash_create (0, sizeof (uword));
hash_set (vcm->error_string_by_error_number, 99, "Misc");
}
-int
-vppcom_connect_to_vpp (char *app_name)
+static void
+vcl_bapi_cleanup (void)
+{
+ socket_client_main_t *scm = &socket_client_main;
+ api_main_t *am = vlibapi_get_main ();
+
+ am->my_client_index = ~0;
+ am->my_registration = 0;
+ am->vl_input_queue = 0;
+ am->msg_index_by_name_and_crc = 0;
+ scm->socket_fd = 0;
+
+ vl_client_api_unmap ();
+}
+
+static int
+vcl_bapi_connect_to_vpp (void)
{
- api_main_t *am = &api_main;
+ vcl_worker_t *wrk = vcl_worker_get_current ();
vppcom_cfg_t *vcl_cfg = &vcm->cfg;
int rv = VPPCOM_OK;
+ api_main_t *am;
+ u8 *wrk_name;
+
+ wrk_name = format (0, "%v-wrk-%u%c", vcm->app_name, wrk->wrk_index, 0);
- if (!vcl_cfg->vpp_api_filename)
- vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0);
+ /* Make sure api is cleaned up in case this is a connect from a
+ * forked worker */
+ vcl_bapi_cleanup ();
- VDBG (0, "VCL<%d>: app (%s) connecting to VPP api (%s)...",
- getpid (), app_name, vcl_cfg->vpp_api_filename);
+ vlibapi_set_main (&wrk->bapi_api_ctx);
+ vlibapi_set_memory_client_main (&wrk->bapi_mem_ctx);
- if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename, app_name,
- vcm->cfg.vpp_api_q_length) < 0)
+ if (!vcl_cfg->vpp_bapi_socket_name)
{
- clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), app_name);
- rv = VPPCOM_ECONNREFUSED;
+ rv = VPPCOM_EINVAL;
+ goto error;
}
- else
+
+ if (vl_socket_client_connect2 (&wrk->bapi_sock_ctx,
+ (char *) vcl_cfg->vpp_bapi_socket_name,
+ (char *) wrk_name,
+ 0 /* default rx/tx buffer */ ))
{
- vcm->vl_input_queue = am->shmem_hdr->vl_input_queue;
- vcm->my_client_index = (u32) am->my_client_index;
- vcm->app_state = STATE_APP_CONN_VPP;
+ VERR ("app (%s) socket connect failed!", wrk_name);
+ rv = VPPCOM_ECONNREFUSED;
+ goto error;
+ }
- VDBG (0, "VCL<%d>: app (%s) is connected to VPP!", getpid (), app_name);
+ if (vl_socket_client_init_shm2 (&wrk->bapi_sock_ctx, 0,
+ 1 /* want_pthread */ ))
+ {
+ VERR ("app (%s) init shm failed!", wrk_name);
+ rv = VPPCOM_ECONNREFUSED;
+ goto error;
}
+ vcl_bapi_hookup ();
+
+ am = vlibapi_get_main ();
+ wrk->vl_input_queue = am->shmem_hdr->vl_input_queue;
+ wrk->api_client_handle = (u32) am->my_client_index;
+ VDBG (0, "app (%s) is connected to VPP!", wrk_name);
vcl_evt (VCL_EVT_INIT, vcm);
+
+error:
+ vec_free (wrk_name);
return rv;
}
+void
+vcl_bapi_disconnect_from_vpp (void)
+{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ vppcom_cfg_t *vcl_cfg = &vcm->cfg;
+
+ if (vcl_cfg->vpp_bapi_socket_name)
+ vl_socket_client_disconnect2 (&wrk->bapi_sock_ctx);
+ else
+ vl_client_disconnect_from_vlib ();
+}
+
+static const char *
+vcl_bapi_app_state_str (vcl_bapi_app_state_t state)
+{
+ char *st;
+
+ switch (state)
+ {
+ case STATE_APP_START:
+ st = "STATE_APP_START";
+ break;
+
+ case STATE_APP_CONN_VPP:
+ st = "STATE_APP_CONN_VPP";
+ break;
+
+ case STATE_APP_ENABLED:
+ st = "STATE_APP_ENABLED";
+ break;
+
+ case STATE_APP_ATTACHED:
+ st = "STATE_APP_ATTACHED";
+ break;
+
+ default:
+ st = "UNKNOWN_APP_STATE";
+ break;
+ }
+
+ return st;
+}
+
+static int
+vcl_bapi_wait_for_wrk_state_change (vcl_bapi_app_state_t app_state)
+{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ f64 timeout = clib_time_now (&wrk->clib_time) + vcm->cfg.app_timeout;
+
+ while (clib_time_now (&wrk->clib_time) < timeout)
+ {
+ if (wrk->bapi_app_state == app_state)
+ return VPPCOM_OK;
+ if (wrk->bapi_app_state == STATE_APP_FAILED)
+ return VPPCOM_ECONNABORTED;
+ }
+ VDBG (0, "timeout waiting for state %s, current state %d",
+ vcl_bapi_app_state_str (app_state), wrk->bapi_app_state);
+ vcl_evt (VCL_EVT_SESSION_TIMEOUT, vcm, bapi_app_state);
+
+ return VPPCOM_ETIMEDOUT;
+}
+
+static int
+vcl_bapi_session_enable (void)
+{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ int rv;
+
+ if (wrk->bapi_app_state != STATE_APP_ENABLED)
+ {
+ vcl_bapi_send_session_enable_disable (1 /* is_enabled == TRUE */ );
+ rv = vcl_bapi_wait_for_wrk_state_change (STATE_APP_ENABLED);
+ if (PREDICT_FALSE (rv))
+ {
+ VDBG (0, "application session enable timed out! returning %d (%s)",
+ rv, vppcom_retval_str (rv));
+ return rv;
+ }
+ }
+ return VPPCOM_OK;
+}
+
+static int
+vcl_bapi_init (void)
+{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ int rv;
+
+ wrk->bapi_app_state = STATE_APP_START;
+ vcl_bapi_init_error_string_table ();
+ rv = vcl_bapi_connect_to_vpp ();
+ if (rv)
+ {
+ VERR ("couldn't connect to VPP!");
+ return rv;
+ }
+ VDBG (0, "sending session enable");
+ rv = vcl_bapi_session_enable ();
+ if (rv)
+ {
+ VERR ("vppcom_app_session_enable() failed!");
+ return rv;
+ }
+
+ return 0;
+}
+
+int
+vcl_bapi_attach (void)
+{
+ int rv;
+
+ /* API hookup and connect to VPP */
+ if ((rv = vcl_bapi_init ()))
+ return rv;
+
+ vcl_bapi_send_attach ();
+ rv = vcl_bapi_wait_for_wrk_state_change (STATE_APP_ATTACHED);
+ if (PREDICT_FALSE (rv))
+ {
+ VDBG (0, "application attach timed out! returning %d (%s)", rv,
+ vppcom_retval_str (rv));
+ return rv;
+ }
+
+ return 0;
+}
+
+int
+vcl_bapi_app_worker_add (void)
+{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+
+ if (vcl_bapi_connect_to_vpp ())
+ return -1;
+
+ wrk->bapi_app_state = STATE_APP_ADDING_WORKER;
+ vcl_bapi_send_app_worker_add_del (1 /* is_add */ );
+ if (vcl_bapi_wait_for_wrk_state_change (STATE_APP_READY))
+ return -1;
+ return 0;
+}
+
+void
+vcl_bapi_app_worker_del (vcl_worker_t * wrk)
+{
+ /* Notify vpp that the worker is going away */
+ if (wrk->wrk_index == vcl_get_worker_index ())
+ vcl_bapi_send_app_worker_add_del (0 /* is_add */ );
+ else
+ vcl_bapi_send_child_worker_del (wrk);
+
+ /* Disconnect the binary api */
+ if (vec_len (vcm->workers) == 1)
+ vcl_bapi_disconnect_from_vpp ();
+ else
+ vl_client_send_disconnect (1 /* vpp should cleanup */ );
+}
+
+int
+vcl_bapi_recv_fds (vcl_worker_t * wrk, int *fds, int n_fds)
+{
+ clib_error_t *err;
+
+ if ((err = vl_socket_client_recv_fd_msg2 (&wrk->bapi_sock_ctx, fds, n_fds,
+ 5)))
+ {
+ clib_error_report (err);
+ return -1;
+ }
+
+ return 0;
+}
+
+int
+vcl_bapi_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair)
+{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+
+ if (ckpair->key_len == 0 || ckpair->key_len == ~0)
+ return VPPCOM_EINVAL;
+
+ vcl_bapi_send_app_add_cert_key_pair (ckpair);
+ wrk->bapi_app_state = STATE_APP_ADDING_TLS_DATA;
+ vcl_bapi_wait_for_wrk_state_change (STATE_APP_READY);
+ if (wrk->bapi_app_state == STATE_APP_READY)
+ return wrk->bapi_return;
+ return VPPCOM_EFAULT;
+}
+
+int
+vcl_bapi_del_cert_key_pair (u32 ckpair_index)
+{
+ /* Don't wait for reply */
+ vcl_bapi_send_app_del_cert_key_pair (ckpair_index);
+ return 0;
+}
+
+int
+vcl_bapi_worker_set (void)
+{
+ vcl_worker_t *wrk = vcl_worker_get_current ();
+ int i;
+
+ /* Find the first worker with the same pid */
+ for (i = 0; i < vec_len (vcm->workers); i++)
+ {
+ if (i == wrk->wrk_index)
+ continue;
+ if (vcm->workers[i].current_pid == wrk->current_pid)
+ {
+ wrk->vl_input_queue = vcm->workers[i].vl_input_queue;
+ wrk->api_client_handle = vcm->workers[i].api_client_handle;
+ return 0;
+ }
+ }
+ return -1;
+}
+
/*
* fd.io coding-style-patch-verification: ON
*
Code Review / vpp.git / blobdiff