espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-02 09:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[routing-manager] exclude on-link prefixes with short preferred lifetime (#10062)

Browse Source 
This commit updates `FindFavoredOnLinkPrefix()` to exclude discovered
on-link prefixes with preferred lifetimes under 30 minutes.
This commit is contained in:
Abtin Keshavarzian
2024-04-29 09:11:27 -07:00
committed by GitHub
parent 502797c0b3
commit efb80c0b83
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/routing_manager.cpp
+2 -1
View File
@@ -1247,7 +1247,8 @@ void RoutingManager::DiscoveredPrefixTable::FindFavoredOnLinkPrefix(Ip6::Prefix
{
for (const Entry &entry : router.mEntries)
{
if (!entry.IsOnLinkPrefix() || entry.IsDeprecated())
if (!entry.IsOnLinkPrefix() || entry.IsDeprecated() ||
(entry.GetPreferredLifetime() < kFavoredOnLinkPrefixMinPreferredLifetime))
{
continue;
}
src/core/border_router/routing_manager.hpp
+2
View File
@@ -715,6 +715,8 @@ private:
void HandleRouterTimer(void);
private:
static constexpr uint32_t kFavoredOnLinkPrefixMinPreferredLifetime = 1800; // In sec.
#if !OPENTHREAD_CONFIG_BORDER_ROUTING_USE_HEAP_ENABLE
static constexpr uint16_t kMaxRouters = OPENTHREAD_CONFIG_BORDER_ROUTING_MAX_DISCOVERED_ROUTERS;
static constexpr uint16_t kMaxEntries = OPENTHREAD_CONFIG_BORDER_ROUTING_MAX_DISCOVERED_PREFIXES;
tests/scripts/thread-cert/border_router/test_on_link_prefix.py
-14
View File
@@ -188,20 +188,6 @@ class MultiThreadNetworks(thread_cert.TestCase):
host_on_link_addr = host.get_matched_ula_addresses(ON_LINK_PREFIX)[0]
# Wait 30 seconds for the radvd `ON_LINK_PREFIX` to be invalidated
# and make sure that Thread devices in both networks can't reach
# the on-link address.
self.simulator.go(30) # Valid Lifetime of radvd PIO is set to 60 seconds.
self.assertEqual(len(host.get_matched_ula_addresses(ON_LINK_PREFIX)), 0)
self.assertFalse(router1.ping(host_on_link_addr))
self.assertFalse(host.ping(router1_omr_addr, backbone=True, interface=host_on_link_addr))
self.assertFalse(router2.ping(host_on_link_addr))
self.assertFalse(host.ping(router2_omr_addr, backbone=True, interface=host_on_link_addr))
# Verify connectivity between the two networks.
self.assertTrue(router1.ping(router2.get_ip6_address(config.ADDRESS_TYPE.OMR)[0]))
self.assertTrue(router2.ping(router1.get_ip6_address(config.ADDRESS_TYPE.OMR)[0]))
if __name__ == '__main__':
unittest.main()
tests/scripts/thread-cert/node.py
+2 -2
View File
@@ -3982,8 +3982,8 @@ interface eth0
AdvOnLink on;
AdvAutonomous %s;
AdvRouterAddr off;
AdvPreferredLifetime 40;
AdvValidLifetime 60;
AdvPreferredLifetime 1800;
AdvValidLifetime 1800;
};
};
EOF