Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: API cleanup
[vpp.git]
/
src
/
vcl
/
vcl_private.h
diff --git
a/src/vcl/vcl_private.h
b/src/vcl/vcl_private.h
index
43c8ec3
..
b50bad2
100644
(file)
--- a/
src/vcl/vcl_private.h
+++ b/
src/vcl/vcl_private.h
@@
-57,19
+57,20
@@
typedef enum
STATE_APP_ENABLED,
STATE_APP_ATTACHED,
STATE_APP_ADDING_WORKER,
STATE_APP_ENABLED,
STATE_APP_ATTACHED,
STATE_APP_ADDING_WORKER,
+ STATE_APP_ADDING_TLS_DATA,
STATE_APP_FAILED,
STATE_APP_READY
} app_state_t;
typedef enum
{
STATE_APP_FAILED,
STATE_APP_READY
} app_state_t;
typedef enum
{
- STATE_
START
= 0,
+ STATE_
CLOSED
= 0,
STATE_CONNECT = 0x01,
STATE_LISTEN = 0x02,
STATE_ACCEPT = 0x04,
STATE_VPP_CLOSING = 0x08,
STATE_DISCONNECT = 0x10,
STATE_CONNECT = 0x01,
STATE_LISTEN = 0x02,
STATE_ACCEPT = 0x04,
STATE_VPP_CLOSING = 0x08,
STATE_DISCONNECT = 0x10,
- STATE_
FAIL
ED = 0x20,
+ STATE_
DETACH
ED = 0x20,
STATE_UPDATED = 0x40,
STATE_LISTEN_NO_MQ = 0x80,
} vcl_session_state_t;
STATE_UPDATED = 0x40,
STATE_LISTEN_NO_MQ = 0x80,
} vcl_session_state_t;
@@
-107,7
+108,6
@@
typedef struct
typedef struct vcl_session_msg
{
typedef struct vcl_session_msg
{
- u32 next;
union
{
session_accepted_msg_t accepted_msg;
union
{
session_accepted_msg_t accepted_msg;
@@
-210,6
+210,8
@@
typedef struct vppcom_cfg_t_
char *event_log_path;
u8 *vpp_api_filename;
u8 *vpp_api_socket_name;
char *event_log_path;
u8 *vpp_api_filename;
u8 *vpp_api_socket_name;
+ u8 *vpp_api_chroot;
+ u32 tls_engine;
} vppcom_cfg_t;
void vppcom_cfg (vppcom_cfg_t * vcl_cfg);
} vppcom_cfg_t;
void vppcom_cfg (vppcom_cfg_t * vcl_cfg);
@@
-251,6
+253,9
@@
typedef struct vcl_worker_
/** VPP binary api input queue */
svm_queue_t *vl_input_queue;
/** VPP binary api input queue */
svm_queue_t *vl_input_queue;
+ /** VPP mq to be used for exchanging control messages */
+ svm_msg_q_t *ctrl_mq;
+
/** Message queues epoll fd. Initialized only if using mqs with eventfds */
int mqs_epfd;
/** Message queues epoll fd. Initialized only if using mqs with eventfds */
int mqs_epfd;
@@
-293,6
+298,9
@@
typedef struct vcl_worker_
u32 forked_child;
u32 forked_child;
+ socket_client_main_t bapi_sock_ctx;
+ memory_client_main_t bapi_shm_ctx;
+ api_main_t bapi_api_ctx;
} vcl_worker_t;
typedef struct vppcom_main_t_
} vcl_worker_t;
typedef struct vppcom_main_t_
@@
-329,6
+337,9
@@
typedef struct vppcom_main_t_
/** Mapped segments table */
uword *segment_table;
/** Mapped segments table */
uword *segment_table;
+ /** Control mq obtained from attach */
+ svm_msg_q_t *ctrl_mq;
+
fifo_segment_main_t segment_main;
#ifdef VCL_ELOG
fifo_segment_main_t segment_main;
#ifdef VCL_ELOG
@@
-363,6
+374,7
@@
vcl_session_alloc (vcl_worker_t * wrk)
static inline void
vcl_session_free (vcl_worker_t * wrk, vcl_session_t * s)
{
static inline void
vcl_session_free (vcl_worker_t * wrk, vcl_session_t * s)
{
+ VDBG (0, "session %u [0x%llx] removed", s->session_index, s->vpp_handle);
pool_put (wrk->sessions, s);
}
pool_put (wrk->sessions, s);
}
@@
-505,6
+517,14
@@
vcl_session_is_ct (vcl_session_t * s)
return (s->ct_tx_fifo != 0);
}
return (s->ct_tx_fifo != 0);
}
+static inline u8
+vcl_session_is_cl (vcl_session_t * s)
+{
+ if (s->session_type == VPPCOM_PROTO_UDP)
+ return 1;
+ return 0;
+}
+
static inline u8
vcl_session_is_open (vcl_session_t * s)
{
static inline u8
vcl_session_is_open (vcl_session_t * s)
{
@@
-523,6
+543,7
@@
vcl_session_is_closing (vcl_session_t * s)
static inline int
vcl_session_closing_error (vcl_session_t * s)
{
static inline int
vcl_session_closing_error (vcl_session_t * s)
{
+ /* Return 0 on closing sockets */
return s->session_state == STATE_DISCONNECT ? VPPCOM_ECONNRESET : 0;
}
return s->session_state == STATE_DISCONNECT ? VPPCOM_ECONNRESET : 0;
}
@@
-547,6
+568,7
@@
vcl_worker_t *vcl_worker_alloc_and_init (void);
void vcl_worker_cleanup (vcl_worker_t * wrk, u8 notify_vpp);
int vcl_worker_register_with_vpp (void);
int vcl_worker_set_bapi (void);
void vcl_worker_cleanup (vcl_worker_t * wrk, u8 notify_vpp);
int vcl_worker_register_with_vpp (void);
int vcl_worker_set_bapi (void);
+svm_msg_q_t *vcl_worker_ctrl_mq (vcl_worker_t * wrk);
void vcl_flush_mq_events (void);
void vcl_cleanup_bapi (void);
void vcl_flush_mq_events (void);
void vcl_cleanup_bapi (void);
@@
-603,10
+625,8
@@
void vppcom_init_error_string_table (void);
void vppcom_send_session_enable_disable (u8 is_enable);
void vppcom_app_send_attach (void);
void vppcom_app_send_detach (void);
void vppcom_send_session_enable_disable (u8 is_enable);
void vppcom_app_send_attach (void);
void vppcom_app_send_detach (void);
-void v
ppcom_send_connect_sock (vcl_session_t * session
);
+void v
cl_send_session_unlisten (vcl_worker_t * wrk, vcl_session_t * s
);
void vppcom_send_disconnect_session (u64 vpp_handle);
void vppcom_send_disconnect_session (u64 vpp_handle);
-void vppcom_send_bind_sock (vcl_session_t * session);
-void vppcom_send_unbind_sock (vcl_worker_t * wrk, u64 vpp_handle);
void vppcom_api_hookup (void);
void vppcom_send_application_tls_cert_add (vcl_session_t * session,
char *cert, u32 cert_len);
void vppcom_api_hookup (void);
void vppcom_send_application_tls_cert_add (vcl_session_t * session,
char *cert, u32 cert_len);
@@
-615,6
+635,10
@@
void vppcom_send_application_tls_key_add (vcl_session_t * session, char *key,
void vcl_send_app_worker_add_del (u8 is_add);
void vcl_send_child_worker_del (vcl_worker_t * wrk);
void vcl_send_app_worker_add_del (u8 is_add);
void vcl_send_child_worker_del (vcl_worker_t * wrk);
+int vcl_segment_attach (u64 segment_handle, char *name,
+ ssvm_segment_type_t type, int fd);
+void vcl_segment_detach (u64 segment_handle);
+
u32 vcl_max_nsid_len (void);
u8 *format_api_error (u8 * s, va_list * args);
u32 vcl_max_nsid_len (void);
u8 *format_api_error (u8 * s, va_list * args);