X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_local.c;h=7d8fb468f5a2a5395bda084bfc200d17b7141e40;hb=94d2da0b294b0084dd97217e79de18842f09356b;hp=5a3f738dd82153a780a398f7b7dea6f699b90b4a;hpb=f940f8a40fc41d66a9ab5ea15c574120c49eb92b;p=vpp.git

diff --git a/src/vnet/session/application_local.c b/src/vnet/session/application_local.c
index 5a3f738dd82..7d8fb468f5a 100644
--- a/src/vnet/session/application_local.c
+++ b/src/vnet/session/application_local.c
@@ -23,6 +23,9 @@ ct_enable_disable_main_pre_input_node (u8 is_add)
 {
   u32 n_conns;
 
+  if (!vlib_num_workers ())
+    return;
+
   n_conns = pool_elts (connections);
   if (n_conns > 2)
     return;
@@ -88,10 +91,10 @@ ct_session_endpoint (session_t * ll, session_endpoint_t * sep)
 int
 ct_session_connect_notify (session_t * ss)
 {
-  svm_fifo_segment_private_t *seg;
   ct_connection_t *sct, *cct;
   app_worker_t *client_wrk;
   segment_manager_t *sm;
+  fifo_segment_t *seg;
   u64 segment_handle;
   int is_fail = 0;
   session_t *cs;
@@ -125,11 +128,10 @@ ct_session_connect_notify (session_t * ss)
   ss = session_get (ss_index, 0);
   cs->session_type = ss->session_type;
   cs->connection_index = sct->c_c_index;
-  cs->listener_index = SESSION_INVALID_INDEX;
+  cs->listener_handle = SESSION_INVALID_HANDLE;
   cs->session_state = SESSION_STATE_CONNECTING;
   cs->app_wrk_index = client_wrk->wrk_index;
   cs->connection_index = cct->c_c_index;
-  cs->t_app_index = client_wrk->app_index;
 
   cct->c_s_index = cs->session_index;
   cct->client_rx_fifo = ss->tx_fifo;
@@ -165,11 +167,11 @@ ct_init_local_session (app_worker_t * client_wrk, app_worker_t * server_wrk,
 		       ct_connection_t * ct, session_t * ls, session_t * ll)
 {
   u32 round_rx_fifo_sz, round_tx_fifo_sz, sm_index, seg_size;
-  segment_manager_properties_t *props;
-  svm_fifo_segment_private_t *seg;
+  segment_manager_props_t *props;
   application_t *server;
   segment_manager_t *sm;
   u32 margin = 16 << 10;
+  fifo_segment_t *seg;
   u64 segment_handle;
   int seg_index, rv;
 
@@ -275,14 +277,14 @@ ct_connect (app_worker_t * client_wrk, session_t * ll,
    */
   ss = session_alloc (0);
   ll = listen_session_get (ll_index);
-  ss->session_type = ll->session_type;
+  ss->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_NONE,
+						     sct->c_is_ip4);
   ss->connection_index = sct->c_c_index;
-  ss->listener_index = ll->session_index;
+  ss->listener_handle = listen_session_get_handle (ll);
   ss->session_state = SESSION_STATE_CREATED;
 
   server_wrk = application_listener_select_worker (ll);
   ss->app_wrk_index = server_wrk->wrk_index;
-  ss->t_app_index = server_wrk->app_index;
 
   sct->c_s_index = ss->session_index;
   sct->server_wrk = ss->app_wrk_index;
@@ -396,7 +398,7 @@ global_scope:
 
   fib_proto = session_endpoint_fib_proto (sep);
   table_index = application_session_table (app, fib_proto);
-  ll = session_lookup_listener (table_index, sep);
+  ll = session_lookup_listener_wildcard (table_index, sep);
 
   if (ll)
     return ct_connect (app_wrk, ll, sep_ext);
@@ -465,7 +467,7 @@ format_ct_connection_id (u8 * s, va_list * args)
 }
 
 static int
-ct_custom_tx (void *session)
+ct_custom_tx (void *session, u32 max_burst_size)
 {
   session_t *s = (session_t *) session;
   if (session_has_transport (s))
@@ -473,10 +475,24 @@ ct_custom_tx (void *session)
   return ct_session_tx (s);
 }
 
+static int
+ct_app_rx_evt (transport_connection_t * tc)
+{
+  ct_connection_t *ct = (ct_connection_t *) tc, *peer_ct;
+  session_t *ps;
+
+  peer_ct = ct_connection_get (ct->peer_index);
+  if (!peer_ct)
+    return -1;
+  ps = session_get (peer_ct->c_s_index, peer_ct->c_thread_index);
+  return session_dequeue_notify (ps);
+}
+
 static u8 *
 format_ct_listener (u8 * s, va_list * args)
 {
   u32 tc_index = va_arg (*args, u32);
+  u32 __clib_unused thread_index = va_arg (*args, u32);
   u32 __clib_unused verbose = va_arg (*args, u32);
   ct_connection_t *ct = ct_connection_get (tc_index);
   s = format (s, "%-50U", format_ct_connection_id, ct);
@@ -525,7 +541,7 @@ format_ct_session (u8 * s, va_list * args)
 }
 
 /* *INDENT-OFF* */
-const static transport_proto_vft_t cut_thru_proto = {
+static const transport_proto_vft_t cut_thru_proto = {
   .start_listen = ct_start_listen,
   .stop_listen = ct_stop_listen,
   .get_listener = ct_listener_get,
@@ -533,10 +549,13 @@ const static transport_proto_vft_t cut_thru_proto = {
   .close = ct_session_close,
   .get_connection = ct_session_get,
   .custom_tx = ct_custom_tx,
-  .tx_type = TRANSPORT_TX_INTERNAL,
-  .service_type = TRANSPORT_SERVICE_APP,
+  .app_rx_evt = ct_app_rx_evt,
   .format_listener = format_ct_listener,
   .format_connection = format_ct_session,
+  .transport_options = {
+    .tx_type = TRANSPORT_TX_INTERNAL,
+    .service_type = TRANSPORT_SERVICE_APP,
+  },
 };
 /* *INDENT-ON* */