X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.h;h=be6c74c6529d0d120d8772bfc4691102631a1236;hb=4ac258497303c1cbca539e04ef5f732eed24a5c4;hp=b2e0ef9da849be07aa411652ce252c3a6a64269a;hpb=a5a9efd4d1995ef6d46dfab4e5b8aba9c5d114ef;p=vpp.git diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h index b2e0ef9da84..be6c74c6529 100644 --- a/src/vnet/session/application_interface.h +++ b/src/vnet/session/application_interface.h @@ -317,6 +317,7 @@ typedef struct session_listen_msg_ u32 ckpair_index; u8 crypto_engine; u8 flags; + uword ext_config; } __clib_packed session_listen_msg_t; STATIC_ASSERT (sizeof (session_listen_msg_t) <= SESSION_CTRL_MSG_MAX_SIZE, @@ -394,12 +395,22 @@ typedef struct session_connect_msg_ u8 is_ip4; ip46_address_t ip; ip46_address_t lcl_ip; - u8 hostname_len; - u8 hostname[16]; u64 parent_handle; u32 ckpair_index; u8 crypto_engine; u8 flags; + union + { + struct + { + u8 hostname[16]; + u8 hostname_len; + } __clib_packed; + struct + { + uword ext_config; + } __clib_packed; + }; } __clib_packed session_connect_msg_t; STATIC_ASSERT (sizeof (session_connect_msg_t) <= SESSION_CTRL_MSG_MAX_SIZE, @@ -535,6 +546,22 @@ typedef struct session_app_wrk_rpc_msg_ u8 data[64]; /**< rpc data */ } __clib_packed session_app_wrk_rpc_msg_t; +typedef struct session_transport_attr_msg_ +{ + u32 client_index; + session_handle_t handle; + transport_endpt_attr_t attr; + u8 is_get; +} __clib_packed session_transport_attr_msg_t; + +typedef struct session_transport_attr_reply_msg_ +{ + i32 retval; + session_handle_t handle; + transport_endpt_attr_t attr; + u8 is_get; +} __clib_packed session_transport_attr_reply_msg_t; + typedef struct app_session_event_ { svm_msg_q_msg_t msg; @@ -600,7 +627,7 @@ app_send_io_evt_to_vpp (svm_msg_q_t * mq, u32 session_index, u8 evt_type, svm_msg_q_lock (mq); while (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING) || svm_msg_q_is_full (mq)) - svm_msg_q_wait (mq); + svm_msg_q_wait_prod (mq); msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); evt->session_index = session_index;