From f1e21ec5c9e0d2ce070a5ae9331617236e7088a4 Mon Sep 17 00:00:00 2001
From: Alberto Compagno <acompagn+fdio@cisco.com>
Date: Thu, 30 Jan 2020 15:03:08 +0100
Subject: [HICN-492] Initialization of vapi_ctx_t before calling
 vapi_safe_connect()

Change-Id: I26aeaffe40cfff460d9780319e54fcb74114cee4
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
---
 .../hicn/transport/core/vpp_forwarder_interface.cc   | 20 ++++++++++----------
 .../hicn/transport/core/vpp_forwarder_interface.h    |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libtransport/src/hicn')

diff --git a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc
index 06672279e..9e701bf80 100644
--- a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc
+++ b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc
@@ -56,7 +56,7 @@ uint32_t VPPForwarderInterface::getMemifConfiguration() {
   memif_create_params_t input_params = {0};
 
   int ret = memif_vapi_get_next_memif_id(
-      *VPPForwarderInterface::sock_, &memif_id_);
+      VPPForwarderInterface::sock_, &memif_id_);
 
   if (ret < 0) {
     throw errors::RuntimeException(
@@ -73,7 +73,7 @@ uint32_t VPPForwarderInterface::getMemifConfiguration() {
 
   memif_output_params_t output_params = {0};
 
-  ret = memif_vapi_create_memif(*VPPForwarderInterface::sock_,
+  ret = memif_vapi_create_memif(VPPForwarderInterface::sock_,
                                       &input_params, &output_params);
 
   if (ret < 0) {
@@ -96,7 +96,7 @@ void VPPForwarderInterface::consumerConnection() {
 
 
 
-  int ret = hicn_vapi_register_cons_app(*VPPForwarderInterface::sock_,
+  int ret = hicn_vapi_register_cons_app(VPPForwarderInterface::sock_,
                                               &input, &output);
 
   if (ret < 0) {
@@ -119,7 +119,7 @@ void VPPForwarderInterface::producerConnection() {
 void VPPForwarderInterface::connect(bool is_consumer) {
   std::lock_guard<std::mutex> connection_lock(global_lock_);
 
-  vapi_connect_safe(sock_, 0);
+  vapi_connect_safe(&sock_, 0);
 
   sw_if_index_ = getMemifConfiguration();
 
@@ -157,7 +157,7 @@ void VPPForwarderInterface::registerRoute(Prefix &prefix) {
     input.cs_reserved = content_store_reserved_;
 
     int ret = hicn_vapi_register_prod_app(
-        *VPPForwarderInterface::sock_, &input, &output);
+        VPPForwarderInterface::sock_, &input, &output);
 
     if (ret < 0) {
       throw errors::RuntimeException(hicn_vapi_get_error_string(ret));
@@ -174,7 +174,7 @@ void VPPForwarderInterface::registerRoute(Prefix &prefix) {
     params.prefix->len = addr.len;
     params.face_id = face_id1_;
 
-    int ret = hicn_vapi_register_route(*VPPForwarderInterface::sock_,
+    int ret = hicn_vapi_register_route(VPPForwarderInterface::sock_,
                                              &params);
 
     if (ret < 0) {
@@ -190,18 +190,18 @@ void VPPForwarderInterface::closeConnection() {
     if (is_consumer_) {
       hicn_del_face_app_input_params params;
       params.face_id = face_id1_;
-      hicn_vapi_face_cons_del(*VPPForwarderInterface::sock_, &params);
+      hicn_vapi_face_cons_del(VPPForwarderInterface::sock_, &params);
       params.face_id = face_id2_;
-      hicn_vapi_face_cons_del(*VPPForwarderInterface::sock_, &params);
+      hicn_vapi_face_cons_del(VPPForwarderInterface::sock_, &params);
     }
     else {
       hicn_del_face_app_input_params params;
       params.face_id = face_id1_;
-      hicn_vapi_face_prod_del(*VPPForwarderInterface::sock_, &params);
+      hicn_vapi_face_prod_del(VPPForwarderInterface::sock_, &params);
     }
 
     if (sw_if_index_ != uint32_t(~0)) {
-      int ret = memif_vapi_delete_memif(*VPPForwarderInterface::sock_,
+      int ret = memif_vapi_delete_memif(VPPForwarderInterface::sock_,
                                               sw_if_index_);
       if (ret < 0) {
         TRANSPORT_LOGE("Error deleting memif with sw idx %u.", sw_if_index_);
diff --git a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.h b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.h
index da7507176..9f8000828 100644
--- a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.h
+++ b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.h
@@ -76,7 +76,7 @@ class VPPForwarderInterface
   uint32_t face_id1_;
   uint32_t face_id2_;
   bool is_consumer_;
-  vapi_ctx_t *sock_;
+  vapi_ctx_t sock_;
   static std::mutex global_lock_;
 };
 
@@ -84,4 +84,4 @@ class VPPForwarderInterface
 
 }  // namespace transport
 
-#endif
\ No newline at end of file
+#endif
-- 
cgit 1.2.3-korg