summaryrefslogtreecommitdiffstats
path: root/src/vcl/vcl_cfg.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2020-09-08 16:47:57 -0700
committerFlorin Coras <florin.coras@gmail.com>2020-09-14 14:33:46 +0000
commitb88de908101081f870d94e1415659326b589b9ce (patch)
tree21d670f5af2899eb4b67a058bc825179950302b6 /src/vcl/vcl_cfg.c
parent61ae056bdb6cdf7cb718cf9f459d41e903abcb47 (diff)
vcl: cleanup bapi and wrk registration
Type: refactor Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I0391db5c3ad038265cb8ebf9de02925653e35959
Diffstat (limited to 'src/vcl/vcl_cfg.c')
-rw-r--r--src/vcl/vcl_cfg.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/vcl/vcl_cfg.c b/src/vcl/vcl_cfg.c
index f7e271bbdc9..0900b318fce 100644
--- a/src/vcl/vcl_cfg.c
+++ b/src/vcl/vcl_cfg.c
@@ -283,18 +283,18 @@ vppcom_cfg_read_file (char *conf_fname)
vcl_cfg->max_workers);
}
else if (unformat (line_input, "api-prefix %s",
- &vcl_cfg->vpp_api_chroot))
+ &vcl_cfg->vpp_bapi_chroot))
{
- vec_terminate_c_string (vcl_cfg->vpp_api_chroot);
+ vec_terminate_c_string (vcl_cfg->vpp_bapi_chroot);
VCFG_DBG (0, "VCL<%d>: configured api-prefix (%s) ", getpid (),
- vcl_cfg->vpp_api_chroot);
+ vcl_cfg->vpp_bapi_chroot);
}
else if (unformat (line_input, "api-socket-name %s",
- &vcl_cfg->vpp_api_socket_name))
+ &vcl_cfg->vpp_bapi_socket_name))
{
- vec_terminate_c_string (vcl_cfg->vpp_api_socket_name);
+ vec_terminate_c_string (vcl_cfg->vpp_bapi_socket_name);
VCFG_DBG (0, "VCL<%d>: configured api-socket-name (%s)",
- getpid (), vcl_cfg->vpp_api_socket_name);
+ getpid (), vcl_cfg->vpp_bapi_socket_name);
}
else if (unformat (line_input, "vpp-api-q-length %d", &q_len))
{
@@ -473,7 +473,7 @@ vppcom_cfg_read_file (char *conf_fname)
else if (unformat (line_input, "namespace-id %v",
&vcl_cfg->namespace_id))
{
- u32 max_nsid_vec_len = vcl_max_nsid_len ();
+ u32 max_nsid_vec_len = vcl_bapi_max_nsid_len ();
u32 nsid_vec_len = vec_len (vcl_cfg->namespace_id);
if (nsid_vec_len > max_nsid_vec_len)
{
@@ -567,8 +567,8 @@ vppcom_cfg (vppcom_cfg_t * vcl_cfg)
env_var_str = getenv (VPPCOM_ENV_API_PREFIX);
if (env_var_str)
{
- vcl_cfg->vpp_api_chroot = format (0, "%s", env_var_str);
- vec_terminate_c_string (vcl_cfg->vpp_api_chroot);
+ vcl_cfg->vpp_bapi_chroot = format (0, "%s", env_var_str);
+ vec_terminate_c_string (vcl_cfg->vpp_bapi_chroot);
VCFG_DBG (0, "VCL<%d>: configured api prefix (%s) from "
VPPCOM_ENV_API_PREFIX "!", getpid (), env_var_str);
}
@@ -634,9 +634,9 @@ vppcom_cfg (vppcom_cfg_t * vcl_cfg)
env_var_str = getenv (VPPCOM_ENV_VPP_API_SOCKET);
if (env_var_str)
{
- vcm->cfg.vpp_api_socket_name = format (0, "%s%c", env_var_str, 0);
+ vcm->cfg.vpp_bapi_socket_name = format (0, "%s%c", env_var_str, 0);
VCFG_DBG (0, "VCL<%d>: configured api-socket-name (%s)", getpid (),
- vcl_cfg->vpp_api_socket_name);
+ vcl_cfg->vpp_bapi_socket_name);
}
}