summaryrefslogtreecommitdiffstats
path: root/src/vcl/vppcom.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2018-06-27 17:10:49 -0700
committerFlorin Coras <fcoras@cisco.com>2018-06-28 02:09:37 -0700
commit697faeace706337eddf0407e4e28e0bb8d39c20e (patch)
tree36d7d1c2e90519a84cf5ab1f693f0ef47822c364 /src/vcl/vppcom.c
parent9c949e72a473195c10a1c1caf503db9467c93f9a (diff)
vcl: move binary api and cfg to separate files
Change-Id: Ib88d703bb7d4b170059960b0688352c90c5fcc39 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vcl/vppcom.c')
-rw-r--r--src/vcl/vppcom.c1970
1 files changed, 77 insertions, 1893 deletions
diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 3cd2e766f63..1fd138e6dd3 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -15,273 +15,11 @@
#include <stdio.h>
#include <stdlib.h>
-#include <signal.h>
#include <svm/svm_fifo_segment.h>
-#include <vlibmemory/api.h>
-#include <vpp/api/vpe_msg_enum.h>
-#include <vnet/session/application_interface.h>
#include <vcl/vppcom.h>
#include <vcl/vcl_event.h>
#include <vcl/vcl_debug.h>
-#include <vlib/unix/unix.h>
-#include <vppinfra/vec_bootstrap.h>
-
-#define vl_typedefs /* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#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
-
-#if (CLIB_DEBUG > 0)
-/* Set VPPCOM_DEBUG_INIT 2 for connection debug,
- * 3 for read/write debug output
- * or
- * export VCL_DEBUG=<#> to set dynamically.
- */
-#define VPPCOM_DEBUG_INIT 1
-#else
-#define VPPCOM_DEBUG_INIT 0
-#endif
-
-#define VPPCOM_DEBUG vcm->debug
-
-/*
- * VPPCOM Private definitions and functions.
- */
-typedef enum
-{
- STATE_APP_START,
- STATE_APP_CONN_VPP,
- STATE_APP_ENABLED,
- STATE_APP_ATTACHED,
-} app_state_t;
-
-typedef enum
-{
- STATE_START = 0x01,
- STATE_CONNECT = 0x02,
- STATE_LISTEN = 0x04,
- STATE_ACCEPT = 0x08,
- STATE_CLOSE_ON_EMPTY = 0x10,
- STATE_DISCONNECT = 0x20,
- STATE_FAILED = 0x40
-} session_state_t;
-
-#define SERVER_STATE_OPEN (STATE_ACCEPT|STATE_CLOSE_ON_EMPTY)
-#define CLIENT_STATE_OPEN (STATE_CONNECT|STATE_CLOSE_ON_EMPTY)
-
-typedef struct epoll_event vppcom_epoll_event_t;
-
-typedef struct
-{
- u32 next_sid;
- u32 prev_sid;
- u32 vep_idx;
- vppcom_epoll_event_t ev;
-#define VEP_DEFAULT_ET_MASK (EPOLLIN|EPOLLOUT)
-#define VEP_UNSUPPORTED_EVENTS (EPOLLONESHOT|EPOLLEXCLUSIVE)
- u32 et_mask;
-} vppcom_epoll_t;
-
-typedef struct
-{
- u8 is_ip4;
- ip46_address_t ip46;
-} vppcom_ip46_t;
-
-enum
-{
- VCL_SESS_ATTR_SERVER,
- VCL_SESS_ATTR_CUT_THRU,
- VCL_SESS_ATTR_VEP,
- VCL_SESS_ATTR_VEP_SESSION,
- VCL_SESS_ATTR_LISTEN, // SOL_SOCKET,SO_ACCEPTCONN
- VCL_SESS_ATTR_NONBLOCK, // fcntl,O_NONBLOCK
- VCL_SESS_ATTR_REUSEADDR, // SOL_SOCKET,SO_REUSEADDR
- VCL_SESS_ATTR_REUSEPORT, // SOL_SOCKET,SO_REUSEPORT
- VCL_SESS_ATTR_BROADCAST, // SOL_SOCKET,SO_BROADCAST
- VCL_SESS_ATTR_V6ONLY, // SOL_TCP,IPV6_V6ONLY
- VCL_SESS_ATTR_KEEPALIVE, // SOL_SOCKET,SO_KEEPALIVE
- VCL_SESS_ATTR_TCP_NODELAY, // SOL_TCP,TCP_NODELAY
- VCL_SESS_ATTR_TCP_KEEPIDLE, // SOL_TCP,TCP_KEEPIDLE
- VCL_SESS_ATTR_TCP_KEEPINTVL, // SOL_TCP,TCP_KEEPINTVL
- VCL_SESS_ATTR_MAX
-} vppcom_session_attr_t;
-
-#define VCL_SESS_ATTR_SET(ATTR, VAL) \
-do { \
- (ATTR) |= 1 << (VAL); \
- } while (0)
-
-#define VCL_SESS_ATTR_CLR(ATTR, VAL) \
-do { \
- (ATTR) &= ~(1 << (VAL)); \
- } while (0)
-
-#define VCL_SESS_ATTR_TEST(ATTR, VAL) \
- ((ATTR) & (1 << (VAL)) ? 1 : 0)
-
-typedef struct
-{
-#define _(type, name) type name;
- foreach_app_session_field
-#undef _
- u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF)
- u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF)
- u32 user_mss; // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG)
- u8 *segment_name;
- u32 sm_seg_index;
- u32 client_context;
- u64 vpp_handle;
-
- /* Socket configuration state */
- u8 is_vep;
- u8 is_vep_session;
- u32 attr;
- u32 wait_cont_idx;
- vppcom_epoll_t vep;
- int libc_epfd;
- u64 client_queue_address;
- u64 options[16];
- vce_event_handler_reg_t *poll_reg;
-#if VCL_ELOG
- elog_track_t elog_track;
-#endif
-} vcl_session_t;
-
-typedef struct vppcom_cfg_t_
-{
- u64 heapsize;
- u32 vpp_api_q_length;
- u64 segment_baseva;
- u32 segment_size;
- u32 add_segment_size;
- u32 preallocated_fifo_pairs;
- u32 rx_fifo_size;
- u32 tx_fifo_size;
- u32 event_queue_size;
- u32 listen_queue_size;
- u8 app_proxy_transport_tcp;
- u8 app_proxy_transport_udp;
- u8 app_scope_local;
- u8 app_scope_global;
- u8 *namespace_id;
- u64 namespace_secret;
- f64 app_timeout;
- f64 session_timeout;
- f64 accept_timeout;
- u32 event_ring_size;
- char *event_log_path;
- u8 *vpp_api_filename;
-} vppcom_cfg_t;
-
-typedef struct vppcom_main_t_
-{
- u8 init;
- u32 debug;
- int main_cpu;
-
- /* FIFO for accepted connections - used in epoll/select */
- clib_spinlock_t session_fifo_lockp;
- u32 *client_session_index_fifo;
-
- /* vpp input queue */
- svm_queue_t *vl_input_queue;
-
- /* API client handle */
- u32 my_client_index;
- /* Session pool */
- clib_spinlock_t sessions_lockp;
- vcl_session_t *sessions;
-
- /* Hash table for disconnect processing */
- uword *session_index_by_vpp_handles;
-
- /* Select bitmaps */
- clib_bitmap_t *rd_bitmap;
- clib_bitmap_t *wr_bitmap;
- clib_bitmap_t *ex_bitmap;
-
- /* Our event queue */
- svm_queue_t *app_event_queue;
-
- /* unique segment name counter */
- u32 unique_segment_index;
-
- /* For deadman timers */
- clib_time_t clib_time;
-
- /* State of the connection, shared between msg RX thread and main thread */
- volatile app_state_t app_state;
-
- vppcom_cfg_t cfg;
-
- /* Event thread */
- vce_event_thread_t event_thread;
-
- /* IO thread */
- vppcom_session_io_thread_t session_io_thread;
-
-#ifdef VCL_ELOG
- /* VPP Event-logger */
- elog_main_t elog_main;
- elog_track_t elog_track;
-#endif
-
- /* VNET_API_ERROR_FOO -> "Foo" hash table */
- uword *error_string_by_error_number;
-} vppcom_main_t;
-
-/* NOTE: _vppcom_main is only used until the heap is allocated.
- * Do not access it directly -- use vcm which will point to
- * the heap allocated copy after init.
- */
-static vppcom_main_t _vppcom_main = {
- .debug = VPPCOM_DEBUG_INIT,
- .my_client_index = ~0
-};
-
-static vppcom_main_t *vcm = &_vppcom_main;
-
-#define VCL_SESSION_LOCK_AND_GET(I, S) \
-do { \
- clib_spinlock_lock (&vcm->sessions_lockp); \
- rv = vppcom_session_at_index (I, S); \
- if (PREDICT_FALSE (rv)) \
- { \
- clib_spinlock_unlock (&vcm->sessions_lockp); \
- clib_warning ("VCL<%d>: ERROR: Invalid ##I (%u)!", \
- getpid (), I); \
- goto done; \
- } \
-} while (0)
-
-#define VCL_SESSION_LOCK() clib_spinlock_lock (&(vcm->sessions_lockp))
-#define VCL_SESSION_UNLOCK() clib_spinlock_unlock (&(vcm->sessions_lockp))
-
-#define VCL_IO_SESSIONS_LOCK() \
- clib_spinlock_lock (&(vcm->session_io_thread.io_sessions_lockp))
-#define VCL_IO_SESSIONS_UNLOCK() \
- clib_spinlock_unlock (&(vcm->session_io_thread.io_sessions_lockp))
-
-#define VCL_ACCEPT_FIFO_LOCK() clib_spinlock_lock (&(vcm->session_fifo_lockp))
-#define VCL_ACCEPT_FIFO_UNLOCK() \
- clib_spinlock_unlock (&(vcm->session_fifo_lockp))
-
-#define VCL_EVENTS_LOCK() \
- clib_spinlock_lock (&(vcm->event_thread.events_lockp))
-#define VCL_EVENTS_UNLOCK() \
- clib_spinlock_unlock (&(vcm->event_thread.events_lockp))
+#include <vcl/vcl_private.h>
static const char *
vppcom_app_state_str (app_state_t state)
@@ -314,7 +52,7 @@ vppcom_app_state_str (app_state_t state)
return st;
}
-static const char *
+const char *
vppcom_session_state_str (session_state_t state)
{
char *st;
@@ -357,139 +95,98 @@ vppcom_session_state_str (session_state_t state)
return st;
}
-
-/*
- * VPPCOM Utility Functions
- */
-
-static inline int
-vppcom_session_at_index (u32 session_index, vcl_session_t * volatile *sess)
-{
- /* Assumes that caller has acquired spinlock: vcm->sessions_lockp */
- if (PREDICT_FALSE ((session_index == ~0) ||
- pool_is_free_index (vcm->sessions, session_index)))
- {
- clib_warning ("VCL<%d>: invalid session, sid (%u) has been closed!",
- getpid (), session_index);
- return VPPCOM_EBADFD;
- }
- *sess = pool_elt_at_index (vcm->sessions, session_index);
- return VPPCOM_OK;
-}
-
-static inline void
-vppcom_session_table_add_listener (u64 listener_handle, u32 value)
+u8 *
+format_ip4_address (u8 * s, va_list * args)
{
- /* Session and listener handles have different formats. The latter has
- * the thread index in the upper 32 bits while the former has the session
- * type. Knowing that, for listeners we just flip the MSB to 1 */
- listener_handle |= 1ULL << 63;
- hash_set (vcm->session_index_by_vpp_handles, listener_handle, value);
+ u8 *a = va_arg (*args, u8 *);
+ return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
}
-static inline vcl_session_t *
-vppcom_session_table_lookup_listener (u64 listener_handle)
+u8 *
+format_ip6_address (u8 * s, va_list * args)
{
- uword *p;
- u64 handle = listener_handle | (1ULL << 63);
- vcl_session_t *session;
+ ip6_address_t *a = va_arg (*args, ip6_address_t *);
+ u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
- p = hash_get (vcm->session_index_by_vpp_handles, handle);
- if (!p)
+ i_max_n_zero = ARRAY_LEN (a->as_u16);
+ max_n_zeros = 0;
+ i_first_zero = i_max_n_zero;
+ n_zeros = 0;
+ for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
{
- clib_warning ("VCL<%d>: couldn't find listen session: unknown vpp "
- "listener handle %llx", getpid (), listener_handle);
- return 0;
+ u32 is_zero = a->as_u16[i] == 0;
+ if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
+ {
+ i_first_zero = i;
+ n_zeros = 0;
+ }
+ n_zeros += is_zero;
+ if ((!is_zero && n_zeros > max_n_zeros)
+ || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
+ {
+ i_max_n_zero = i_first_zero;
+ max_n_zeros = n_zeros;
+ i_first_zero = ARRAY_LEN (a->as_u16);
+ n_zeros = 0;
+ }
}
- if (pool_is_free_index (vcm->sessions, p[0]))
+
+ last_double_colon = 0;
+ for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
{
- VDBG (1, "VCL<%d>: invalid listen session, sid (%u)", getpid (), p[0]);
- return 0;
+ if (i == i_max_n_zero && max_n_zeros > 1)
+ {
+ s = format (s, "::");
+ i += max_n_zeros - 1;
+ last_double_colon = 1;
+ }
+ else
+ {
+ s = format (s, "%s%x",
+ (last_double_colon || i == 0) ? "" : ":",
+ clib_net_to_host_u16 (a->as_u16[i]));
+ last_double_colon = 0;
+ }
}
- session = pool_elt_at_index (vcm->sessions, p[0]);
- ASSERT (session->session_state & STATE_LISTEN);
- return session;
-}
-
-static inline void
-vppcom_session_table_del_listener (u64 listener_handle)
-{
- listener_handle |= 1ULL << 63;
- hash_unset (vcm->session_index_by_vpp_handles, listener_handle);
-}
-
-static inline void
-vppcom_send_accept_session_reply (u64 handle, u32 context, int retval)
-{
- 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);
+ return s;
}
-static int
-vppcom_connect_to_vpp (char *app_name)
+/* Format an IP46 address. */
+u8 *
+format_ip46_address (u8 * s, va_list * args)
{
- api_main_t *am = &api_main;
- vppcom_cfg_t *vcl_cfg = &vcm->cfg;
- int rv = VPPCOM_OK;
-
- if (!vcl_cfg->vpp_api_filename)
- vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0);
-
- VDBG (0, "VCL<%d>: app (%s) connecting to VPP api (%s)...",
- getpid (), app_name, vcl_cfg->vpp_api_filename);
+ ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+ ip46_type_t type = va_arg (*args, ip46_type_t);
+ int is_ip4 = 1;
- if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename, app_name,
- vcm->cfg.vpp_api_q_length) < 0)
- {
- clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), app_name);
- rv = VPPCOM_ECONNREFUSED;
- }
- else
+ switch (type)
{
- 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;
-
- VDBG (0, "VCL<%d>: app (%s) is connected to VPP!", getpid (), app_name);
+ case IP46_TYPE_ANY:
+ is_ip4 = ip46_address_is_ip4 (ip46);
+ break;
+ case IP46_TYPE_IP4:
+ is_ip4 = 1;
+ break;
+ case IP46_TYPE_IP6:
+ is_ip4 = 0;
+ break;
}
- vcl_evt (VCL_EVT_INIT, vcm);
- return rv;
+ return is_ip4 ?
+ format (s, "%U", format_ip4_address, &ip46->ip4) :
+ format (s, "%U", format_ip6_address, &ip46->ip6);
}
-static u8 *
-format_api_error (u8 * s, va_list * args)
-{
- i32 error = va_arg (*args, u32);
- uword *p;
-
- p = hash_get (vcm->error_string_by_error_number, -error);
-
- if (p)
- s = format (s, "%s (%d)", p[0], error);
- else
- s = format (s, "%d", error);
- return s;
-}
+/*
+ * VPPCOM Utility Functions
+ */
-static void
-vppcom_init_error_string_table (void)
+static inline void
+vppcom_session_table_del_listener (u64 listener_handle)
{
- vcm->error_string_by_error_number = hash_create (0, sizeof (uword));
-
-#define _(n, v, s) hash_set (vcm->error_string_by_error_number, -v, s);
- foreach_vnet_api_error;
-#undef _
-
- hash_set (vcm->error_string_by_error_number, 99, "Misc");
+ listener_handle |= 1ULL << 63;
+ hash_unset (vcm->session_index_by_vpp_handles, listener_handle);
}
static inline int
@@ -549,23 +246,6 @@ vppcom_wait_for_session_state_change (u32 session_index,
return VPPCOM_ETIMEDOUT;
}
-/*
- * VPP-API message functions
- */
-static void
-vppcom_send_session_enable_disable (u8 is_enable)
-{
- 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->context = htonl (0xfeedface);
- bmp->is_enable = is_enable;
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
-}
-
static int
vppcom_app_session_enable (void)
{
@@ -585,57 +265,6 @@ vppcom_app_session_enable (void)
return VPPCOM_OK;
}
-static void
- vl_api_session_enable_disable_reply_t_handler
- (vl_api_session_enable_disable_reply_t * mp)
-{
- 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;
-}
-
-static void
-vppcom_app_send_attach (void)
-{
- vl_api_application_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);
-
- 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->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);
- 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_SEGMENT_SIZE] = vcm->cfg.segment_size;
- bmp->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = vcm->cfg.add_segment_size;
- bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = vcm->cfg.rx_fifo_size;
- bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = vcm->cfg.tx_fifo_size;
- bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] =
- vcm->cfg.preallocated_fifo_pairs;
- bmp->options[APP_OPTIONS_EVT_QUEUE_SIZE] = vcm->cfg.event_queue_size;
- if (nsid_len)
- {
- bmp->namespace_id_len = nsid_len;
- clib_memcpy (bmp->namespace_id, vcm->cfg.namespace_id, nsid_len);
- bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret;
- }
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
-}
-
static int
vppcom_app_attach (void)
{
@@ -653,602 +282,6 @@ vppcom_app_attach (void)
return VPPCOM_OK;
}
-static void
-vppcom_app_detach (void)
-{
- 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->context = htonl (0xfeedface);
- vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
-}
-
-static void
-vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_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));
- if (mp->retval)
- {
- clib_warning ("VCL<%d>: attach failed: %U", getpid (),
- format_api_error, ntohl (mp->retval));
- return;
- }
-
- if (mp->segment_name_length == 0)
- {
- clib_warning ("VCL<%d>: segment_name_length zero", getpid ());
- return;
- }
-
- a->segment_name = (char *) mp->segment_name;
- a->segment_size = mp->segment_size;
-
- ASSERT (mp->app_event_queue_address);
-
- /* Attach to the segment vpp created */
- rv = svm_fifo_segment_attach (a);
- vec_reset_length (a->new_segment_indices);
- if (PREDICT_FALSE (rv))
- {
- clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed",
- getpid (), mp->segment_name);
- return;
- }
-
- vcm->app_event_queue =
- uword_to_pointer (mp->app_event_queue_address, svm_queue_t *);
-
- vcm->app_state = STATE_APP_ATTACHED;
-}
-
-static void
-vl_api_application_detach_reply_t_handler (vl_api_application_detach_reply_t *
- mp)
-{
- if (mp->retval)
- clib_warning ("VCL<%d>: detach failed: %U", getpid (), format_api_error,
- ntohl (mp->retval));
-
- vcm->app_state = STATE_APP_ENABLED;
-}
-
-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));
-}
-
-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))
- {
- clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed",
- getpid (), mp->segment_name);
- return;
- }
-
- 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);
-}
-
-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)
- {
- 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);
- }
- 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)
- {
- int rval;
- VCL_SESSION_LOCK ();
- rval = vppcom_session_at_index (p[0], &session);
- if (PREDICT_FALSE (rval))
- {
- 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);
- }
- else
- {
- /* 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));
- }
- VCL_SESSION_UNLOCK ();
- }
- 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);
- }
-
- 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);
-}
-
-static void
-vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp)
-{
- vcl_session_t *session = 0;
- u32 session_index;
- svm_fifo_t *rx_fifo, *tx_fifo;
- int rv = VPPCOM_OK;
-
- 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 ();
- }
- session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address,
- svm_queue_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 ();
-}
-
-static 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);
-}
-
-static inline void
-vppcom_send_disconnect_session_reply (u64 vpp_handle, u32 session_index,
- int rv)
-{
- vl_api_disconnect_session_reply_t *rmp;
-
- VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect msg",
- getpid (), vpp_handle, session_index);
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
-
- 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);
-}
-
-static inline void
-vppcom_send_disconnect_session (u64 vpp_handle, u32 session_index)
-{
- vl_api_disconnect_session_t *dmp;
-
- 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);
-}
-
-static void
-vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_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;
- }
-
- session->vpp_handle = mp->handle;
- session->transport.is_ip4 = mp->lcl_is_ip4;
- session->transport.lcl_ip = to_ip46 (mp->lcl_is_ip4 ? IP46_TYPE_IP4 :
- IP46_TYPE_IP6, mp->lcl_ip);
- 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);
-}
-
-u8 *
-format_ip4_address (u8 * s, va_list * args)
-{
- u8 *a = va_arg (*args, u8 *);
- return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-}
-
-u8 *
-format_ip6_address (u8 * s, va_list * args)
-{
- ip6_address_t *a = va_arg (*args, ip6_address_t *);
- u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon;
-
- i_max_n_zero = ARRAY_LEN (a->as_u16);
- max_n_zeros = 0;
- i_first_zero = i_max_n_zero;
- n_zeros = 0;
- for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
- {
- u32 is_zero = a->as_u16[i] == 0;
- if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16))
- {
- i_first_zero = i;
- n_zeros = 0;
- }
- n_zeros += is_zero;
- if ((!is_zero && n_zeros > max_n_zeros)
- || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros))
- {
- i_max_n_zero = i_first_zero;
- max_n_zeros = n_zeros;
- i_first_zero = ARRAY_LEN (a->as_u16);
- n_zeros = 0;
- }
- }
-
- last_double_colon = 0;
- for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
- {
- if (i == i_max_n_zero && max_n_zeros > 1)
- {
- s = format (s, "::");
- i += max_n_zeros - 1;
- last_double_colon = 1;
- }
- else
- {
- s = format (s, "%s%x",
- (last_double_colon || i == 0) ? "" : ":",
- clib_net_to_host_u16 (a->as_u16[i]));
- last_double_colon = 0;
- }
- }
-
- return s;
-}
-
-/* Format an IP46 address. */
-u8 *
-format_ip46_address (u8 * s, va_list * args)
-{
- ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
- ip46_type_t type = va_arg (*args, ip46_type_t);
- int is_ip4 = 1;
-
- switch (type)
- {
- case IP46_TYPE_ANY:
- is_ip4 = ip46_address_is_ip4 (ip46);
- break;
- case IP46_TYPE_IP4:
- is_ip4 = 1;
- break;
- case IP46_TYPE_IP6:
- is_ip4 = 0;
- break;
- }
-
- return is_ip4 ?
- format (s, "%U", format_ip4_address, &ip46->ip4) :
- format (s, "%U", format_ip6_address, &ip46->ip6);
-}
-
-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;
-
- VCL_SESSION_LOCK ();
-
- VCL_ACCEPT_FIFO_LOCK ();
- elts = clib_fifo_free_elts (vcm->client_session_index_fifo);
- VCL_ACCEPT_FIFO_UNLOCK ();
-
- 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;
- }
-
- 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;
- }
-
- /* 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_queue_t *);
- session->session_state = STATE_ACCEPT;
- session->transport.rmt_port = mp->port;
- session->transport.is_ip4 = mp->is_ip4;
- session->transport.rmt_ip = to_ip46 (mp->is_ip4 ? IP46_TYPE_IP4 :
- IP46_TYPE_IP6, mp->ip);
-
- /* 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 ();
-}
-
-/* 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() */
-static void
-vppcom_send_bind_sock (vcl_session_t * session, u32 session_index)
-{
- vl_api_bind_sock_t *bmp;
-
- /* Assumes caller has acquired spinlock: vcm->sessions_lockp */
- bmp = vl_msg_api_alloc (sizeof (*bmp));
- memset (bmp, 0, sizeof (*bmp));
-
- 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);
-}
-
-static void
-vppcom_send_unbind_sock (u64 vpp_handle)
-{
- 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);
-}
-
static int
vppcom_session_unbind (u32 session_index)
{
@@ -1275,7 +308,7 @@ done:
return rv;
}
-static inline int
+static int
vppcom_session_disconnect (u32 session_index)
{
int rv;
@@ -1327,493 +360,6 @@ done:
return rv;
}
-#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)
-
-static 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);
- foreach_sock_msg;
-#undef _
-}
-
-static void
-vppcom_cfg_init (vppcom_cfg_t * vcl_cfg)
-{
- ASSERT (vcl_cfg);
-
- vcl_cfg->heapsize = (256ULL << 20);
- vcl_cfg->vpp_api_q_length = 1024;
- vcl_cfg->segment_baseva = 0x200000000ULL;
- vcl_cfg->segment_size = (256 << 20);
- vcl_cfg->add_segment_size = (128 << 20);
- vcl_cfg->preallocated_fifo_pairs = 8;
- vcl_cfg->rx_fifo_size = (1 << 20);
- vcl_cfg->tx_fifo_size = (1 << 20);
- vcl_cfg->event_queue_size = 2048;
- vcl_cfg->listen_queue_size = CLIB_CACHE_LINE_BYTES / sizeof (u32);
- vcl_cfg->app_timeout = 10 * 60.0;
- vcl_cfg->session_timeout = 10 * 60.0;
- vcl_cfg->accept_timeout = 60.0;
- vcl_cfg->event_ring_size = (128 << 10);
- vcl_cfg->event_log_path = "/dev/shm";
-}
-
-static void
-vppcom_cfg_heapsize (char *conf_fname)
-{
- vppcom_cfg_t *vcl_cfg = &vcm->cfg;
- FILE *fp;
- char inbuf[4096];
- int argc = 1;
- char **argv = NULL;
- char *arg = NULL;
- char *p;
- int i;
- u8 *sizep;
- u32 size;
- void *vcl_mem;
- void *heap;
-
- fp = fopen (conf_fname, "r");
- if (fp == NULL)
- {
- VDBG (0, "VCL<%d>: using default heapsize %lld (0x%llx)", getpid (),
- vcl_cfg->heapsize, vcl_cfg->heapsize);
- goto defaulted;
- }
-
- argv = calloc (1, sizeof (char *));
- if (argv == NULL)
- {
- VDBG (0, "VCL<%d>: calloc failed, using default heapsize %lld (0x%llx)",
- getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
- goto defaulted;
- }
-
- while (1)
- {
- if (fgets (inbuf, 4096, fp) == 0)
- break;
- p = strtok (inbuf, " \t\n");
- while (p != NULL)
- {
- if (*p == '#')
- break;
- argc++;
- char **tmp = realloc (argv, argc * sizeof (char *));
- if (tmp == NULL)
- {
- VDBG (0, "VCL<%d>: realloc failed, using default heapsize %lld "
- "(0x%llx)", getpid (), vcl_cfg->heapsize,
- vcl_cfg->heapsize);
- goto defaulted;
- }
- argv = tmp;
- arg = strndup (p, 1024);
- if (arg == NULL)
- {
- VDBG (0, "VCL<%d>: strndup failed, using default heapsize %lld "
- "(0x%llx)", getpid (), vcl_cfg->heapsize,
- vcl_cfg->heapsize);
- goto defaulted;
- }
- argv[argc - 1] = arg;
- p = strtok (NULL, " \t\n");
- }
- }
-
- fclose (fp);
- fp = NULL;
-
- char **tmp = realloc (argv, (argc + 1) * sizeof (char *));
- if (tmp == NULL)
- {
- VDBG (0, "VCL<%d>: realloc failed, using default heapsize %lld "
- "(0x%llx)", getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
- goto defaulted;
- }
- argv = tmp;
- argv[argc] = NULL;
-
- /*
- * Look for and parse the "heapsize" config parameter.
- * Manual since none of the clib infra has been bootstrapped yet.
- *
- * Format: heapsize <nn>[mM][gG]
- */
-
- for (i = 1; i < (argc - 1); i++)
- {
- if (!strncmp (argv[i], "heapsize", 8))
- {
- sizep = (u8 *) argv[i + 1];
- size = 0;
- while (*sizep >= '0' && *sizep <= '9')
- {
- size *= 10;
- size += *sizep++ - '0';
- }
- if (size == 0)
- {
- VDBG (0, "VCL<%d>: parse error '%s %s', using default "
- "heapsize %lld (0x%llx)", getpid (), argv[i], argv[i + 1],
- vcl_cfg->heapsize, vcl_cfg->heapsize);
- goto defaulted;
- }
-
- if (*sizep == 'g' || *sizep == 'G')
- vcl_cfg->heapsize = size << 30;
- else if (*sizep == 'm' || *sizep == 'M')
- vcl_cfg->heapsize = size << 20;
- else
- {
- VDBG (0, "VCL<%d>: parse error '%s %s', using default "
- "heapsize %lld (0x%llx)", getpid (), argv[i], argv[i + 1],
- vcl_cfg->heapsize, vcl_cfg->heapsize);
- goto defaulted;
- }
- }
- }
-
-defaulted:
- if (fp != NULL)
- fclose (fp);
- if (argv != NULL)
- free (argv);
-
- vcl_mem = mmap (0, vcl_cfg->heapsize, PROT_READ | PROT_WRITE,
- MAP_SHARED | MAP_ANONYMOUS, -1, 0);
- if (vcl_mem == MAP_FAILED)
- {
- clib_unix_error ("VCL<%d>: ERROR: mmap(0, %lld == 0x%llx, "
- "PROT_READ | PROT_WRITE,MAP_SHARED | MAP_ANONYMOUS, "
- "-1, 0) failed!",
- getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize);
- ASSERT (vcl_mem != MAP_FAILED);
- return;
- }
- heap = clib_mem_init (vcl_mem, vcl_cfg->heapsize);
- if (!heap)
- {
- clib_warning ("VCL<%d>: ERROR: clib_mem_init() failed!", getpid ());
- ASSERT (heap);
- return;
- }
- vcl_mem = clib_mem_alloc (sizeof (_vppcom_main));
- if (!vcl_mem)
- {
- clib_warning ("VCL<%d>: ERROR: clib_mem_alloc() failed!", getpid ());
- ASSERT (vcl_mem);
- return;
- }
-
- clib_memcpy (vcl_mem, &_vppcom_main, sizeof (_vppcom_main));
- vcm = vcl_mem;
-
- VDBG (0, "VCL<%d>: allocated VCL heap = %p, size %lld (0x%llx)", getpid (),
- heap, vcl_cfg->heapsize, vcl_cfg->heapsize);
-}
-
-static void
-vppcom_cfg_read (char *conf_fname)
-{
- vppcom_cfg_t *vcl_cfg = &vcm->cfg;
- int fd;
- unformat_input_t _input, *input = &_input;
- unformat_input_t _line_input, *line_input = &_line_input;
- u8 vc_cfg_input = 0;
- u8 *chroot_path;
- struct stat s;
- u32 uid, gid, q_len;
-
- fd = open (conf_fname, O_RDONLY);
- if (fd < 0)
- {
- VDBG (0, "VCL<%d>: using default configuration.", getpid (),
- conf_fname);
- goto file_done;
- }
-
- if (fstat (fd, &s) < 0)
- {
- VDBG (0, "VCL<%d>: failed to stat `%s', using default configuration",
- getpid (), conf_fname);
- goto file_done;
- }
-
- if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode)))
- {
- VDBG (0, "VCL<%d>: not a regular file `%s', using default "
- "configuration", getpid (), conf_fname);
- goto file_done;
- }
-
- unformat_init_clib_file (input, fd);
-
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- (void) unformat_user (input, unformat_line_input, line_input);
- unformat_skip_white_space (line_input);
-
- if (unformat (line_input, "vcl {"))
- {
- vc_cfg_input = 1;
- continue;
- }
-
- if (vc_cfg_input)
- {
- if (unformat (line_input, "heapsize %s", &chroot_path))
- {
- vec_terminate_c_string (chroot_path);
- VDBG (0, "VCL<%d>: configured heapsize %s, actual heapsize %lld"
- " (0x%llx)", getpid (), chroot_path, vcl_cfg->heapsize,
- vcl_cfg->heapsize);
- vec_free (chroot_path);
- }
- else if (unformat (line_input, "api-prefix %s", &chroot_path))
- {
- vec_terminate_c_string (chroot_path);
- if (vcl_cfg->vpp_api_filename)
- vec_free (vcl_cfg->vpp_api_filename);
- vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c",
- chroot_path, 0);
- vl_set_memory_root_path ((char *) chroot_path);
-
- VDBG (0, "VCL<%d>: configured api-prefix (%s) and api filename"
- " (%s)", getpid (), chroot_path,
- vcl_cfg->vpp_api_filename);
- chroot_path = 0; /* Don't vec_free() it! */
- }
- else if (unformat (line_input, "vpp-api-q-length %d", &q_len))
- {
- if (q_len < vcl_cfg->vpp_api_q_length)
- {
- clib_warning ("VCL<%d>: ERROR: configured vpp-api-q-length "
- "(%u) is too small! Using default: %u ",
- getpid (), q_len, vcl_cfg->vpp_api_q_length);
- }
- else
- {
- vcl_cfg->vpp_api_q_length = q_len;
-
- VDBG (0, "VCL<%d>: configured vpp-api-q-length %u",
- getpid (), vcl_cfg->vpp_api_q_length);
- }
- }
- else if (unformat (line_input, "uid %d", &uid))
- {
- vl_set_memory_uid (uid);
- VDBG (0, "VCL<%d>: configured uid %d", getpid (), uid);
- }
- else if (unformat (line_input, "gid %d", &gid))
- {
- vl_set_memory_gid (gid);
- VDBG (0, "VCL<%d>: configured gid %d", getpid (), gid);
- }
- else if (unformat (line_input, "segment-baseva 0x%lx",
- &vcl_cfg->segment_baseva))
- {
- VDBG (0, "VCL<%d>: configured segment_baseva 0x%lx", getpid (),
- vcl_cfg->segment_baseva);
- }
- else if (unformat (line_input, "segment-size 0x%lx",
- &vcl_cfg->segment_size))
- {
- VDBG (0, "VCL<%d>: configured segment_size 0x%lx (%ld)",
- getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size);
- }
- else if (unformat (line_input, "segment-size %ld",
- &vcl_cfg->segment_size))
- {
- VDBG (0, "VCL<%d>: configured segment_size %ld (0x%lx)",
- getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size);
- }
- else if (unformat (line_input, "add-segment-size 0x%lx",
- &vcl_cfg->add_segment_size))
- {
- VDBG (0, "VCL<%d>: configured add_segment_size 0x%lx (%ld)",
- getpid (), vcl_cfg->add_segment_size,
- vcl_cfg->add_segment_size);
- }
- else if (unformat (line_input, "add-segment-size %ld",
- &vcl_cfg->add_segment_size))
- {
- VDBG (0, "VCL<%d>: configured add_segment_size %ld (0x%lx)",
- getpid (), vcl_cfg->add_segment_size,
- vcl_cfg->add_segment_size);
- }
- else if (unformat (line_input, "preallocated-fifo-pairs %d",
- &vcl_cfg->preallocated_fifo_pairs))
- {
- VDBG (0, "VCL<%d>: configured preallocated_fifo_pairs %d "
- "(0x%x)", getpid (), vcl_cfg->preallocated_fifo_pairs,
- vcl_cfg->preallocated_fifo_pairs);
- }
- else if (unformat (line_input, "rx-fifo-size 0x%lx",
- &vcl_cfg->rx_fifo_size))
- {
- VDBG (0, "VCL<%d>: configured rx_fifo_size 0x%lx (%ld)",
- getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size);
- }
- else if (unformat (line_input, "rx-fifo-size %ld",
- &vcl_cfg->rx_fifo_size))
- {
- VDBG (0, "VCL<%d>: configured rx_fifo_size %ld (0x%lx)",
- getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size);
- }
- else if (unformat (line_input, "tx-fifo-size 0x%lx",
- &vcl_cfg->tx_fifo_size))
- {
- VDBG (0, "VCL<%d>: configured tx_fifo_size 0x%lx (%ld)",
- getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size);
- }
- else if (unformat (line_input, "tx-fifo-size %ld",
- &vcl_cfg->tx_fifo_size))
- {
- VDBG (0, "VCL<%d>: configured tx_fifo_size %ld (0x%lx)",
- getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size);
- }
- else if (unformat (line_input, "event-queue-size 0x%lx",
- &vcl_cfg->event_queue_size))
- {
- VDBG (0, "VCL<%d>: configured event_queue_size 0x%lx (%ld)",
- getpid (), vcl_cfg->event_queue_size,
- vcl_cfg->event_queue_size);
- }
- else if (unformat (line_input, "event-queue-size %ld",
- &vcl_cfg->event_queue_size))
- {
- VDBG (0, "VCL<%d>: configured event_queue_size %ld (0x%lx)",
- getpid (), vcl_cfg->event_queue_size,
- vcl_cfg->event_queue_size);
- }
- else if (unformat (line_input, "listen-queue-size 0x%lx",
- &vcl_cfg->listen_queue_size))
- {
- VDBG (0, "VCL<%d>: configured listen_queue_size 0x%lx (%ld)",
- getpid (), vcl_cfg->listen_queue_size,
- vcl_cfg->listen_queue_size);
- }
- else if (unformat (line_input, "listen-queue-size %ld",
- &vcl_cfg->listen_queue_size))
- {
- VDBG (0, "VCL<%d>: configured listen_queue_size %ld (0x%lx)",
- getpid (), vcl_cfg->listen_queue_size,
- vcl_cfg->listen_queue_size);
- }
- else if (unformat (line_input, "app-timeout %f",
- &vcl_cfg->app_timeout))
- {
- VDBG (0, "VCL<%d>: configured app_timeout %f",
- getpid (), vcl_cfg->app_timeout);
- }
- else if (unformat (line_input, "session-timeout %f",
- &vcl_cfg->session_timeout))
- {
- VDBG (0, "VCL<%d>: configured session_timeout %f",
- getpid (), vcl_cfg->session_timeout);
- }
- else if (unformat (line_input, "accept-timeout %f",
- &vcl_cfg->accept_timeout))
- {
- VDBG (0, "VCL<%d>: configured accept_timeout %f",
- getpid (), vcl_cfg->accept_timeout);
- }
- else if (unformat (line_input, "app-proxy-transport-tcp"))
- {
- vcl_cfg->app_proxy_transport_tcp = 1;
- VDBG (0, "VCL<%d>: configured app_proxy_transport_tcp (%d)",
- getpid (), vcl_cfg->app_proxy_transport_tcp);
- }
- else if (unformat (line_input, "app-proxy-transport-udp"))
- {
- vcl_cfg->app_proxy_transport_udp = 1;
- VDBG (0, "VCL<%d>: configured app_proxy_transport_udp (%d)",
- getpid (), vcl_cfg->app_proxy_transport_udp);
- }
- else if (unformat (line_input, "app-scope-local"))
- {
- vcl_cfg->app_scope_local = 1;
- VDBG (0, "VCL<%d>: configured app_scope_local (%d)",
- getpid (), vcl_cfg->app_scope_local);
- }
- else if (unformat (line_input, "app-scope-global"))
- {
- vcl_cfg->app_scope_global = 1;
- VDBG (0, "VCL<%d>: configured app_scope_global (%d)",
- getpid (), vcl_cfg->app_scope_global);
- }
- else if (unformat (line_input, "namespace-secret %lu",
- &vcl_cfg->namespace_secret))
- {
- VDBG (0, "VCL<%d>: configured namespace_secret %lu (0x%lx)",
- getpid (), vcl_cfg->namespace_secret,
- vcl_cfg->namespace_secret);
- }
- else if (unformat (line_input, "namespace-id %v",
- &vcl_cfg->namespace_id))
- {
- vl_api_application_attach_t *mp;
- u32 max_nsid_vec_len = sizeof (mp->namespace_id) - 1;
- u32 nsid_vec_len = vec_len (vcl_cfg->namespace_id);
- if (nsid_vec_len > max_nsid_vec_len)
- {
- _vec_len (vcl_cfg->namespace_id) = max_nsid_vec_len;
- VDBG (0, "VCL<%d>: configured namespace_id is too long,"
- " truncated to %d characters!",
- getpid (), max_nsid_vec_len);
- }
-
- VDBG (0, "VCL<%d>: configured namespace_id %v",
- getpid (), vcl_cfg->namespace_id);
- }
- else if (unformat (line_input, "}"))
- {
- vc_cfg_input = 0;
- VDBG (0, "VCL<%d>: completed parsing vppcom config!",
- getpid ());
- goto input_done;
- }
- else
- {
- if (line_input->buffer[line_input->index] != '#')
- {
- clib_warning ("VCL<%d>: Unknown vppcom config option: '%s'",
- getpid (), (char *)
- &line_input->buffer[line_input->index]);
- }
- }
- }
- }
-
-input_done:
- unformat_free (input);
-
-file_done:
- if (fd >= 0)
- close (fd);
-}
-
/*
* VPPCOM Public API functions
*/
@@ -1827,113 +373,17 @@ vppcom_app_create (char *app_name)
if (!vcm->init)
{
- char *conf_fname;
- char *env_var_str;
-
vcm->init = 1;
- vppcom_cfg_init (vcl_cfg);
- env_var_str = getenv (VPPCOM_ENV_DEBUG);
- if (env_var_str)
- {
- u32 tmp;
- if (sscanf (env_var_str, "%u", &tmp) != 1)
- clib_warning ("VCL<%d>: WARNING: Invalid debug level specified "
- "in the environment variable " VPPCOM_ENV_DEBUG
- " (%s)!\n", getpid (), env_var_str);
- else
- {
- vcm->debug = tmp;
- VDBG (0, "VCL<%d>: configured VCL debug level (%u) from "
- VPPCOM_ENV_DEBUG "!", getpid (), vcm->debug);
- }
- }
- conf_fname = getenv (VPPCOM_ENV_CONF);
- if (!conf_fname)
- conf_fname = VPPCOM_CONF_DEFAULT;
- vppcom_cfg_heapsize (conf_fname);
- vcl_cfg = &vcm->cfg;
clib_spinlock_init (&vcm->session_fifo_lockp);
clib_fifo_validate (vcm->client_session_index_fifo,
vcm->cfg.listen_queue_size);
- vppcom_cfg_read (conf_fname);
-
-
- env_var_str = getenv (VPPCOM_ENV_API_PREFIX);
- if (env_var_str)
- {
- if (vcl_cfg->vpp_api_filename)
- vec_free (vcl_cfg->vpp_api_filename);
- vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c",
- env_var_str, 0);
- vl_set_memory_root_path ((char *) env_var_str);
-
- VDBG (0, "VCL<%d>: configured api prefix (%s) and filename (%s) "
- "from " VPPCOM_ENV_API_PREFIX "!",
- getpid (), env_var_str, vcl_cfg->vpp_api_filename);
- }
- env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID);
- if (env_var_str)
- {
- u32 ns_id_vec_len = strlen (env_var_str);
+ clib_spinlock_init (&vcm->sessions_lockp);
- vec_reset_length (vcm->cfg.namespace_id);
- vec_validate (vcm->cfg.namespace_id, ns_id_vec_len - 1);
- clib_memcpy (vcm->cfg.namespace_id, env_var_str, ns_id_vec_len);
-
- VDBG (0, "VCL<%d>: configured namespace_id (%v) from "
- VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (),
- vcm->cfg.namespace_id);
- }
- env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET);
- if (env_var_str)
- {
- u64 tmp;
- if (sscanf (env_var_str, "%lu", &tmp) != 1)
- clib_warning ("VCL<%d>: WARNING: Invalid namespace secret "
- "specified in the environment variable "
- VPPCOM_ENV_APP_NAMESPACE_SECRET
- " (%s)!\n", getpid (), env_var_str);
- else
- {
- vcm->cfg.namespace_secret = tmp;
- VDBG (0, "VCL<%d>: configured namespace secret (%lu) from "
- VPPCOM_ENV_APP_NAMESPACE_SECRET "!", getpid (),
- vcm->cfg.namespace_secret);
- }
- }
- if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP))
- {
- vcm->cfg.app_proxy_transport_tcp = 1;
- VDBG (0, "VCL<%d>: configured app_proxy_transport_tcp (%u) from "
- VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP "!", getpid (),
- vcm->cfg.app_proxy_transport_tcp);
- }
- if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP))
- {
- vcm->cfg.app_proxy_transport_udp = 1;
- VDBG (0, "VCL<%d>: configured app_proxy_transport_udp (%u) from "
- VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP "!", getpid (),
- vcm->cfg.app_proxy_transport_udp);
- }
- if (getenv (VPPCOM_ENV_APP_SCOPE_LOCAL))
- {
- vcm->cfg.app_scope_local = 1;
- VDBG (0, "VCL<%d>: configured app_scope_local (%u) from "
- VPPCOM_ENV_APP_SCOPE_LOCAL "!", getpid (),
- vcm->cfg.app_scope_local);
- }
- if (getenv (VPPCOM_ENV_APP_SCOPE_GLOBAL))
- {
- vcm->cfg.app_scope_global = 1;
- VDBG (0, "VCL<%d>: configured app_scope_global (%u) from "
- VPPCOM_ENV_APP_SCOPE_GLOBAL "!", getpid (),
- vcm->cfg.app_scope_global);
- }
+ vppcom_cfg (&vcm->cfg);
vcm->main_cpu = os_get_thread_index ();
heap = clib_mem_get_per_cpu_heap ();
h = mheap_header (heap);
-
/* make the main heap thread-safe */
h->flags |= MHEAP_FLAG_THREAD_SAFE;
@@ -1943,12 +393,10 @@ vppcom_app_create (char *app_name)
vppcom_init_error_string_table ();
svm_fifo_segment_main_init (vcl_cfg->segment_baseva,
20 /* timeout in secs */ );
- clib_spinlock_init (&vcm->sessions_lockp);
}
if (vcm->my_client_index == ~0)
{
-
/* API hookup and connect to VPP */
vppcom_api_hookup ();
vcl_elog_init (vcm);
@@ -2005,7 +453,7 @@ vppcom_app_destroy (void)
getpid (), vcm->my_client_index, vcm->my_client_index);
vcl_evt (VCL_EVT_DETACH, vcm);
- vppcom_app_detach ();
+ vppcom_app_send_detach ();
orig_app_timeout = vcm->cfg.app_timeout;
vcm->cfg.app_timeout = 2.0;
rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED);
@@ -4311,270 +2759,6 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time)
}
/*
- * VPPCOM Event Functions
- */
-
-void *
-vppcom_session_io_thread_fn (void *arg)
-{
- vppcom_session_io_thread_t *evt = (vppcom_session_io_thread_t *) arg;
- u32 *session_indexes = 0, *session_index;
- int i, rv;
- u32 bytes = 0;
- vcl_session_t *session;
-
- while (1)
- {
- vec_reset_length (session_indexes);
- VCE_IO_SESSIONS_LOCK ();
- pool_foreach (session_index, evt->active_session_indexes, (
- {
- vec_add1
- (session_indexes,
- *session_index);
- }
- ));
- VCE_IO_SESSIONS_UNLOCK ();
- if (session_indexes)
- {
- for (i = 0; i < vec_len (session_indexes); ++i)
- {
- VCL_SESSION_LOCK_AND_GET (session_indexes[i], &session);
- bytes = svm_fifo_max_dequeue (session->rx_fifo);
- VCL_SESSION_UNLOCK ();
-
- if (bytes)
- {
- vppcom_ioevent_t *eio;
- vce_event_t *ev;
- u32 ev_idx;
-
- VCL_EVENTS_LOCK ();
-
- pool_get (vcm->event_thread.vce_events, ev);
- ev_idx = (u32) (ev - vcm->event_thread.vce_events);
- eio = vce_get_event_data (ev, sizeof (*eio));
- ev->evk.eid = VCL_EVENT_IOEVENT_RX_FIFO;
- ev->evk.session_index = session_indexes[i];
- eio->bytes = bytes;
- eio->session_index = session_indexes[i];
-
- VCL_EVENTS_UNLOCK ();
-
- rv = vce_generate_event (&vcm->event_thread, ev_idx);
- }
- }
- }
- struct timespec ts;
- ts.tv_sec = 0;
- ts.tv_nsec = 1000000; /* 1 millisecond */
- nanosleep (&ts, NULL);
- }
-done:
- VCL_SESSION_UNLOCK ();
- return NULL;
-}
-
-int
-vppcom_start_io_event_thread (vppcom_session_io_thread_t * evt,
- u8 max_sessions)
-{
- pthread_cond_init (&(evt->vce_io_cond), NULL);
- pthread_mutex_init (&(evt->vce_io_lock), NULL);
-
- clib_spinlock_init (&(evt->io_sessions_lockp));
-
- return pthread_create (&(evt->thread), NULL /* attr */ ,
- vppcom_session_io_thread_fn, evt);
-}
-
-void
-vce_registered_ioevent_handler_fn (void *arg)
-{
- vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg;
- vppcom_ioevent_t *eio;
- vce_event_t *ev;
- u32 ioevt_ndx = (u64) (reg->handler_fn_args);
- vppcom_session_ioevent_t *ioevent, ioevent_;
-
- VCL_EVENTS_LOCK ();
- ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx);
- eio = vce_get_event_data (ev, sizeof (*eio));
- VCL_EVENTS_UNLOCK ();
-
- VCL_IO_SESSIONS_LOCK ();
- ioevent = pool_elt_at_index (vcm->session_io_thread.ioevents, ioevt_ndx);
- ioevent_ = *ioevent;
- VCL_IO_SESSIONS_UNLOCK ();
- (ioevent_.user_cb) (eio, ioevent_.user_cb_data);
- vce_clear_event (&vcm->event_thread, reg->ev_idx);
- return;
-
- /*TODO - Unregister check in close for this listener */
-
-}
-
-void
-vce_registered_listener_connect_handler_fn (void *arg)
-{
- vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg;
- vce_event_connect_request_t *ecr;
- vce_event_t *ev;
- vppcom_endpt_t ep;
-
- vcl_session_t *new_session;
- int rv;
-
- vppcom_session_listener_t *session_listener =
- (vppcom_session_listener_t *) reg->handler_fn_args;
-
- VCL_EVENTS_LOCK ();
- ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx);
- ecr = vce_get_event_data (ev, sizeof (*ecr));
- VCL_EVENTS_UNLOCK ();
- VCL_SESSION_LOCK_AND_GET (ecr->accepted_session_index, &new_session);
-
- ep.is_ip4 = new_session->transport.is_ip4;
- ep.port = new_session->transport.rmt_port;
- if (new_session->transport.is_ip4)
- clib_memcpy (&ep.ip, &new_session->transport.rmt_ip.ip4,
- sizeof (ip4_address_t));
- else
- clib_memcpy (&ep.ip, &new_session->transport.rmt_ip.ip6,
- sizeof (ip6_address_t));
-
- vppcom_send_accept_session_reply (new_session->vpp_handle,
- new_session->client_context,
- 0 /* retval OK */ );
- VCL_SESSION_UNLOCK ();
-
- (session_listener->user_cb) (ecr->accepted_session_index, &ep,
- session_listener->user_cb_data);
-
- if (vcm->session_io_thread.io_sessions_lockp)
- {
- /* Throw this new accepted session index into the rx poll thread pool */
- VCL_IO_SESSIONS_LOCK ();
- u32 *active_session_index;
- pool_get (vcm->session_io_thread.active_session_indexes,
- active_session_index);
- *active_session_index = ecr->accepted_session_index;
- VCL_IO_SESSIONS_UNLOCK ();
- }
-
- /*TODO - Unregister check in close for this listener */
- return;
-
-done:
- ASSERT (0); // If we can't get a lock or accepted session fails, lets blow up.
-}
-
-/**
- * @brief vce_poll_wait_connect_request_handler_fn
- * - used by vppcom_epoll_xxxx() for listener sessions
- * - when a vl_api_accept_session_t_handler() generates an event
- * this callback is alerted and sets the fields that vppcom_epoll_wait()
- * expects to see.
- *
- * @param arg - void* to be cast to vce_event_handler_reg_t*
- */
-void
-vce_poll_wait_connect_request_handler_fn (void *arg)
-{
- vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg;
- vce_event_t *ev;
- /* Retrieve the VCL_EVENT_CONNECT_REQ_ACCEPTED event */
- ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx);
- vce_event_connect_request_t *ecr = vce_get_event_data (ev, sizeof (*ecr));
-
- /* Add the accepted_session_index to the FIFO */
- VCL_ACCEPT_FIFO_LOCK ();
- clib_fifo_add1 (vcm->client_session_index_fifo,
- ecr->accepted_session_index);
- VCL_ACCEPT_FIFO_UNLOCK ();
-
- /* Recycling the event. */
- VCL_EVENTS_LOCK ();
- ev->recycle = 1;
- clib_fifo_add1 (vcm->event_thread.event_index_fifo, reg->ev_idx);
- VCL_EVENTS_UNLOCK ();
-}
-
-int
-vppcom_session_register_ioevent_cb (uint32_t session_index,
- vppcom_session_ioevent_cb cb,
- uint8_t rx, void *ptr)
-{
- int rv = VPPCOM_OK;
- vce_event_key_t evk;
- vppcom_session_ioevent_t *ioevent;
-
- if (!vcm->session_io_thread.io_sessions_lockp)
- rv = vppcom_start_io_event_thread (&vcm->session_io_thread, 100 /* DAW_TODO: ??? hard-coded value */
- );
-
- if (rv == VPPCOM_OK)
- {
- void *io_evt_ndx;
-
- /* Register handler for ioevent on session_index */
- VCL_IO_SESSIONS_LOCK ();
- pool_get (vcm->session_io_thread.ioevents, ioevent);
- io_evt_ndx = (void *) (ioevent - vcm->session_io_thread.ioevents);
- ioevent->user_cb = cb;
- ioevent->user_cb_data = ptr;
- VCL_IO_SESSIONS_UNLOCK ();
-
- evk.session_index = session_index;
- evk.eid = rx ? VCL_EVENT_IOEVENT_RX_FIFO : VCL_EVENT_IOEVENT_TX_FIFO;
-
- (void) vce_register_handler (&vcm->event_thread, &evk,
- vce_registered_ioevent_handler_fn,
- io_evt_ndx);
- }
- return rv;
-}
-
-int
-vppcom_session_register_listener (uint32_t session_index,
- vppcom_session_listener_cb cb,
- vppcom_session_listener_errcb
- errcb, uint8_t flags, int q_len, void *ptr)
-{
- int rv = VPPCOM_OK;
- vce_event_key_t evk;
- vppcom_session_listener_t *listener_args;
-
- if (!vcm->session_io_thread.io_sessions_lockp)
- rv = vppcom_start_io_event_thread (&vcm->session_io_thread, 100 /* DAW_TODO: ??? hard-coded value */
- );
- if (rv)
- {
- goto done;
- }
- rv = vppcom_session_listen (session_index, q_len);
- if (rv)
- {
- goto done;
- }
-
- /* Register handler for connect_request event on listen_session_index */
- listener_args = clib_mem_alloc (sizeof (vppcom_session_listener_t)); // DAW_TODO: Use a pool instead of thrashing the memory allocator!
- listener_args->user_cb = cb;
- listener_args->user_cb_data = ptr;
- listener_args->user_errcb = errcb;
-
- evk.session_index = session_index;
- evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED;
- (void) vce_register_handler (&vcm->event_thread, &evk,
- vce_registered_listener_connect_handler_fn,
- listener_args);
-
-done:
- return rv;
-}
-
-/*
* fd.io coding-style-patch-verification: ON
*
* Local Variables: