diff options
| -rw-r--r-- | ctrl/libhicnctrl/src/hicn_plugin_api.c | 3 | ||||
| -rw-r--r-- | extras/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | extras/libmemif/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hicn-plugin/src/faces/app/face_prod_node.c | 11 | ||||
| -rw-r--r-- | libtransport/src/hicn/transport/protocols/raaqm.cc | 1 |
5 files changed, 10 insertions, 13 deletions
diff --git a/ctrl/libhicnctrl/src/hicn_plugin_api.c b/ctrl/libhicnctrl/src/hicn_plugin_api.c index 70e0556a9..0b387404b 100644 --- a/ctrl/libhicnctrl/src/hicn_plugin_api.c +++ b/ctrl/libhicnctrl/src/hicn_plugin_api.c @@ -792,6 +792,9 @@ int _hc_route_list(hc_sock_t *s, hc_data_t **pdata, bool async) { *pdata = data; + vapi_unlock(); + return ret; + err_free: free(data); err: diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt index 6629f3809..88668df0b 100644 --- a/extras/CMakeLists.txt +++ b/extras/CMakeLists.txt @@ -22,9 +22,9 @@ list(APPEND CMAKE_MODULE_PATH set (DESTDIR ${CMAKE_BINARY_DIR}/extras-root) # add_subdirectory(router-plugin) -# add_subdirectory(libmemif) -add_subdirectory(libyang) -add_subdirectory(sysrepo) +add_subdirectory(libmemif) +# add_subdirectory(libyang) +# add_subdirectory(sysrepo) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) diff --git a/extras/libmemif/CMakeLists.txt b/extras/libmemif/CMakeLists.txt index 8d141510a..70388f139 100644 --- a/extras/libmemif/CMakeLists.txt +++ b/extras/libmemif/CMakeLists.txt @@ -25,7 +25,7 @@ include(ExternalProject) ExternalProject_Add(libmemif GIT_REPOSITORY https://github.com/FDio/vpp.git - GIT_TAG v19.08.1 + GIT_TAG v20.01 GIT_SHALLOW TRUE PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libmemif PATCH_COMMAND bash -c "cp ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists1.patch ./extras/libmemif/CMakeLists.txt && cp ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists2.patch ./extras/libmemif/src/CMakeLists.txt" diff --git a/hicn-plugin/src/faces/app/face_prod_node.c b/hicn-plugin/src/faces/app/face_prod_node.c index e2967bf39..0ef25fe94 100644 --- a/hicn-plugin/src/faces/app/face_prod_node.c +++ b/hicn-plugin/src/faces/app/face_prod_node.c @@ -89,14 +89,9 @@ match_ip6_name (u8 * name, fib_prefix_t * prefix) u32 as_u32[4]; } xor_sum __attribute__ ((aligned (sizeof (u32x4)))); -#ifdef CLIB_HAVE_VEC128 - u32x4u *data = (u32x4u *)name; - xor_sum.as_u32x4 = *(data) & - UNION_CAST (prefix->fp_addr.ip6.as_u64[0], u32x4); -#else - xor_sum.as_u64[0] = ((u64 *) name)[0] & prefix->fp_addr.ip6.as_u64[0]; - xor_sum.as_u64[1] = ((u64 *) name)[1] & prefix->fp_addr.ip6.as_u64[1]; -#endif /* CLIB_HAVE_VEC128 */ + xor_sum.as_u64[0] = ((u64 *) name)[0] & prefix->fp_addr.ip6.as_u64[0]; + xor_sum.as_u64[1] = ((u64 *) name)[1] & prefix->fp_addr.ip6.as_u64[1]; + return (xor_sum.as_u64[0] == prefix->fp_addr.ip6.as_u64[0]) && (xor_sum.as_u64[1] == prefix->fp_addr.ip6.as_u64[1]); } diff --git a/libtransport/src/hicn/transport/protocols/raaqm.cc b/libtransport/src/hicn/transport/protocols/raaqm.cc index ec7ce19cc..21a59bc9a 100644 --- a/libtransport/src/hicn/transport/protocols/raaqm.cc +++ b/libtransport/src/hicn/transport/protocols/raaqm.cc @@ -104,7 +104,6 @@ void RaaqmTransportProtocol::reset() { index_manager_->setFirstSuffix(name->getSuffix()); std::queue<Interest::Ptr> empty; std::swap(interest_to_retransmit_, empty); - current_window_size_ = 1; stats_.reset(); // Reset reassembly component |