vcl: cleanup bapi and wrk registration

[vpp.git] / src / vcl / vcl_cfg.c

diff --git a/src/vcl/vcl_cfg.c b/src/vcl/vcl_cfg.c
index f7e271b..0900b31 100644 (file)
--- 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);
     }
 }