Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vcl: fix ldp read on closing session
[vpp.git]
/
src
/
vcl
/
vcl_private.h
diff --git
a/src/vcl/vcl_private.h
b/src/vcl/vcl_private.h
index
8fdf755
..
b50bad2
100644
(file)
--- a/
src/vcl/vcl_private.h
+++ b/
src/vcl/vcl_private.h
@@
-64,13
+64,13
@@
typedef enum
typedef enum
{
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;
@@
-108,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;
@@
-211,6
+210,7
@@
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;
u32 tls_engine;
} vppcom_cfg_t;
@@
-298,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_
@@
-371,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);
}
@@
-513,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)
{
@@
-531,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;
}
@@
-622,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);