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

[netdata-publisher] distinguish SRP/DNS unicast entries (#9937)

Browse Source 
This commit refines the `NetworkData::Publisher` to differentiate
between DNS/SRP unicast entries based on whether the address
information resides in service data (part of service TLV) or server
data (part of server sub-TLV).

Additionally, if another BR adds a service data unicast entry,
`Publisher` will zero out the desired count for server data unicast
entries, effectively removing any previously published server data
unicast entries.

The `test_netdata_publisher` has been updated to validate all the
newly added behaviors.
This commit is contained in:
Abtin Keshavarzian
2024-04-05 09:30:26 -07:00
committed by GitHub
parent 223935bf0c
commit e3f97e2362
3 changed files with 135 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data_publisher.cpp
+63 -45
View File
@@ -661,16 +661,17 @@ void Publisher::DnsSrpServiceEntry::Process(void)
case kTypeUnicastMeshLocalEid:
{
Service::DnsSrpAnycast::Info anycastInfo;
bool hasServiceDataEntry;
CountUnicastEntries(numEntries, numPreferredEntries);
CountServerDataUnicastEntries(numEntries, numPreferredEntries, hasServiceDataEntry);
desiredNumEntries = kDesiredNumUnicast;
if (Get<Service::Manager>().FindPreferredDnsSrpAnycastInfo(anycastInfo) == kErrorNone)
if (hasServiceDataEntry || (Get<Service::Manager>().FindPreferredDnsSrpAnycastInfo(anycastInfo) == kErrorNone))
{
// If there is any anycast entry in netdata, we set the
// desired number of unicast entries (with address added
// in server TLV) to zero to remove any added unicast
// entry.
// If there is any service data unicast entry or anycast
// entry, we set the desired number of server data
// unicast entries to zero to remove any such previously
// added unicast entry.
desiredNumEntries = 0;
}
@@ -680,7 +681,7 @@ void Publisher::DnsSrpServiceEntry::Process(void)
case kTypeUnicast:
desiredNumEntries = kDesiredNumUnicast;
CountUnicastEntries(numEntries, numPreferredEntries);
CountServiceDataUnicastEntries(numEntries, numPreferredEntries);
break;
}
@@ -721,9 +722,53 @@ void Publisher::DnsSrpServiceEntry::CountAnycastEntries(uint8_t &aNumEntries, ui
}
}
void Publisher::DnsSrpServiceEntry::CountUnicastEntries(uint8_t &aNumEntries, uint8_t &aNumPreferredEntries) const
void Publisher::DnsSrpServiceEntry::CountServerDataUnicastEntries(uint8_t &aNumEntries,
uint8_t &aNumPreferredEntries,
bool &aHasServiceDataEntry) const
{
// Count the number of "DNS/SRP Unicast" service entries in
// Count the number of server data DNS/SRP unicast entries in the
// Network Data. Also determine whether there is any service data
// DNS/SRP unicast entry (update `aHasServiceDataEntry`).
const ServiceTlv *serviceTlv = nullptr;
ServiceData data;
aHasServiceDataEntry = false;
data.InitFrom(Service::DnsSrpUnicast::kServiceData);
while ((serviceTlv = Get<Leader>().FindNextThreadService(serviceTlv, data, NetworkData::kServicePrefixMatch)) !=
nullptr)
{
TlvIterator subTlvIterator(*serviceTlv);
const ServerTlv *serverSubTlv;
if (serviceTlv->GetServiceDataLength() >= sizeof(Service::DnsSrpUnicast::ServiceData))
{
aHasServiceDataEntry = true;
}
while (((serverSubTlv = subTlvIterator.Iterate<ServerTlv>())) != nullptr)
{
if (serverSubTlv->GetServerDataLength() < sizeof(Service::DnsSrpUnicast::ServerData))
{
continue;
}
aNumEntries++;
if (IsPreferred(serverSubTlv->GetServer16()))
{
aNumPreferredEntries++;
}
}
}
}
void Publisher::DnsSrpServiceEntry::CountServiceDataUnicastEntries(uint8_t &aNumEntries,
uint8_t &aNumPreferredEntries) const
{
// Count the number of service data DNS/SRP unicast entries in
// the Network Data.
const ServiceTlv *serviceTlv = nullptr;
@@ -737,45 +782,18 @@ void Publisher::DnsSrpServiceEntry::CountUnicastEntries(uint8_t &aNumEntries, ui
TlvIterator subTlvIterator(*serviceTlv);
const ServerTlv *serverSubTlv;
if (serviceTlv->GetServiceDataLength() < sizeof(Service::DnsSrpUnicast::ServiceData))
{
continue;
}
while (((serverSubTlv = subTlvIterator.Iterate<ServerTlv>())) != nullptr)
{
if (serviceTlv->GetServiceDataLength() >= sizeof(Service::DnsSrpUnicast::ServiceData))
aNumEntries++;
if (IsPreferred(serverSubTlv->GetServer16()))
{
aNumEntries++;
// Generally, we prefer entries where the SRP/DNS server
// address/port info is included in the service TLV data
// over the ones where the info is included in the
// server TLV data (i.e., we prefer infra-provided
// SRP/DNS entry over a BR local one using ML-EID). If
// our entry itself uses the service TLV data, then we
// prefer based on the associated RLOC16.
if (GetType() == kTypeUnicast)
{
if (IsPreferred(serverSubTlv->GetServer16()))
{
aNumPreferredEntries++;
}
}
else
{
aNumPreferredEntries++;
}
}
if (serverSubTlv->GetServerDataLength() >= sizeof(Service::DnsSrpUnicast::ServerData))
{
aNumEntries++;
// If our entry also uses the server TLV data (with
// ML-EID address), then the we prefer based on the
// associated RLOC16.
if ((GetType() == kTypeUnicastMeshLocalEid) && IsPreferred(serverSubTlv->GetServer16()))
{
aNumPreferredEntries++;
}
aNumPreferredEntries++;
}
}
}
src/core/thread/network_data_publisher.hpp
+4 -1
View File
@@ -437,7 +437,10 @@ private:
void Notify(Event aEvent) const;
void Process(void);
void CountAnycastEntries(uint8_t &aNumEntries, uint8_t &aNumPreferredEntries) const;
void CountUnicastEntries(uint8_t &aNumEntries, uint8_t &aNumPreferredEntries) const;
void CountServiceDataUnicastEntries(uint8_t &aNumEntries, uint8_t &aNumPreferredEntries) const;
void CountServerDataUnicastEntries(uint8_t &aNumEntries,
uint8_t &aNumPreferredEntries,
bool &aHasServiceDataEntry) const;
Info mInfo;
Callback<DnsSrpServiceCallback> mCallback;
tests/scripts/thread-cert/test_netdata_publisher.py
+68 -24
View File
@@ -70,7 +70,7 @@ DNSSRP_PORT = 49152
# The desired number of entries (based on related config).
DESIRED_NUM_DNSSRP_ANYCAST = 8
DESIRED_NUM_DNSSRP_UNCIAST = 2
DESIRED_NUM_DNSSRP_UNICAST = 2
DESIRED_NUM_ON_MESH_PREFIX = 3
DESIRED_NUM_EXTERNAL_ROUTE = 10
@@ -263,52 +263,39 @@ class NetDataPublisher(thread_cert.TestCase):
self.verify_anycast_services(services)
#---------------------------------------------------------------------------------
# DNS/SRP unicast entries
# DNS/SRP service data unicast entries
# Publish DNS/SRP unicast address on all routers, first using
# MLE-EID address, then change to use specific address. Verify
# that number of entries in network data is correct in each step
# and that entries are switched correctly.
num = 0
for node in routers:
node.netdata_publish_dnssrp_unicast_mleid(DNSSRP_PORT)
self.simulator.go(WAIT_TIME)
num += 1
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNCIAST))
self.verify_unicast_services(services)
for node in routers:
node.netdata_publish_dnssrp_unicast(DNSSRP_ADDRESS, DNSSRP_PORT)
self.simulator.go(WAIT_TIME)
num += 1
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNCIAST))
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNICAST))
self.verify_unicast_services(services)
for node in routers:
node.srp_server_set_enabled(True)
self.simulator.go(WAIT_TIME)
self.assertEqual(sum(node.srp_server_get_state() == 'running' for node in routers),
min(len(routers), DESIRED_NUM_DNSSRP_UNCIAST))
min(len(routers), DESIRED_NUM_DNSSRP_UNICAST))
self.assertEqual(sum(node.srp_server_get_state() == 'stopped' for node in routers),
max(len(routers) - DESIRED_NUM_DNSSRP_UNCIAST, 0))
max(len(routers) - DESIRED_NUM_DNSSRP_UNICAST, 0))
for node in routers:
node.netdata_unpublish_dnssrp()
self.simulator.go(WAIT_TIME)
num -= 1
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNCIAST))
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNICAST))
self.verify_unicast_services(services)
for node in routers:
node.srp_server_set_enabled(False)
self.assertEqual(node.srp_server_get_state(), 'disabled')
#---------------------------------------------------------------------------------
# DNS/SRP unicast and anycast entry
# Verify that publishing an anycast entry will update the limit
# for the unicast MLE-EID address entry and all are removed.
# DNS/SRP server data unicast entries
num = 0
for node in routers:
@@ -316,20 +303,77 @@ class NetDataPublisher(thread_cert.TestCase):
self.simulator.go(WAIT_TIME)
num += 1
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNCIAST))
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNICAST))
self.verify_unicast_services(services)
for node in routers:
node.srp_server_set_enabled(True)
self.simulator.go(WAIT_TIME)
self.assertEqual(sum(node.srp_server_get_state() == 'running' for node in routers),
min(len(routers), DESIRED_NUM_DNSSRP_UNICAST))
self.assertEqual(sum(node.srp_server_get_state() == 'stopped' for node in routers),
max(len(routers) - DESIRED_NUM_DNSSRP_UNICAST, 0))
for node in routers:
node.netdata_unpublish_dnssrp()
self.simulator.go(WAIT_TIME)
num -= 1
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNICAST))
self.verify_unicast_services(services)
for node in routers:
node.srp_server_set_enabled(False)
self.assertEqual(node.srp_server_get_state(), 'disabled')
#---------------------------------------------------------------------------------
# DNS/SRP server data unicast vs anycast
num = 0
for node in routers:
node.netdata_publish_dnssrp_unicast_mleid(DNSSRP_PORT)
self.simulator.go(WAIT_TIME)
num += 1
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNICAST))
self.verify_unicast_services(services)
# Verify that publishing an anycast entry will update the
# limit for the server data unicast address entry and all are
# removed.
leader.netdata_publish_dnssrp_anycast(ANYCAST_SEQ_NUM)
self.simulator.go(WAIT_TIME)
services = leader.get_services()
self.assertEqual(len(services), 1)
self.verify_anycast_services(services)
# Removing the anycast entry will cause the lower priority
# server data unicast entries to be added again.
leader.netdata_unpublish_dnssrp()
self.simulator.go(WAIT_TIME)
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNCIAST))
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNICAST))
self.verify_unicast_services(services)
#---------------------------------------------------------------------------------
# DNS/SRP server data unicast vs service data unicast
leader.netdata_publish_dnssrp_unicast(DNSSRP_ADDRESS, DNSSRP_PORT)
self.simulator.go(WAIT_TIME)
services = leader.get_services()
self.assertEqual(len(services), 1)
self.verify_unicast_services(services)
# Removing the service data unicast entry will cause the lower
# priority server data unicast entries to be added again.
leader.netdata_unpublish_dnssrp()
self.simulator.go(WAIT_TIME)
services = leader.get_services()
self.assertEqual(len(services), min(num, DESIRED_NUM_DNSSRP_UNICAST))
self.verify_unicast_services(services)
for node in routers: