X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.h;h=c808829802f0766a39ef2088bc08f1e8ea0917d8;hb=41d5f541d37dc564565b3b29eb370b65bb5a9036;hp=d2a5a103f8dfa441b2feb0e310f23d6d1471752b;hpb=07063b8ea39b05d5d7bb00ad2a2363b11792c571;p=vpp.git diff --git a/src/vcl/vppcom.h b/src/vcl/vppcom.h index d2a5a103f8d..c808829802f 100644 --- a/src/vcl/vppcom.h +++ b/src/vcl/vppcom.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Cisco and/or its affiliates. + * Copyright (c) 2017-2020 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -36,7 +36,6 @@ extern "C" #define VPPCOM_CONF_DEFAULT "/etc/vpp/vcl.conf" #define VPPCOM_ENV_CONF "VCL_CONFIG" #define VPPCOM_ENV_DEBUG "VCL_DEBUG" -#define VPPCOM_ENV_API_PREFIX "VCL_API_PREFIX" #define VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP "VCL_APP_PROXY_TRANSPORT_TCP" #define VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP "VCL_APP_PROXY_TRANSPORT_UDP" #define VPPCOM_ENV_APP_NAMESPACE_ID "VCL_APP_NAMESPACE_ID" @@ -44,68 +43,42 @@ extern "C" #define VPPCOM_ENV_APP_SCOPE_LOCAL "VCL_APP_SCOPE_LOCAL" #define VPPCOM_ENV_APP_SCOPE_GLOBAL "VCL_APP_SCOPE_GLOBAL" #define VPPCOM_ENV_VPP_API_SOCKET "VCL_VPP_API_SOCKET" +#define VPPCOM_ENV_VPP_SAPI_SOCKET "VCL_VPP_SAPI_SOCKET" + + typedef enum + { + VPPCOM_PROTO_TCP = 0, + VPPCOM_PROTO_UDP, + VPPCOM_PROTO_NONE, + VPPCOM_PROTO_TLS, + VPPCOM_PROTO_QUIC, + VPPCOM_PROTO_DTLS, + } vppcom_proto_t; + + typedef enum + { + VPPCOM_IS_IP6 = 0, + VPPCOM_IS_IP4, + } vppcom_is_ip4_t; + + typedef struct vppcom_endpt_t_ + { + uint8_t is_cut_thru; + uint8_t is_ip4; + uint8_t *ip; + uint16_t port; + uint64_t parent_handle; + } vppcom_endpt_t; -typedef enum -{ - VPPCOM_PROTO_TCP = 0, - VPPCOM_PROTO_UDP, - VPPCOM_PROTO_NONE, - VPPCOM_PROTO_TLS, - VPPCOM_PROTO_UDPC, - VPPCOM_PROTO_QUIC, -} vppcom_proto_t; - -static inline char * -vppcom_proto_str (vppcom_proto_t proto) -{ - char *proto_str; - - switch (proto) - { - case VPPCOM_PROTO_TCP: - proto_str = "TCP"; - break; - case VPPCOM_PROTO_UDP: - proto_str = "UDP"; - break; - case VPPCOM_PROTO_TLS: - proto_str = "TLS"; - break; - case VPPCOM_PROTO_UDPC: - proto_str = "UDPC"; - break; - case VPPCOM_PROTO_QUIC: - proto_str = "QUIC"; - break; - default: - proto_str = "UNKNOWN"; - break; - } - return proto_str; -} - -static inline int -vcl_proto_is_dgram (uint8_t proto) -{ - return proto == VPPCOM_PROTO_UDP || proto == VPPCOM_PROTO_UDPC; -} - -typedef enum -{ - VPPCOM_IS_IP6 = 0, - VPPCOM_IS_IP4, -} vppcom_is_ip4_t; +typedef uint32_t vcl_session_handle_t; -typedef struct vppcom_endpt_t_ +typedef struct vppcom_cert_key_pair_ { - uint8_t is_cut_thru; - uint8_t is_ip4; - uint8_t *ip; - uint16_t port; - uint64_t parent_handle; -} vppcom_endpt_t; - -typedef uint32_t vcl_session_handle_t; + char *cert; + char *key; + uint32_t cert_len; + uint32_t key_len; +} vppcom_cert_key_pair_t; typedef enum { @@ -164,6 +137,11 @@ typedef enum VPPCOM_ATTR_SET_TCP_USER_MSS, VPPCOM_ATTR_SET_SHUT, VPPCOM_ATTR_GET_SHUT, + VPPCOM_ATTR_SET_CONNECTED, + VPPCOM_ATTR_SET_CKPAIR, + VPPCOM_ATTR_SET_VRF, + VPPCOM_ATTR_GET_VRF, + VPPCOM_ATTR_GET_DOMAIN, } vppcom_attr_op_t; typedef struct _vcl_poll @@ -187,71 +165,8 @@ typedef unsigned long vcl_si_set; /* * VPPCOM Public API Functions */ -static inline const char * -vppcom_retval_str (int retval) -{ - char *st; - - switch (retval) - { - case VPPCOM_OK: - st = "VPPCOM_OK"; - break; - - case VPPCOM_EAGAIN: - st = "VPPCOM_EAGAIN"; - break; - - case VPPCOM_EFAULT: - st = "VPPCOM_EFAULT"; - break; - case VPPCOM_ENOMEM: - st = "VPPCOM_ENOMEM"; - break; - - case VPPCOM_EINVAL: - st = "VPPCOM_EINVAL"; - break; - - case VPPCOM_EBADFD: - st = "VPPCOM_EBADFD"; - break; - - case VPPCOM_EAFNOSUPPORT: - st = "VPPCOM_EAFNOSUPPORT"; - break; - - case VPPCOM_ECONNABORTED: - st = "VPPCOM_ECONNABORTED"; - break; - - case VPPCOM_ECONNRESET: - st = "VPPCOM_ECONNRESET"; - break; - - case VPPCOM_ENOTCONN: - st = "VPPCOM_ENOTCONN"; - break; - - case VPPCOM_ECONNREFUSED: - st = "VPPCOM_ECONNREFUSED"; - break; - - case VPPCOM_ETIMEDOUT: - st = "VPPCOM_ETIMEDOUT"; - break; - - default: - st = "UNKNOWN_STATE"; - break; - } - - return st; -} - -/* TBD: make these constructor/destructor function */ -extern int vppcom_app_create (char *app_name); +extern int vppcom_app_create (const char *app_name); extern void vppcom_app_destroy (void); extern int vppcom_session_create (uint8_t proto, uint8_t is_nonblocking); @@ -297,20 +212,21 @@ extern int vppcom_session_index (vcl_session_handle_t session_handle); extern int vppcom_session_worker (vcl_session_handle_t session_handle); extern int vppcom_session_read_segments (uint32_t session_handle, - vppcom_data_segments_t ds); + vppcom_data_segment_t * ds, + uint32_t n_segments, + uint32_t max_bytes); extern void vppcom_session_free_segments (uint32_t session_handle, - vppcom_data_segments_t ds); -extern int vppcom_session_tls_add_cert (uint32_t session_handle, char *cert, - uint32_t cert_len); -extern int vppcom_session_tls_add_key (uint32_t session_handle, char *key, - uint32_t key_len); -extern int vppcom_data_segment_copy (void *buf, vppcom_data_segments_t ds, - uint32_t max_bytes); + uint32_t n_bytes); +extern int vppcom_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair); +extern int vppcom_del_cert_key_pair (uint32_t ckpair_index); extern int vppcom_unformat_proto (uint8_t * proto, char *proto_str); extern int vppcom_session_is_connectable_listener (uint32_t session_handle); extern int vppcom_session_listener (uint32_t session_handle); extern int vppcom_session_n_accepted (uint32_t session_handle); +extern const char *vppcom_proto_str (vppcom_proto_t proto); +extern const char *vppcom_retval_str (int retval); + /** * Request from application to register a new worker * @@ -329,6 +245,11 @@ extern void vppcom_worker_unregister (void); */ extern int vppcom_worker_index (void); +/** + * Set current worker index + */ +extern void vppcom_worker_index_set (int); + /** * Returns the current worker's message queues epoll fd *