VCL: cleanup namespace_secret env-var cfg code.

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

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index bb24869..eddb9a0 100644 (file)
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -161,6 +161,7 @@ typedef struct
   u64 client_queue_address;
   u64 options[16];
   elog_track_t elog_track;
+  vce_event_handler_reg_t *poll_reg;
 } session_t;
 
 typedef struct vppcom_cfg_t_
@@ -2157,25 +2158,6 @@ vppcom_app_create (char *app_name)
                          "filename (%s) from " VPPCOM_ENV_API_PREFIX "!",
                          getpid (), env_var_str, vcl_cfg->vpp_api_filename);
        }
-
-      env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET);
-      if (env_var_str)
-       {
-         u64 tmp;
-         if (sscanf (env_var_str, "%lu", &tmp) != 1)
-           clib_warning ("VCL<%d>: WARNING: Invalid namespace secret "
-                         "specified in the environment variable "
-                         VPPCOM_ENV_APP_NAMESPACE_SECRET
-                         " (%s)!\n", getpid (), env_var_str);
-         else
-           {
-             vcm->cfg.namespace_secret = tmp;
-             if (VPPCOM_DEBUG > 0)
-               clib_warning ("VCL<%d>: configured namespace secret "
-                             "(%lu) from " VPPCOM_ENV_APP_NAMESPACE_ID "!",
-                             getpid (), vcm->cfg.namespace_secret);
-           }
-       }
       env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID);
       if (env_var_str)
        {
@@ -2205,7 +2187,7 @@ vppcom_app_create (char *app_name)
              if (VPPCOM_DEBUG > 0)
                clib_warning ("VCL<%d>: configured namespace secret "
                              "(%lu) from "
-                             VPPCOM_ENV_APP_NAMESPACE_ID
+                             VPPCOM_ENV_APP_NAMESPACE_SECRET
                              "!", getpid (), vcm->cfg.namespace_secret);
            }
        }
@@ -3649,6 +3631,7 @@ vppcom_epoll_create (void)
   vep_session->vep.prev_sid = ~0;
   vep_session->wait_cont_idx = ~0;
   vep_session->vpp_handle = ~0;
+  vep_session->poll_reg = 0;
 
   if (VPPCOM_DEBUG > 0)
     {
@@ -3694,7 +3677,6 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index,
 {
   session_t *vep_session;
   session_t *session;
-  vce_event_handler_reg_t *reg = 0;
   vce_event_t *ev = 0;
   int rv;
 
@@ -3779,8 +3761,9 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index,
          vce_event_key_t evk;
          evk.session_index = session_index;
          evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED;
-         reg = vce_register_handler (&vcm->event_thread, &evk,
-                                     vce_epoll_wait_connect_request_handler_fn);
+         vep_session->poll_reg =
+           vce_register_handler (&vcm->event_thread, &evk,
+                                 vce_epoll_wait_connect_request_handler_fn);
        }
       if (VPPCOM_DEBUG > 1)
        clib_warning ("VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, "
@@ -3861,10 +3844,11 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index,
        }
 
       /* VCL Event Un-register handler */
-      if ((session->state & STATE_LISTEN) && reg)
+      if ((session->state & STATE_LISTEN) && vep_session->poll_reg)
        {
-         ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx);
-         vce_unregister_handler (&vcm->event_thread, ev);
+         ev = vce_get_event_from_index (&vcm->event_thread,
+                                        vep_session->poll_reg->ev_idx);
+         (void) vce_unregister_handler (&vcm->event_thread, ev);
        }
 
       vep_session->wait_cont_idx =