X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.h;h=d956b5f93f7aef339b39f3059a223bbbaf10d34f;hb=04ae8273f64a4f5a771da9b056bcccd1ebf9c7d9;hp=61df64a6852303123f096cb7c13795e700dfc022;hpb=66ec467cda9955a7d72f1ac0639e42909f4fdea7;p=vpp.git

diff --git a/src/vcl/vppcom.h b/src/vcl/vppcom.h
index 61df64a6852..d956b5f93f7 100644
--- a/src/vcl/vppcom.h
+++ b/src/vcl/vppcom.h
@@ -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,33 +43,43 @@ 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_t;
+  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 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 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 uint32_t vcl_session_handle_t;
 
+typedef struct vppcom_cert_key_pair_
+{
+  char *cert;
+  char *key;
+  uint32_t cert_len;
+  uint32_t key_len;
+} vppcom_cert_key_pair_t;
+
 typedef enum
 {
   VPPCOM_OK = 0,
@@ -87,7 +96,8 @@ typedef enum
   VPPCOM_ENOTCONN = -ENOTCONN,
   VPPCOM_ECONNREFUSED = -ECONNREFUSED,
   VPPCOM_ETIMEDOUT = -ETIMEDOUT,
-  VPPCOM_EEXIST = -EEXIST
+  VPPCOM_EEXIST = -EEXIST,
+  VPPCOM_ENOPROTOOPT = -ENOPROTOOPT
 } vppcom_error_t;
 
 typedef enum
@@ -129,6 +139,10 @@ typedef enum
   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
@@ -199,15 +213,13 @@ 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);