kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-30 17:01:19 +01:00
Code Releases Activity

Merge pull request #3522 from authmillenon/ng_ipv6_netif/fix/source-for-other-subnets

Browse Source 
ng_ipv6_netif: find source addresses for destinations from other subnets
This commit is contained in:
Martine Lenders 2015-07-31 00:25:27 +02:00
commit 392e16f854
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c
View File

@ -328,14 +328,14 @@ ng_ipv6_addr_t *ng_ipv6_netif_find_addr(kernel_pid_t pid, const ng_ipv6_addr_t *
}
static uint8_t _find_by_prefix_unsafe(ng_ipv6_addr_t **res, ng_ipv6_netif_t *iface,
const ng_ipv6_addr_t *addr, bool only_unicast)
const ng_ipv6_addr_t *addr, bool src_search)
{
uint8_t best_match = 0;
for (int i = 0; i < NG_IPV6_NETIF_ADDR_NUMOF; i++) {
uint8_t match;
if ((only_unicast &&
if ((src_search &&
ng_ipv6_netif_addr_is_non_unicast(&(iface->addrs[i].addr))) ||
ng_ipv6_addr_is_unspecified(&(iface->addrs[i].addr))) {
continue;
@ -343,7 +343,7 @@ static uint8_t _find_by_prefix_unsafe(ng_ipv6_addr_t **res, ng_ipv6_netif_t *ifa
match = ng_ipv6_addr_match_prefix(&(iface->addrs[i].addr), addr);
if (only_unicast && !ng_ipv6_addr_is_multicast(addr) &&
if (!src_search && !ng_ipv6_addr_is_multicast(addr) &&
(match < iface->addrs[i].prefix_len)) {
/* match but not of same subnet */
continue;
@ -366,14 +366,14 @@ static uint8_t _find_by_prefix_unsafe(ng_ipv6_addr_t **res, ng_ipv6_netif_t *ifa
DEBUG("%s by %" PRIu8 " bits (used as source address = %s)\n",
ng_ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)),
best_match,
(only_unicast) ? "true" : "false");
(src_search) ? "true" : "false");
}
else {
DEBUG("ipv6 netif: Did not found any address on interface %" PRIkernel_pid
" matching %s (used as source address = %s)\n",
iface->pid,
ng_ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)),
(only_unicast) ? "true" : "false");
(src_search) ? "true" : "false");
}
#endif
@ -424,14 +424,14 @@ kernel_pid_t ng_ipv6_netif_find_by_prefix(ng_ipv6_addr_t **out, const ng_ipv6_ad
}
static ng_ipv6_addr_t *_match_prefix(kernel_pid_t pid, const ng_ipv6_addr_t *addr,
bool only_unicast)
bool src_search)
{
ng_ipv6_addr_t *res = NULL;
ng_ipv6_netif_t *iface = ng_ipv6_netif_get(pid);
mutex_lock(&(iface->mutex));
if (_find_by_prefix_unsafe(&res, iface, addr, only_unicast) > 0) {
if (_find_by_prefix_unsafe(&res, iface, addr, src_search) > 0) {
mutex_unlock(&(iface->mutex));
return res;
}

17
tests/unittests/tests-ipv6_netif/tests-ipv6_netif.c
View File

@ -462,6 +462,22 @@ static void test_ipv6_netif_find_best_src_addr__multicast_input(void)
TEST_ASSERT_EQUAL_INT(false, ng_ipv6_addr_is_unspecified(out));
}
static void test_ipv6_netif_find_best_src_addr__other_subnet(void)
{
ng_ipv6_addr_t addr1 = DEFAULT_TEST_IPV6_ADDR;
ng_ipv6_addr_t addr2 = OTHER_TEST_IPV6_ADDR;
ng_ipv6_addr_t *out = NULL;
test_ipv6_netif_add__success(); /* adds DEFAULT_TEST_NETIF as interface */
TEST_ASSERT_NOT_NULL(ng_ipv6_netif_add_addr(DEFAULT_TEST_NETIF, &addr1, DEFAULT_TEST_PREFIX_LEN,
0));
TEST_ASSERT_NOT_NULL((out = ng_ipv6_netif_find_best_src_addr(DEFAULT_TEST_NETIF, &addr2)));
TEST_ASSERT(out != &addr1);
TEST_ASSERT_EQUAL_INT(true, ng_ipv6_addr_equal(out, &addr1));
}
static void test_ipv6_netif_addr_is_non_unicast__unicast(void)
{
ng_ipv6_addr_t addr = DEFAULT_TEST_IPV6_ADDR;
@ -549,6 +565,7 @@ Test *tests_ipv6_netif_tests(void)
new_TestFixture(test_ipv6_netif_find_best_src_addr__no_unicast),
new_TestFixture(test_ipv6_netif_find_best_src_addr__success),
new_TestFixture(test_ipv6_netif_find_best_src_addr__multicast_input),
new_TestFixture(test_ipv6_netif_find_best_src_addr__other_subnet),
new_TestFixture(test_ipv6_netif_addr_is_non_unicast__unicast),
new_TestFixture(test_ipv6_netif_addr_is_non_unicast__anycast),
new_TestFixture(test_ipv6_netif_addr_is_non_unicast__multicast1),