diff options
author | Mauro Sardara <msardara@cisco.com> | 2019-02-22 12:20:19 +0100 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2019-02-22 13:13:40 +0100 |
commit | 5c774765616b219ddb293ebf37ba79a806523f11 (patch) | |
tree | 8b228bf37f947f559f969721225e63e2caa6f73c /libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc | |
parent | 1e2e32c281ddb053d03efd74eea660dfb0b6316f (diff) |
[HICN-80] Avoid segfault when deleting memif interface on VPP.
Change-Id: Ie36cfc0ade82b38815d61a7ead2c72fc640236ed
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc')
-rw-r--r-- | libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc index 8dc607295..0d622f9a3 100644 --- a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc +++ b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc @@ -208,20 +208,21 @@ void VPPForwarderInterface::registerRoute(Prefix &prefix) { } void VPPForwarderInterface::closeConnection() { - if (sw_if_index_ != uint32_t(~0) && VPPForwarderInterface::memif_api_) { - int ret = memif_binary_api_delete_memif(VPPForwarderInterface::memif_api_, - sw_if_index_); + if (VPPForwarderInterface::api_) { + if (sw_if_index_ != uint32_t(~0)) { + int ret = memif_binary_api_delete_memif(VPPForwarderInterface::memif_api_, + sw_if_index_); - if (ret < 0) { - TRANSPORT_LOGE("Error deleting memif with sw idx %u.", sw_if_index_); + if (ret < 0) { + TRANSPORT_LOGE("Error deleting memif with sw idx %u.", sw_if_index_); + } } - } - if (VPPForwarderInterface::api_) { vpp_binary_api_destroy(VPPForwarderInterface::api_); - } + connector_.close(); - connector_.close(); + VPPForwarderInterface::api_ = nullptr; + } } } // namespace core |