X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.h;h=b2e0ef9da849be07aa411652ce252c3a6a64269a;hb=a5a9efd4d;hp=1f3e181953b3371699dfc99e1db23429f4841e7e;hpb=cc7c88e529eb3a2ca0934f27eb048c8ca3788f95;p=vpp.git

diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h
index 1f3e181953b..b2e0ef9da84 100644
--- a/src/vnet/session/application_interface.h
+++ b/src/vnet/session/application_interface.h
@@ -178,6 +178,8 @@ typedef struct _vnet_app_add_cert_key_pair_args_
 {
   u8 *cert;
   u8 *key;
+  u32 cert_len;
+  u32 key_len;
   u32 index;
 } vnet_app_add_cert_key_pair_args_t;
 
@@ -271,8 +273,6 @@ int vnet_connect (vnet_connect_args_t * a);
 int vnet_unlisten (vnet_unlisten_args_t * a);
 int vnet_disconnect_session (vnet_disconnect_args_t * a);
 
-clib_error_t *vnet_app_add_tls_cert (vnet_app_add_tls_cert_args_t * a);
-clib_error_t *vnet_app_add_tls_key (vnet_app_add_tls_key_args_t * a);
 int vnet_app_add_cert_key_pair (vnet_app_add_cert_key_pair_args_t * a);
 int vnet_app_del_cert_key_pair (u32 index);
 /** Ask for app cb on pair deletion */
@@ -343,9 +343,7 @@ typedef struct session_bound_msg_
   uword rx_fifo;
   uword tx_fifo;
   uword vpp_evt_q;
-  u32 segment_size;
-  u8 segment_name_length;
-  u8 segment_name[128];
+  u64 segment_handle;
 } __clib_packed session_bound_msg_t;
 
 typedef struct session_unlisten_msg_
@@ -372,6 +370,7 @@ typedef struct session_accepted_msg_
   uword server_tx_fifo;
   u64 segment_handle;
   uword vpp_event_queue_address;
+  u32 mq_index;
   transport_endpoint_t rmt;
   u8 flags;
 } __clib_packed session_accepted_msg_t;
@@ -519,6 +518,7 @@ typedef struct session_migrate_msg_
   uword vpp_evt_q;
   session_handle_t handle;
   session_handle_t new_handle;
+  u64 segment_handle;
   u32 vpp_thread_index;
 } __clib_packed session_migrated_msg_t;
 
@@ -615,35 +615,35 @@ app_send_dgram_raw (svm_fifo_t * f, app_session_transport_t * at,
 		    svm_msg_q_t * vpp_evt_q, u8 * data, u32 len, u8 evt_type,
 		    u8 do_evt, u8 noblock)
 {
-  u32 max_enqueue, actual_write;
   session_dgram_hdr_t hdr;
   int rv;
 
-  max_enqueue = svm_fifo_max_enqueue_prod (f);
-  if (max_enqueue < (sizeof (session_dgram_hdr_t) + len))
+  if (svm_fifo_max_enqueue_prod (f) < (sizeof (session_dgram_hdr_t) + len))
     return 0;
 
-  max_enqueue -= sizeof (session_dgram_hdr_t);
-  actual_write = clib_min (len, max_enqueue);
-  hdr.data_length = actual_write;
+  hdr.data_length = len;
   hdr.data_offset = 0;
   clib_memcpy_fast (&hdr.rmt_ip, &at->rmt_ip, sizeof (ip46_address_t));
   hdr.is_ip4 = at->is_ip4;
   hdr.rmt_port = at->rmt_port;
   clib_memcpy_fast (&hdr.lcl_ip, &at->lcl_ip, sizeof (ip46_address_t));
   hdr.lcl_port = at->lcl_port;
-  rv = svm_fifo_enqueue (f, sizeof (hdr), (u8 *) & hdr);
-  ASSERT (rv == sizeof (hdr));
 
-  rv = svm_fifo_enqueue (f, actual_write, data);
+  /* *INDENT-OFF* */
+  svm_fifo_seg_t segs[2] = {{ (u8 *) &hdr, sizeof (hdr) }, { data, len }};
+  /* *INDENT-ON* */
+
+  rv = svm_fifo_enqueue_segments (f, segs, 2, 0 /* allow partial */ );
+  if (PREDICT_FALSE (rv < 0))
+    return 0;
+
   if (do_evt)
     {
-      if (rv > 0 && svm_fifo_set_event (f))
-	app_send_io_evt_to_vpp (vpp_evt_q, f->master_session_index, evt_type,
-				noblock);
+      if (svm_fifo_set_event (f))
+	app_send_io_evt_to_vpp (vpp_evt_q, f->shr->master_session_index,
+				evt_type, noblock);
     }
-  ASSERT (rv);
-  return rv;
+  return len;
 }
 
 always_inline int
@@ -664,8 +664,8 @@ app_send_stream_raw (svm_fifo_t * f, svm_msg_q_t * vpp_evt_q, u8 * data,
   if (do_evt)
     {
       if (rv > 0 && svm_fifo_set_event (f))
-	app_send_io_evt_to_vpp (vpp_evt_q, f->master_session_index, evt_type,
-				noblock);
+	app_send_io_evt_to_vpp (vpp_evt_q, f->shr->master_session_index,
+				evt_type, noblock);
     }
   return rv;
 }