diff --git a/tests/gnrc_ipv6_nib/main.c b/tests/gnrc_ipv6_nib/main.c index 7365218ce2d868a485c4ec2400513d1214f323ec..acc1f609be8a75483f81f17965c4521c121851d4 100644 --- a/tests/gnrc_ipv6_nib/main.c +++ b/tests/gnrc_ipv6_nib/main.c @@ -113,7 +113,7 @@ static void test_get_next_hop_l2addr__EHOSTUNREACH(const ipv6_addr_t *dst, } else { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, &_rem_ll, - _mock_netif->pid)); + _mock_netif->pid, 0)); } TEST_ASSERT_EQUAL_INT(-EHOSTUNREACH, gnrc_ipv6_nib_get_next_hop_l2addr(dst, netif, diff --git a/tests/gnrc_ipv6_nib_6ln/main.c b/tests/gnrc_ipv6_nib_6ln/main.c index 6126eaf6cec02f604934520f8b2874748bb1db8d..b5ffeb9a0f5c581d56ce334cdd573ee4d0ff040a 100644 --- a/tests/gnrc_ipv6_nib_6ln/main.c +++ b/tests/gnrc_ipv6_nib_6ln/main.c @@ -176,7 +176,7 @@ static void test_get_next_hop_l2addr__global_with_default_route(void) /* add _rem_ll as default router */ TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, &_rem_ll, - _mock_netif->pid)); + _mock_netif->pid, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_get_next_hop_l2addr(&_rem_gb, NULL, NULL, &nce)); diff --git a/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-ft.c b/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-ft.c index ed499d7ab69241eb5c4ddb86495d5b7b98d2f8cc..e52901f63046183b273c91ab03227784f9dde065 100644 --- a/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-ft.c +++ b/tests/unittests/tests-gnrc_ipv6_nib/tests-gnrc_ipv6_nib-ft.c @@ -70,7 +70,7 @@ static void test_nib_ft_get__ENETUNREACH_no_def_route(void) ipv6_addr_t dst = { .u64 = { { .u8 = GLOBAL_PREFIX } } }; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); dst.u16[0].u16--; TEST_ASSERT_EQUAL_INT(-ENETUNREACH, gnrc_ipv6_nib_ft_get(&dst, NULL, &fte)); } @@ -88,7 +88,7 @@ static void test_nib_ft_get__success1(void) static const ipv6_addr_t next_hop = { .u64 = { { .u8 = LINK_LOCAL_PREFIX }, { .u64 = TEST_UINT64 } } }; - TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, &next_hop, IFACE)); + TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, &next_hop, IFACE, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_get(&dst, NULL, &fte)); TEST_ASSERT(ipv6_addr_is_unspecified(&fte.dst)); TEST_ASSERT(ipv6_addr_equal(&next_hop, &fte.next_hop)); @@ -111,7 +111,7 @@ static void test_nib_ft_get__success2(void) { .u64 = TEST_UINT64 } } }; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_get(&dst, NULL, &fte)); TEST_ASSERT(ipv6_addr_match_prefix(&dst, &fte.dst) >= GLOBAL_PREFIX_LEN); TEST_ASSERT(ipv6_addr_equal(&next_hop, &fte.next_hop)); @@ -139,9 +139,9 @@ static void test_nib_ft_get__success3(void) bf_toggle(dst2.u8, GLOBAL_PREFIX_LEN); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst1, GLOBAL_PREFIX_LEN, - &next_hop1, IFACE)); + &next_hop1, IFACE, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst2, GLOBAL_PREFIX_LEN, - &next_hop2, IFACE)); + &next_hop2, IFACE, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_get(&dst1, NULL, &fte)); TEST_ASSERT(ipv6_addr_match_prefix(&dst1, &fte.dst) >= GLOBAL_PREFIX_LEN); TEST_ASSERT(ipv6_addr_equal(&next_hop1, &fte.next_hop)); @@ -167,9 +167,9 @@ static void test_nib_ft_get__success4(void) { .u64 = TEST_UINT64 + 1 } } }; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop1, IFACE)); + &next_hop1, IFACE, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN - 1, - &next_hop2, IFACE)); + &next_hop2, IFACE, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_get(&dst, NULL, &fte)); TEST_ASSERT(ipv6_addr_match_prefix(&dst, &fte.dst) >= GLOBAL_PREFIX_LEN); TEST_ASSERT(ipv6_addr_equal(&next_hop1, &fte.next_hop)); @@ -190,11 +190,11 @@ static void test_nib_ft_add__EINVAL_def_route_next_hop_NULL(void) TEST_ASSERT_EQUAL_INT(-EINVAL, gnrc_ipv6_nib_ft_add(&ipv6_addr_unspecified, GLOBAL_PREFIX_LEN, - NULL, IFACE)); + NULL, IFACE, 0)); TEST_ASSERT_EQUAL_INT(-EINVAL, gnrc_ipv6_nib_ft_add(NULL, GLOBAL_PREFIX_LEN, - NULL, IFACE)); - TEST_ASSERT_EQUAL_INT(-EINVAL, gnrc_ipv6_nib_ft_add(&dst, 0, NULL, IFACE)); - TEST_ASSERT_EQUAL_INT(-EINVAL, gnrc_ipv6_nib_ft_add(NULL, 0, NULL, IFACE)); + NULL, IFACE, 0)); + TEST_ASSERT_EQUAL_INT(-EINVAL, gnrc_ipv6_nib_ft_add(&dst, 0, NULL, IFACE, 0)); + TEST_ASSERT_EQUAL_INT(-EINVAL, gnrc_ipv6_nib_ft_add(NULL, 0, NULL, IFACE, 0)); } /* @@ -209,7 +209,7 @@ static void test_nib_ft_add__EINVAL_iface0(void) { .u64 = TEST_UINT64 } } }; TEST_ASSERT_EQUAL_INT(-EINVAL, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, 0)); + &next_hop, 0, 0)); } #if GNRC_IPV6_NIB_NUMOF < GNRC_IPV6_NIB_OFFL_NUMOF @@ -230,11 +230,11 @@ static void test_nib_ft_add__ENOMEM_diff_def_router(void) for (unsigned i = 0; i < GNRC_IPV6_NIB_DEFAULT_ROUTER_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, &next_hop, - IFACE)); + IFACE, 0)); next_hop.u64[1].u64++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(NULL, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); } /* @@ -248,11 +248,11 @@ static void test_nib_ft_add__ENOMEM_diff_dst(void) for (unsigned i = 0; i < GNRC_IPV6_NIB_OFFL_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - NULL, IFACE)); + NULL, IFACE, 0)); dst.u16[0].u16--; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - NULL, IFACE)); + NULL, IFACE, 0)); } /* @@ -267,11 +267,11 @@ static void test_nib_ft_add__ENOMEM_diff_dst_len(void) for (unsigned i = 0; i < GNRC_IPV6_NIB_OFFL_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, IFACE)); + NULL, IFACE, 0)); dst_len--; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, IFACE)); + NULL, IFACE, 0)); } /* @@ -287,12 +287,12 @@ static void test_nib_ft_add__ENOMEM_diff_dst_dst_len(void) for (unsigned i = 0; i < GNRC_IPV6_NIB_OFFL_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, IFACE)); + NULL, IFACE, 0)); dst.u16[0].u16--; dst_len--; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, IFACE)); + NULL, IFACE, 0)); } /* @@ -308,11 +308,11 @@ static void test_nib_ft_add__ENOMEM_diff_next_hop(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); next_hop.u64[1].u64++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); } /* @@ -328,12 +328,12 @@ static void test_nib_ft_add__ENOMEM_diff_dst_next_hop(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); dst.u16[0].u16--; next_hop.u64[1].u64++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); } /* @@ -350,13 +350,13 @@ static void test_nib_ft_add__ENOMEM_diff_dst_dst_len_next_hop(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, &next_hop, - IFACE)); + IFACE, 0)); dst.u16[0].u16--; dst_len--; next_hop.u64[1].u64++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, dst_len, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); } /* @@ -372,12 +372,12 @@ static void test_nib_ft_add__ENOMEM_diff_dst_iface(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - NULL, iface)); + NULL, iface, 0)); dst.u16[0].u16--; iface++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - NULL, iface)); + NULL, iface, 0)); } /* @@ -394,12 +394,12 @@ static void test_nib_ft_add__ENOMEM_diff_dst_len_iface(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, iface)); + NULL, iface, 0)); dst_len--; iface++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, iface)); + NULL, iface, 0)); } /* @@ -416,13 +416,13 @@ static void test_nib_ft_add__ENOMEM_diff_dst_dst_len_iface(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, iface)); + NULL, iface, 0)); dst.u16[0].u16--; dst_len--; iface++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, dst_len, - NULL, iface)); + NULL, iface, 0)); } /* @@ -439,12 +439,12 @@ static void test_nib_ft_add__ENOMEM_diff_next_hop_iface(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, iface)); + &next_hop, iface, 0)); next_hop.u64[1].u64++; iface++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, iface)); + &next_hop, iface, 0)); } /* @@ -461,13 +461,13 @@ static void test_nib_ft_add__ENOMEM_diff_dst_next_hop_iface(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, iface)); + &next_hop, iface, 0)); dst.u16[0].u16--; next_hop.u64[1].u64++; iface++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, iface)); + &next_hop, iface, 0)); } /* @@ -486,14 +486,14 @@ static void test_nib_ft_add__ENOMEM_diff_dst_dst_len_next_hop_iface(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, &next_hop, - iface)); + iface, 0)); dst.u16[0].u16--; dst_len--; next_hop.u64[1].u64++; iface++; } TEST_ASSERT_EQUAL_INT(-ENOMEM, gnrc_ipv6_nib_ft_add(&dst, dst_len, - &next_hop, iface)); + &next_hop, iface, 0)); } /* @@ -515,10 +515,10 @@ static void test_nib_ft_add__success_duplicate(void) next_hop.u64[1].u64++; iface++; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, &next_hop, - iface)); + iface, 0)); } TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, - &next_hop, iface)); + &next_hop, iface, 0)); } /* @@ -536,9 +536,9 @@ static void test_nib_ft_add__success_overwrite_unspecified(void) { .u64 = TEST_UINT64 } } }; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, NULL, - IFACE)); + IFACE, 0)); TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); TEST_ASSERT(gnrc_ipv6_nib_ft_iter(NULL, 0, &iter_state, &fte)); TEST_ASSERT(ipv6_addr_equal(&fte.next_hop, &next_hop)); TEST_ASSERT(!gnrc_ipv6_nib_ft_iter(NULL, 0, &iter_state, &fte)); @@ -558,7 +558,7 @@ static void test_nib_ft_add__success(void) { .u64 = TEST_UINT64 } } }; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); TEST_ASSERT(gnrc_ipv6_nib_ft_iter(NULL, 0, &iter_state, &fte)); TEST_ASSERT(ipv6_addr_match_prefix(&fte.dst, &dst) >= GLOBAL_PREFIX_LEN); TEST_ASSERT_EQUAL_INT(GLOBAL_PREFIX_LEN, fte.dst_len); @@ -586,7 +586,7 @@ static void test_nib_ft_del__unknown(void) for (unsigned i = 0; i < MAX_NUMOF; i++) { TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, dst_len, &next_hop, - iface)); + iface, 0)); dst.u16[0].u16--; dst_len--; next_hop.u64[1].u64++; @@ -612,7 +612,7 @@ static void test_nib_ft_del__success(void) gnrc_ipv6_nib_ft_t fte; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&dst, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); gnrc_ipv6_nib_ft_del(&dst, GLOBAL_PREFIX_LEN); TEST_ASSERT(!gnrc_ipv6_nib_ft_iter(NULL ,0, &iter_state, &fte)); } @@ -632,13 +632,13 @@ static void test_nib_ft_iter__empty_def_route_at_beginning(void) int count = 0; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); next_hop.u16[0].u16++; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); next_hop.u16[0].u16++; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(NULL, 0, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); gnrc_ipv6_nib_ft_del(NULL, 0); next_hop.u16[0].u16--; while (gnrc_ipv6_nib_ft_iter(NULL, 0, &iter_state, &fte)) { @@ -669,13 +669,13 @@ static void test_nib_ft_iter__empty_pref_route_in_the_middle(void) int count = 0; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&route, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); route.u16[0].u16++; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&route, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); route.u16[0].u16++; TEST_ASSERT_EQUAL_INT(0, gnrc_ipv6_nib_ft_add(&route, GLOBAL_PREFIX_LEN, - &next_hop, IFACE)); + &next_hop, IFACE, 0)); route.u16[0].u16--; gnrc_ipv6_nib_ft_del(&route, GLOBAL_PREFIX_LEN); route.u16[0].u16--;