#include <vlibmemory/api.h>
#include <vnet/session/application.h>
#include <vnet/session/application_interface.h>
+#include <vnet/session/application_local.h>
#include <vnet/session/session_rules_table.h>
#include <vnet/session/session_table.h>
+#include <vnet/session/session.h>
#include <vnet/vnet_msg_enum.h>
session_t *listener;
svm_msg_q_t *vpp_queue;
application_t *server;
+ app_listener_t *al;
server = application_get (server_wrk->app_index);
reg =
if (session_has_transport (s))
{
listener = listen_session_get (s->listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
+ al = app_listener_get (server, listener->al_index);
+ mp->listener_handle = app_listener_handle (al);
if (application_is_proxy (server))
{
listener =
}
else
{
- local_session_t *ls = (local_session_t *) s;
- local_session_t *ll;
- if (application_local_session_listener_has_transport (ls))
- {
- listener = listen_session_get (ls->listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
- mp->is_ip4 = session_type_is_ip4 (listener->session_type);
- }
- else
- {
- ll = application_get_local_listen_session (server,
- ls->listener_index);
- if (ll->transport_listener_index != ~0)
- {
- listener = listen_session_get (ll->transport_listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
- }
- else
- {
- mp->listener_handle = application_local_session_handle (ll);
- }
- mp->is_ip4 = session_type_is_ip4 (ll->listener_session_type);
- }
- mp->handle = application_local_session_handle (ls);
- mp->port = ls->port;
- mp->vpp_event_queue_address = ls->client_evt_q;
- mp->server_event_queue_address = ls->server_evt_q;
+ ct_connection_t *ct;
+ ct = (ct_connection_t *) session_get_transport (s);
+ listener = listen_session_get (s->listener_index);
+ al = app_listener_get (server, listener->al_index);
+ mp->listener_handle = app_listener_handle (al);
+ mp->is_ip4 = session_type_is_ip4 (listener->session_type);
+ mp->handle = session_handle (s);
+ mp->port = ct->c_rmt_port;
+ mp->vpp_event_queue_address = ct->client_evt_q;
+ mp->server_event_queue_address = ct->server_evt_q;
}
vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
}
else
{
- local_session_t *ls = (local_session_t *) s;
- mp->handle = application_local_session_handle (ls);
- mp->lcl_port = ls->port;
- mp->vpp_event_queue_address = ls->server_evt_q;
- mp->client_event_queue_address = ls->client_evt_q;
+ ct_connection_t *ct;
+ ct = (ct_connection_t *) session_get_transport (s);
+ mp->handle = session_handle (s);
+ mp->lcl_port = ct->c_lcl_port;
+ mp->vpp_event_queue_address = ct->server_evt_q;
+ mp->client_event_queue_address = ct->client_evt_q;
mp->server_rx_fifo = pointer_to_uword (s->tx_fifo);
mp->server_tx_fifo = pointer_to_uword (s->rx_fifo);
}
session_accepted_msg_t *mp;
session_event_t *evt;
application_t *app;
+ app_listener_t *al;
app = application_get (app_wrk->app_index);
app_mq = app_wrk->event_queue;
if (session_has_transport (s))
{
listener = listen_session_get (s->listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
+ al = app_listener_get (app, listener->al_index);
+ mp->listener_handle = app_listener_handle (al);
if (application_is_proxy (app))
{
listener =
}
else
{
- local_session_t *ls = (local_session_t *) s;
- local_session_t *ll;
u8 main_thread = vlib_num_workers ()? 1 : 0;
+ ct_connection_t *ct;
+ ct = (ct_connection_t *) session_get_transport (s);
send_app_cut_through_registration_add (app_wrk->api_client_index,
app_wrk->wrk_map_index,
- ls->server_evt_q,
- ls->client_evt_q);
+ ct->server_evt_q,
+ ct->client_evt_q);
- if (application_local_session_listener_has_transport (ls))
- {
- listener = listen_session_get (ls->listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
- mp->is_ip4 = session_type_is_ip4 (listener->session_type);
- }
- else
- {
- ll = application_get_local_listen_session (app, ls->listener_index);
- if (ll->transport_listener_index != ~0)
- {
- listener = listen_session_get (ll->transport_listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
- }
- else
- {
- mp->listener_handle = application_local_session_handle (ll);
- }
- mp->is_ip4 = session_type_is_ip4 (ll->listener_session_type);
- }
- mp->handle = application_local_session_handle (ls);
- mp->port = ls->port;
+ listener = listen_session_get (s->listener_index);
+ al = app_listener_get (app, listener->al_index);
+ mp->listener_handle = app_listener_handle (al);
+ mp->is_ip4 = session_type_is_ip4 (listener->session_type);
+ mp->handle = session_handle (s);
+ mp->port = ct->c_rmt_port;
vpp_queue = session_manager_get_vpp_event_queue (main_thread);
mp->vpp_event_queue_address = pointer_to_uword (vpp_queue);
- mp->client_event_queue_address = ls->client_evt_q;
- mp->server_event_queue_address = ls->server_evt_q;
+ mp->client_event_queue_address = ct->client_evt_q;
+ mp->server_event_queue_address = ct->server_evt_q;
}
svm_msg_q_add_and_unlock (app_mq, msg);
SESSION_CTRL_EVT_DISCONNECTED);
}
-void
-mq_send_local_session_disconnected_cb (u32 app_wrk_index,
- local_session_t * ls)
-{
- app_worker_t *app_wrk = app_worker_get (app_wrk_index);
- session_handle_t sh = application_local_session_handle (ls);
-
- mq_send_session_close_evt (app_wrk, sh, SESSION_CTRL_EVT_DISCONNECTED);
-
- if (svm_fifo_n_subscribers (ls->rx_fifo))
- mq_notify_close_subscribers (app_wrk->app_index, sh, ls->rx_fifo,
- SESSION_CTRL_EVT_DISCONNECTED);
-}
-
static void
mq_send_session_reset_cb (session_t * s)
{
if (is_fail)
goto done;
- mp->segment_handle = session_segment_handle (s);
-
if (session_has_transport (s))
{
tc = session_get_transport (s);
mp->lcl_port = tc->lcl_port;
mp->server_rx_fifo = pointer_to_uword (s->rx_fifo);
mp->server_tx_fifo = pointer_to_uword (s->tx_fifo);
+ mp->segment_handle = session_segment_handle (s);
}
else
{
- local_session_t *ls = (local_session_t *) s;
u8 main_thread = vlib_num_workers ()? 1 : 0;
+ ct_connection_t *cct;
+ session_t *ss;
+ cct = (ct_connection_t *) session_get_transport (s);
send_app_cut_through_registration_add (app_wrk->api_client_index,
app_wrk->wrk_map_index,
- ls->client_evt_q,
- ls->server_evt_q);
+ cct->client_evt_q,
+ cct->server_evt_q);
- mp->handle = application_local_session_handle (ls);
- mp->lcl_port = ls->port;
+ mp->handle = session_handle (s);
+ mp->lcl_port = cct->c_lcl_port;
vpp_mq = session_manager_get_vpp_event_queue (main_thread);
mp->vpp_event_queue_address = pointer_to_uword (vpp_mq);
- mp->client_event_queue_address = ls->client_evt_q;
- mp->server_event_queue_address = ls->server_evt_q;
- mp->server_rx_fifo = pointer_to_uword (s->tx_fifo);
- mp->server_tx_fifo = pointer_to_uword (s->rx_fifo);
+ mp->client_event_queue_address = cct->client_evt_q;
+ mp->server_event_queue_address = cct->server_evt_q;
+ ss = ct_session_get_peer (s);
+ mp->server_rx_fifo = pointer_to_uword (ss->tx_fifo);
+ mp->server_tx_fifo = pointer_to_uword (ss->rx_fifo);
+ mp->segment_handle = session_segment_handle (ss);
}
done:
svm_msg_q_msg_t _msg, *msg = &_msg;
svm_msg_q_t *app_mq, *vpp_evt_q;
transport_connection_t *tc;
- session_t *ls = 0;
session_bound_msg_t *mp;
app_worker_t *app_wrk;
session_event_t *evt;
- application_t *app;
+ app_listener_t *al;
+ session_t *ls = 0;
app_wrk = app_worker_get (app_wrk_index);
- app = application_get (app_wrk->app_index);
app_mq = app_wrk->event_queue;
if (!app_mq)
{
goto done;
mp->handle = handle;
- if (application_has_global_scope (app))
- {
- ls = listen_session_get_from_handle (handle);
- tc = listen_session_get_transport (ls);
- mp->lcl_port = tc->lcl_port;
- mp->lcl_is_ip4 = tc->is_ip4;
- clib_memcpy_fast (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
- }
+ al = app_listener_get_w_handle (handle);
+ if (al->session_index != SESSION_INVALID_INDEX)
+ ls = app_listener_get_session (al);
else
- {
- local_session_t *local;
- local = application_get_local_listener_w_handle (handle);
- mp->lcl_port = local->port;
- mp->lcl_is_ip4 = session_type_is_ip4 (local->session_type);
- }
+ ls = app_listener_get_local_session (al);
+ tc = listen_session_get_transport (ls);
+ mp->lcl_port = tc->lcl_port;
+ mp->lcl_is_ip4 = tc->is_ip4;
+ clib_memcpy_fast (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
vpp_evt_q = session_manager_get_vpp_event_queue (0);
mp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
- if (ls && session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
+ if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
{
mp->rx_fifo = pointer_to_uword (ls->rx_fifo);
mp->tx_fifo = pointer_to_uword (ls->tx_fifo);
ssvm_private_t *segp, *evt_q_segment;
vnet_app_attach_args_t _a, *a = &_a;
vl_api_registration_t *reg;
- clib_error_t *error = 0;
u8 fd_flags = 0;
reg = vl_api_client_index_to_registration (mp->client_index);
mp->namespace_id_len);
}
- if ((error = vnet_application_attach (a)))
+ if ((rv = vnet_application_attach (a)))
{
- rv = clib_error_get_code (error);
- clib_error_report (error);
+ clib_warning ("attach returned: %d", rv);
vec_free (a->namespace_id);
goto done;
}
vl_api_bind_uri_t_handler (vl_api_bind_uri_t * mp)
{
transport_connection_t *tc = 0;
- vnet_bind_args_t _a, *a = &_a;
+ vnet_listen_args_t _a, *a = &_a;
vl_api_bind_uri_reply_t *rmp;
session_t *s;
application_t *app = 0;
rmp->handle = a->handle;
if (app && application_has_global_scope (app))
{
- s = listen_session_get_from_handle (a->handle);
+ app_listener_t* al = app_listener_get_w_handle(a->handle);
+ s = app_listener_get_session(al);
tc = listen_session_get_transport (s);
rmp->lcl_is_ip4 = tc->is_ip4;
rmp->lcl_port = tc->lcl_port;
{
vl_api_unbind_uri_reply_t *rmp;
application_t *app;
- vnet_unbind_args_t _a, *a = &_a;
+ vnet_unlisten_args_t _a, *a = &_a;
int rv;
if (session_manager_is_enabled () == 0)
vl_api_connect_session_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
application_t *app;
- clib_error_t *error = 0;
int rv = 0;
if (session_manager_is_enabled () == 0)
a->uri = (char *) mp->uri;
a->api_context = mp->context;
a->app_index = app->app_index;
- if ((error = vnet_connect_uri (a)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ if ((rv = vnet_connect_uri (a)))
+ clib_warning ("connect_uri returned: %d", rv);
}
else
{
vl_api_accept_session_reply_t_handler (vl_api_accept_session_reply_t * mp)
{
vnet_disconnect_args_t _a = { 0 }, *a = &_a;
- local_session_t *ls;
session_t *s;
/* Server isn't interested, kill the session */
return;
}
- if (session_handle_is_local (mp->handle))
+ s = session_get_from_handle_if_valid (mp->handle);
+ if (!s)
{
- ls = app_worker_get_local_session_from_handle (mp->handle);
- if (!ls || ls->app_wrk_index != mp->context)
- {
- clib_warning ("server %u doesn't own local handle %llu",
- mp->context, mp->handle);
- return;
- }
- if (app_worker_local_session_connect_notify (ls))
- return;
- ls->session_state = SESSION_STATE_READY;
+ clib_warning ("session doesn't exist");
+ return;
}
- else
+ if (s->app_wrk_index != mp->context)
{
- s = session_get_from_handle_if_valid (mp->handle);
- if (!s)
- {
- clib_warning ("session doesn't exist");
- return;
- }
- if (s->app_wrk_index != mp->context)
- {
- clib_warning ("app doesn't own session");
- return;
- }
- s->session_state = SESSION_STATE_READY;
+ clib_warning ("app doesn't own session");
+ return;
}
+ s->session_state = SESSION_STATE_READY;
+
+ if (!session_has_transport (s))
+ ct_session_connect_notify (s);
}
static void
static void
vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp)
{
+ vnet_listen_args_t _a, *a = &_a;
+ transport_connection_t *tc = 0;
vl_api_bind_sock_reply_t *rmp;
- vnet_bind_args_t _a, *a = &_a;
- int rv = 0;
- clib_error_t *error;
+ svm_msg_q_t *vpp_evt_q;
application_t *app = 0;
app_worker_t *app_wrk;
- session_t *s;
- transport_connection_t *tc = 0;
ip46_address_t *ip46;
- svm_msg_q_t *vpp_evt_q;
+ app_listener_t *al;
+ session_t *s;
+ int rv = 0;
if (session_manager_is_enabled () == 0)
{
a->app_index = app->app_index;
a->wrk_map_index = mp->wrk_index;
- if ((error = vnet_bind (a)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ if ((rv = vnet_listen (a)))
+ clib_warning ("listen returned: %d", rv);
done:
/* *INDENT-OFF* */
rmp->lcl_is_ip4 = mp->is_ip4;
if (app && application_has_global_scope (app))
{
- s = listen_session_get_from_handle (a->handle);
+ al = app_listener_get_w_handle (a->handle);
+ s = app_listener_get_session (al);
tc = listen_session_get_transport (s);
clib_memcpy_fast (rmp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
if (session_transport_service_type (s) == TRANSPORT_SERVICE_CL)
vl_api_unbind_sock_t_handler (vl_api_unbind_sock_t * mp)
{
vl_api_unbind_sock_reply_t *rmp;
- vnet_unbind_args_t _a, *a = &_a;
- application_t *app;
- clib_error_t *error;
+ vnet_unlisten_args_t _a, *a = &_a;
+ app_worker_t *app_wrk;
+ application_t *app = 0;
int rv = 0;
if (session_manager_is_enabled () == 0)
a->app_index = app->app_index;
a->handle = mp->handle;
a->wrk_map_index = mp->wrk_index;
- if ((error = vnet_unbind (a)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ if ((rv = vnet_unlisten (a)))
+ clib_warning ("unlisten returned: %d", rv);
}
done:
REPLY_MACRO (VL_API_UNBIND_SOCK_REPLY);
+
+ /*
+ * Send reply over msg queue
+ */
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_unlisten_reply_msg_t *ump;
+ svm_msg_q_t *app_mq;
+ session_event_t *evt;
+
+ if (!app)
+ return;
+
+ app_wrk = application_get_worker (app, a->wrk_map_index);
+ if (!app_wrk)
+ return;
+
+ app_mq = app_wrk->event_queue;
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_UNLISTEN_REPLY;
+ ump = (session_unlisten_reply_msg_t *) evt->data;
+ ump->context = mp->context;
+ ump->handle = mp->handle;
+ ump->retval = rv;
+ svm_msg_q_add_and_unlock (app_mq, msg);
}
static void
vl_api_connect_session_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
application_t *app = 0;
- clib_error_t *error = 0;
int rv = 0;
if (session_manager_is_enabled () == 0)
a->api_context = mp->context;
a->app_index = app->app_index;
a->wrk_map_index = mp->wrk_index;
- if ((error = vnet_connect (a)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ if ((rv = vnet_connect (a)))
+ clib_warning ("connect returned: %u", rv);
vec_free (a->sep_ext.hostname);
}
else
int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0;
vl_api_app_worker_add_del_reply_t *rmp;
vl_api_registration_t *reg;
- clib_error_t *error = 0;
application_t *app;
u8 fd_flags = 0;
.api_client_index = mp->client_index,
.is_add = mp->is_add
};
- error = vnet_app_worker_add_del (&args);
- if (error)
+ rv = vnet_app_worker_add_del (&args);
+ if (rv)
{
- rv = clib_error_get_code (error);
- clib_error_report (error);
+ clib_warning ("app worker add/del returned: %d", rv);
goto done;
}
vl_api_app_namespace_add_del_t_handler (vl_api_app_namespace_add_del_t * mp)
{
vl_api_app_namespace_add_del_reply_t *rmp;
- clib_error_t *error = 0;
u32 appns_index = 0;
u8 *ns_id = 0;
int rv = 0;
.ip6_fib_id = clib_net_to_host_u32 (mp->ip6_fib_id),
.is_add = 1
};
- error = vnet_app_namespace_add_del (&args);
- if (error)
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
- else
+ rv = vnet_app_namespace_add_del (&args);
+ if (!rv)
{
appns_index = app_namespace_index_from_id (ns_id);
if (appns_index == APP_NAMESPACE_INVALID_INDEX)
vl_api_session_rule_add_del_reply_t *rmp;
session_rule_add_del_args_t args;
session_rule_table_add_del_args_t *table_args = &args.table_args;
- clib_error_t *error;
u8 fib_proto;
int rv = 0;
clib_memset (&table_args->rmt.fp_addr, 0, sizeof (table_args->rmt.fp_addr));
ip_set (&table_args->lcl.fp_addr, mp->lcl_ip, mp->is_ip4);
ip_set (&table_args->rmt.fp_addr, mp->rmt_ip, mp->is_ip4);
- error = vnet_session_rule_add_del (&args);
- if (error)
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ rv = vnet_session_rule_add_del (&args);
+ if (rv)
+ clib_warning ("rule add del returned: %d", rv);
vec_free (table_args->tag);
REPLY_MACRO (VL_API_SESSION_RULE_ADD_DEL_REPLY);
}