From a1ac96f497719b897793ac14b287cb8d840651c1 Mon Sep 17 00:00:00 2001 From: Luca Muscariello Date: Fri, 22 Apr 2022 17:55:01 +0200 Subject: HICN-722: Updates on transport, RTC, manifest usage for RTC, infra. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mauro Sardara Co-authored-by: Jordan Augé Co-authored-by: Michele Papalini Co-authored-by: Angelo Mantellini Co-authored-by: Jacques Samain Co-authored-by: Olivier Roques Co-authored-by: Enrico Loparco Co-authored-by: Giulio Grassi manifest: optimize manifest processing manifest: add FEC parameters to manifests manifest: refactor verification process manifest: report auth alerts in hiperf instead of aborting manifest: remove FEC buffer callback in consumer manifest: refactor and enable manifests by default manifest: update manifest header with transport parameters manifest: batch interests for first manifest from RTC producer manifest: refactor processing of RTC manifests manifest: update manifest-related socket options of consumers manifest: update unit tests for manifests manifest: pack manifest headers manifest: verify FEC packets auth: add consumer socket option to set max unverified delay manifest: process manifests after full FEC decoding manifest: manage forward jumps in RTC verifier fec: remove useless fec codes rs: add new code rate rs: add new code rate rs: add new code rate rs: add new code rate libtransport: increase internal packet cache size remove internal cisco info in cmake manifest: add option to set manifest capacity data_input_node.c: add information about adj_index[VLIB_RX] on received data packetsi sysrepo plugin: update build Change-Id: I0cf64d91bd0a1b7cad4eeaa9871f58f5f10434af Signed-off-by: Mauro Sardara Signed-off-by: Luca Muscariello --- hicn-light/src/hicn/base/bitmap.h | 9 ++++++--- hicn-light/src/hicn/base/pool.c | 2 +- hicn-light/src/hicn/test/test-bitmap.cc | 11 +++++++++++ hicn-light/src/hicn/test/test-ctrl.cc | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) (limited to 'hicn-light') diff --git a/hicn-light/src/hicn/base/bitmap.h b/hicn-light/src/hicn/base/bitmap.h index ed3fac2fd..060fd5be0 100644 --- a/hicn-light/src/hicn/base/bitmap.h +++ b/hicn-light/src/hicn/base/bitmap.h @@ -114,12 +114,15 @@ static inline int bitmap_get(const bitmap_t* bitmap, off_t i) { * * @return bool */ -static inline int _bitmap_set(bitmap_t** bitmap, off_t i) { - if (bitmap_ensure_pos(bitmap, i) < 0) return -1; +static inline int _bitmap_set(bitmap_t** bitmap_ptr, off_t i) { + if (bitmap_ensure_pos(bitmap_ptr, i) < 0) return -1; + + bitmap_t* bitmap = *bitmap_ptr; size_t offset = i / BITMAP_WIDTH(bitmap); size_t pos = i % BITMAP_WIDTH(bitmap); size_t shift = BITMAP_WIDTH(bitmap) - pos - 1; - (*bitmap)[offset] |= (bitmap_t)1 << shift; + + bitmap[offset] |= (bitmap_t)1 << shift; return 0; } diff --git a/hicn-light/src/hicn/base/pool.c b/hicn-light/src/hicn/base/pool.c index ba2a14c5f..e5fb7d6ac 100644 --- a/hicn-light/src/hicn/base/pool.c +++ b/hicn-light/src/hicn/base/pool.c @@ -60,7 +60,7 @@ void _pool_init(void** pool_ptr, size_t elt_size, size_t init_size, ph->free_indices = free_indices; /* Free bitmap */ - uint_fast32_t* fb = ph->free_bitmap; + bitmap_t* fb = ph->free_bitmap; bitmap_init(fb, init_size, max_size); bitmap_set_to(fb, init_size); ph->free_bitmap = fb; diff --git a/hicn-light/src/hicn/test/test-bitmap.cc b/hicn-light/src/hicn/test/test-bitmap.cc index f1bf1ae5a..f9cd4024f 100644 --- a/hicn-light/src/hicn/test/test-bitmap.cc +++ b/hicn-light/src/hicn/test/test-bitmap.cc @@ -103,6 +103,17 @@ TEST_F(BitmapTest, BitmapSet) { EXPECT_FALSE(bitmap_is_set(bitmap, 19)); EXPECT_TRUE(bitmap_is_unset(bitmap, 19)); + // Test edge cases (i.e. start and end of block) + off_t start_position = 0; + bitmap_set(bitmap, start_position); + EXPECT_TRUE(bitmap_is_set(bitmap, start_position)); + EXPECT_FALSE(bitmap_is_unset(bitmap, start_position)); + + off_t end_position = BITMAP_WIDTH(bitmap) - 1; + bitmap_set(bitmap, end_position); + EXPECT_TRUE(bitmap_is_set(bitmap, end_position)); + EXPECT_FALSE(bitmap_is_unset(bitmap, end_position)); + bitmap_free(bitmap); } diff --git a/hicn-light/src/hicn/test/test-ctrl.cc b/hicn-light/src/hicn/test/test-ctrl.cc index 77b16a8af..e24b47f27 100644 --- a/hicn-light/src/hicn/test/test-ctrl.cc +++ b/hicn-light/src/hicn/test/test-ctrl.cc @@ -161,4 +161,36 @@ TEST_F(CtrlTest, AddRouteInvalidCost) { result = hc_route_create_conf(s_, &command_.object.route); success = hc_result_get_success(s_, result); EXPECT_FALSE(success); +} + +TEST_F(CtrlTest, RouteNameOrID) { + hc_route_t route = { + .face_id = (face_id_t)INVALID_FACE_ID, + .family = AF_INET6, + .remote_addr = IPV6_LOOPBACK, + .len = 64, + .cost = 1, + }; + + // At least one between name (symbolic or ID) and face_id + // should be set to make the route valid + + // Valid name (symbolic) + snprintf(route.name, SYMBOLIC_NAME_LEN, "%s", "test"); + EXPECT_EQ(hc_route_validate(&route), 0); + + // Valid name (ID) + snprintf(route.name, SYMBOLIC_NAME_LEN, "%s", "conn0"); + EXPECT_EQ(hc_route_validate(&route), 0); + + // Valid face_id + route.face_id = 1; + snprintf(route.name, SYMBOLIC_NAME_LEN, "%s", ""); + EXPECT_EQ(hc_route_validate(&route), 0); + + // Invalid name stating with number + // (face_id is only checked if empty name) + route.face_id = 1; + snprintf(route.name, SYMBOLIC_NAME_LEN, "%s", "1test"); + EXPECT_EQ(hc_route_validate(&route), -1); } \ No newline at end of file -- cgit 1.2.3-korg