espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-06-06 05:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[nat64] check OMR prefix when selecting favored NAT64 prefix (#8995)

Browse Source 
This commit adds a check on OMR prefix before selecting AIL prefix as
the favored NAT64 prefix for publishing.
This commit is contained in:
Yi
2023-05-16 00:57:20 +08:00
committed by GitHub
parent fc08dd62f5
commit 73d3ea5449
5 changed files with 167 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/border_router/routing_manager.cpp
+6 -8
View File
@@ -2869,16 +2869,14 @@ void RoutingManager::Nat64PrefixManager::GenerateLocalPrefix(const Ip6::Prefix &
const Ip6::Prefix &RoutingManager::Nat64PrefixManager::GetFavoredPrefix(RoutePreference &aPreference) const
{
const Ip6::Prefix *favoredPrefix = &mInfraIfPrefix;
const Ip6::Prefix *favoredPrefix = &mLocalPrefix;
if (mInfraIfPrefix.IsValidNat64())
aPreference = NetworkData::kRoutePreferenceLow;
if (mInfraIfPrefix.IsValidNat64() && Get<RoutingManager>().mFavoredOmrPrefix.IsInfrastructureDerived())
{
aPreference = NetworkData::kRoutePreferenceMedium;
}
else
{
favoredPrefix = &mLocalPrefix;
aPreference = NetworkData::kRoutePreferenceLow;
favoredPrefix = &mInfraIfPrefix;
aPreference = NetworkData::kRoutePreferenceMedium;
}
return *favoredPrefix;
tests/scripts/thread-cert/border_router/nat64/test_multi_border_routers.py
+9 -2
View File
@@ -49,6 +49,8 @@ ROUTER = 2
BR2 = 3
HOST = 4
OMR_PREFIX = "2000:0:1111:4444::/64"
NAT64_PREFIX_REFRESH_DELAY = 305
NAT64_STATE_DISABLED = 'disabled'
@@ -118,9 +120,15 @@ class Nat64MultiBorderRouter(thread_cert.TestCase):
self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY)
self.assertEqual('router', br2.get_state())
br2.add_prefix(OMR_PREFIX)
br2.register_netdata()
self.simulator.go(10)
self.simulator.go(10)
self.assertNotEqual(br1.get_br_favored_nat64_prefix(), br2.get_br_favored_nat64_prefix())
br1_local_nat64_prefix = br1.get_br_nat64_prefix()
br2_local_nat64_prefix = br2.get_br_nat64_prefix()
self.assertNotEqual(br2_local_nat64_prefix, br2.get_br_favored_nat64_prefix())
br2_infra_nat64_prefix = br2.get_br_favored_nat64_prefix()
self.assertEqual(len(br1.get_netdata_nat64_prefix()), 1)
@@ -164,8 +172,7 @@ class Nat64MultiBorderRouter(thread_cert.TestCase):
br2.nat64_set_enabled(True)
self.simulator.go(10)
self.assertNotEqual(br2_infra_nat64_prefix, br2.get_br_favored_nat64_prefix())
br2_local_nat64_prefix = br2.get_br_nat64_prefix()
self.assertEqual(br2_local_nat64_prefix, br2.get_br_favored_nat64_prefix())
self.assertEqual(len(br1.get_netdata_nat64_prefix()), 1)
nat64_prefix = br1.get_netdata_nat64_prefix()[0]
tests/scripts/thread-cert/border_router/nat64/test_with_infrastructure_prefix.py
+26 -7
View File
@@ -47,6 +47,7 @@ import thread_cert
BR = 1
ROUTER = 2
OMR_PREFIX = "2000:0:1111:4444::/64"
# The prefix is set smaller than the default infrastructure NAT64 prefix.
SMALL_NAT64_PREFIX = "2000:0:0:1:0:0::/96"
@@ -90,8 +91,26 @@ class Nat64SingleBorderRouter(thread_cert.TestCase):
self.simulator.go(config.ROUTER_STARTUP_DELAY)
self.assertEqual('router', router.get_state())
# Case 1 BR advertise the infrastructure prefix
infra_nat64_prefix = br.get_br_favored_nat64_prefix()
# Case 1 No infra-derived OMR prefix. BR publishes its local prefix.
local_nat64_prefix = br.get_br_nat64_prefix()
self.assertEqual(len(br.get_netdata_nat64_prefix()), 1)
nat64_prefix = br.get_netdata_nat64_prefix()[0]
self.assertEqual(nat64_prefix, local_nat64_prefix)
self.assertDictIncludes(br.nat64_state, {
'PrefixManager': NAT64_STATE_ACTIVE,
'Translator': NAT64_STATE_ACTIVE
})
# Case 2 Add OMR prefix. BR publishes the infrastructure nat64 prefix
br.add_prefix(OMR_PREFIX)
br.register_netdata()
self.simulator.go(10)
favored_nat64_prefix = br.get_br_favored_nat64_prefix()
self.assertNotEqual(favored_nat64_prefix, local_nat64_prefix)
infra_nat64_prefix = favored_nat64_prefix
self.assertEqual(len(br.get_netdata_nat64_prefix()), 1)
nat64_prefix = br.get_netdata_nat64_prefix()[0]
@@ -101,7 +120,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase):
'Translator': NAT64_STATE_NOT_RUNNING
})
# Case 2 Withdraw infrastructure prefix when a smaller prefix in medium
# Case 3 Unpublish infrastructure prefix when a smaller prefix in medium
# preference is present
br.add_route(SMALL_NAT64_PREFIX, stable=False, nat64=True, prf='med')
br.register_netdata()
@@ -121,7 +140,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase):
self.assertEqual(len(br.get_netdata_nat64_prefix()), 1)
self.assertEqual(nat64_prefix, infra_nat64_prefix)
# Case 3 No change when a smaller prefix in low preference is present
# Case 4 No change when a smaller prefix in low preference is present
br.add_route(SMALL_NAT64_PREFIX, stable=False, nat64=True, prf='low')
br.register_netdata()
self.simulator.go(5)
@@ -137,7 +156,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase):
br.register_netdata()
self.simulator.go(5)
# Case 4 Infrastructure nat64 prefix no longer presents
# Case 5 Infrastructure nat64 prefix no longer presents
br.bash("service bind9 stop")
self.simulator.go(NAT64_PREFIX_REFRESH_DELAY)
@@ -150,7 +169,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase):
'Translator': NAT64_STATE_ACTIVE
})
# Case 5 Infrastructure nat64 prefix is recovered
# Case 6 Infrastructure nat64 prefix is recovered
br.bash("service bind9 start")
self.simulator.go(NAT64_PREFIX_REFRESH_DELAY)
@@ -162,7 +181,7 @@ class Nat64SingleBorderRouter(thread_cert.TestCase):
'Translator': NAT64_STATE_NOT_RUNNING
})
# Case 6 Change infrastructure nat64 prefix
# Case 7 Change infrastructure nat64 prefix
br.bash("sed -i 's/dns64 /\/\/dns64 /' /etc/bind/named.conf.options")
br.bash("sed -i '/\/\/dns64 /a dns64 " + SMALL_NAT64_PREFIX + " {};' /etc/bind/named.conf.options")
br.bash("service bind9 restart")
tests/toranj/openthread-core-toranj-config.h
+8
View File
@@ -75,6 +75,14 @@
*/
#define OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE 1
/**
* @def OPENTHREAD_CONFIG_NAT64_BORDER_ROUTING_ENABLE
*
* Define to 1 to enable NAT64 support in Border Routing Manager.
*
*/
#define OPENTHREAD_CONFIG_NAT64_BORDER_ROUTING_ENABLE 1
/**
* @def OPENTHREAD_CONFIG_IP6_BR_COUNTERS_ENABLE
*
tests/unit/test_routing_manager.cpp
+118
View File
@@ -158,6 +158,7 @@ void ValidateRouterAdvert(const Icmp6Packet &aPacket);
const char *PreferenceToString(int8_t aPreference);
void SendRouterAdvert(const Ip6::Address &aAddress, const Icmp6Packet &aPacket);
void SendNeighborAdvert(const Ip6::Address &aAddress, const Ip6::Nd::NeighborAdvertMessage &aNaMessage);
void DiscoverNat64Prefix(const Ip6::Prefix &aPrefix);
#if OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED
void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat, ...)
@@ -502,6 +503,13 @@ void SendNeighborAdvert(const Ip6::Address &aAddress, const Ip6::Nd::NeighborAdv
sizeof(aNaMessage));
}
void DiscoverNat64Prefix(const Ip6::Prefix &aPrefix)
{
Log("Discovered NAT64 prefix %s", aPrefix.ToString().AsCString());
otPlatInfraIfDiscoverNat64PrefixDone(sInstance, kInfraIfIndex, &aPrefix);
}
Ip6::Prefix PrefixFromString(const char *aString, uint8_t aPrefixLength)
{
Ip6::Prefix prefix;
@@ -589,6 +597,31 @@ void VerifyExternalRouteInNetData(ExternalRouteMode aMode)
}
}
void VerifyNat64PrefixInNetData(const Ip6::Prefix &aNat64Prefix)
{
otNetworkDataIterator iterator = OT_NETWORK_DATA_ITERATOR_INIT;
NetworkData::ExternalRouteConfig routeConfig;
bool didFind = false;
Log("VerifyNat64PrefixInNetData()");
while (otNetDataGetNextRoute(sInstance, &iterator, &routeConfig) == kErrorNone)
{
if (!routeConfig.mNat64 || !routeConfig.GetPrefix().IsValidNat64())
{
continue;
}
Log(" nat64 prefix:%s, prf:%s", routeConfig.GetPrefix().ToString().AsCString(),
PreferenceToString(routeConfig.mPreference));
VerifyOrQuit(routeConfig.GetPrefix() == aNat64Prefix);
didFind = true;
}
VerifyOrQuit(didFind);
}
struct Pio
{
Pio(const Ip6::Prefix &aPrefix, uint32_t aValidLifetime, uint32_t aPreferredLifetime)
@@ -3003,6 +3036,88 @@ void TestAutoEnableOfSrpServer(void)
}
#endif // OPENTHREAD_CONFIG_SRP_SERVER_ENABLE
#if OPENTHREAD_CONFIG_NAT64_BORDER_ROUTING_ENABLE
void TestNat64PrefixSelection(void)
{
Ip6::Prefix localNat64;
Ip6::Prefix ailNat64 = PrefixFromString("2000:0:0:1:0:0::", 96);
Ip6::Prefix localOmr;
Ip6::Prefix omrPrefix = PrefixFromString("2000:0000:1111:4444::", 64);
NetworkData::OnMeshPrefixConfig prefixConfig;
Log("--------------------------------------------------------------------------------------------");
Log("TestNat64PrefixSelection");
InitTest();
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Start Routing Manager. Check local NAT64 prefix generation.
SuccessOrQuit(sInstance->Get<BorderRouter::RoutingManager>().SetEnabled(true));
SuccessOrQuit(sInstance->Get<BorderRouter::RoutingManager>().GetNat64Prefix(localNat64));
SuccessOrQuit(sInstance->Get<BorderRouter::RoutingManager>().GetOmrPrefix(localOmr));
Log("Local nat64 prefix is %s", localNat64.ToString().AsCString());
Log("Local OMR prefix is %s", localOmr.ToString().AsCString());
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Enable Nat64 Prefix Manager. Check local NAT64 prefix in Network Data.
sInstance->Get<BorderRouter::RoutingManager>().SetNat64PrefixManagerEnabled(true);
AdvanceTime(20000);
VerifyOmrPrefixInNetData(localOmr);
VerifyNat64PrefixInNetData(localNat64);
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// AIL NAT64 prefix discovered. No infra-derived OMR prefix in Network Data.
// Check local NAT64 prefix in Network Data.
DiscoverNat64Prefix(ailNat64);
AdvanceTime(20000);
VerifyNat64PrefixInNetData(localNat64);
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Add a medium preference OMR prefix into Network Data.
// Check AIL NAT64 prefix published in Network Data.
prefixConfig.Clear();
prefixConfig.mPrefix = omrPrefix;
prefixConfig.mStable = true;
prefixConfig.mSlaac = true;
prefixConfig.mPreferred = true;
prefixConfig.mOnMesh = true;
prefixConfig.mDefaultRoute = false;
prefixConfig.mPreference = NetworkData::kRoutePreferenceMedium;
SuccessOrQuit(otBorderRouterAddOnMeshPrefix(sInstance, &prefixConfig));
SuccessOrQuit(otBorderRouterRegister(sInstance));
AdvanceTime(20000);
VerifyOmrPrefixInNetData(omrPrefix);
VerifyNat64PrefixInNetData(ailNat64);
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// AIL NAT64 prefix removed.
// Check local NAT64 prefix in Network Data.
ailNat64.Clear();
DiscoverNat64Prefix(ailNat64);
AdvanceTime(20000);
VerifyOmrPrefixInNetData(omrPrefix);
VerifyNat64PrefixInNetData(localNat64);
Log("End of TestNat64PrefixSelection");
FinalizeTest();
}
#endif // OPENTHREAD_CONFIG_NAT64_BORDER_ROUTING_ENABLE
#endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
int main(void)
@@ -3025,6 +3140,9 @@ int main(void)
#if OPENTHREAD_CONFIG_SRP_SERVER_ENABLE
TestAutoEnableOfSrpServer();
#endif
#if OPENTHREAD_CONFIG_NAT64_BORDER_ROUTING_ENABLE
TestNat64PrefixSelection();
#endif
printf("All tests passed\n");
#else