Skip to content

Commit 8ae8954

Browse files
wqx6restyled-commits
wqx6
and
restyled-commits
authored
ESP32: fix some build errors when enabling platform mdns/disabling srp client (project-chip#33544)
* ESP32: fix some build errors when enabling platform mdns/disable srp client * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 25cf97c commit 8ae8954

5 files changed

+25
-12
lines changed

‎src/platform/ESP32/CHIPDevicePlatformConfig.h

+9
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,17 @@
5454
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
5555
#endif // CONFIG_ENABLE_MATTER_OVER_THREAD
5656

57+
#ifdef CONFIG_OPENTHREAD_SRP_CLIENT
5758
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT CONFIG_OPENTHREAD_SRP_CLIENT
59+
#else
60+
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 0
61+
#endif // CONFIG_OPENTHREAD_SRP_CLIENT
62+
63+
#ifdef CONFIG_OPENTHREAD_DNS_CLIENT
5864
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT CONFIG_OPENTHREAD_DNS_CLIENT
65+
#else
66+
#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 0
67+
#endif // CONFIG_OPENTHREAD_DNS_CLIENT
5968

6069
#ifdef CONFIG_ENABLE_ETHERNET_TELEMETRY
6170
#define CHIP_DEVICE_CONFIG_ENABLE_ETHERNET 1

‎src/platform/ESP32/DnssdImpl.cpp

+9-10
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#endif
3131

3232
using namespace ::chip::DeviceLayer;
33+
using chip::DeviceLayer::Internal::ESP32Utils;
3334

3435
namespace chip {
3536
namespace Dnssd {
@@ -39,7 +40,7 @@ CHIP_ERROR ChipDnssdInit(DnssdAsyncReturnCallback initCallback, DnssdAsyncReturn
3940
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
4041
ReturnErrorOnFailure(EspDnssdInit(initCallback, errorCallback, context));
4142
#endif
42-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
43+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
4344
ReturnErrorOnFailure(OpenThreadDnssdInit(initCallback, errorCallback, context));
4445
#endif
4546
return CHIP_NO_ERROR;
@@ -52,7 +53,7 @@ CHIP_ERROR ChipDnssdPublishService(const DnssdService * service, DnssdPublishCal
5253
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
5354
ReturnErrorOnFailure(EspDnssdPublishService(service, callback, context));
5455
#endif
55-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
56+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
5657
if (ConnectivityMgr().IsThreadProvisioned())
5758
{
5859
ReturnErrorOnFailure(OpenThreadDnssdPublishService(service, callback, context));
@@ -66,7 +67,7 @@ CHIP_ERROR ChipDnssdRemoveServices()
6667
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
6768
ReturnErrorOnFailure(EspDnssdRemoveServices());
6869
#endif
69-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
70+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
7071
if (ConnectivityMgr().IsThreadProvisioned())
7172
{
7273
ReturnErrorOnFailure(OpenThreadDnssdRemoveServices());
@@ -77,7 +78,7 @@ CHIP_ERROR ChipDnssdRemoveServices()
7778

7879
CHIP_ERROR ChipDnssdFinalizeServiceUpdate()
7980
{
80-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
81+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
8182
if (ConnectivityMgr().IsThreadProvisioned())
8283
{
8384
ReturnErrorOnFailure(OpenThreadDnssdFinalizeServiceUpdate());
@@ -91,13 +92,12 @@ CHIP_ERROR ChipDnssdBrowse(const char * type, DnssdServiceProtocol protocol, chi
9192
intptr_t * browseIdentifier)
9293
{
9394
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
94-
if (ConnectivityMgr().IsWiFiStationProvisioned() ||
95-
Internal::ESP32Utils::HasIPv6LinkLocalAddress(Internal::ESP32Utils::kDefaultEthernetNetifKey))
95+
if (ConnectivityMgr().IsWiFiStationProvisioned() || ESP32Utils::HasIPv6LinkLocalAddress(ESP32Utils::kDefaultEthernetNetifKey))
9696
{
9797
ReturnErrorOnFailure(EspDnssdBrowse(type, protocol, addressType, interface, callback, context, browseIdentifier));
9898
}
9999
#endif
100-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
100+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT && CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT
101101
if (ConnectivityMgr().IsThreadProvisioned())
102102
{
103103
ReturnErrorOnFailure(OpenThreadDnssdBrowse(type, protocol, addressType, interface, callback, context, browseIdentifier));
@@ -115,13 +115,12 @@ CHIP_ERROR ChipDnssdResolve(DnssdService * service, chip::Inet::InterfaceId inte
115115
void * context)
116116
{
117117
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI || CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
118-
if (ConnectivityMgr().IsWiFiStationProvisioned() ||
119-
Internal::ESP32Utils::HasIPv6LinkLocalAddress(Internal::ESP32Utils::kDefaultEthernetNetifKey))
118+
if (ConnectivityMgr().IsWiFiStationProvisioned() || ESP32Utils::HasIPv6LinkLocalAddress(ESP32Utils::kDefaultEthernetNetifKey))
120119
{
121120
ReturnErrorOnFailure(EspDnssdResolve(service, interface, callback, context));
122121
}
123122
#endif
124-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
123+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT && CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT
125124
if (ConnectivityMgr().IsThreadProvisioned())
126125
{
127126
ReturnErrorOnFailure(OpenThreadDnssdResolve(service, interface, callback, context));

‎src/platform/ESP32/ESP32DnssdImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ static CHIP_ERROR OnBrowseDone(BrowseContext * ctx)
355355
Inet::IPAddress IPAddr;
356356
error = GetIPAddress(IPAddr, currentResult->addr);
357357
SuccessOrExit(error);
358-
ctx->mService[servicesIndex].mAddress.SetValue(IPAddr);
358+
ctx->mService[servicesIndex].mAddress.emplace(IPAddr);
359359
}
360360
currentResult = currentResult->next;
361361
servicesIndex++;

‎src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ class GenericThreadStackManagerImpl_OpenThread
230230

231231
DnsBrowseCallback mDnsBrowseCallback;
232232
DnsResolveCallback mDnsResolveCallback;
233-
GeneralFaults<kMaxNetworkFaults> mNetworkFaults;
234233

235234
struct DnsServiceTxtEntries
236235
{
@@ -264,6 +263,8 @@ class GenericThreadStackManagerImpl_OpenThread
264263
#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT
265264
#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
266265

266+
GeneralFaults<kMaxNetworkFaults> mNetworkFaults;
267+
267268
inline ImplClass * Impl() { return static_cast<ImplClass *>(this); }
268269
};
269270

‎src/platform/OpenThread/OpenThreadDnssdImpl.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ namespace Dnssd {
2424

2525
CHIP_ERROR OpenThreadDnssdInit(DnssdAsyncReturnCallback initCallback, DnssdAsyncReturnCallback errorCallback, void * context)
2626
{
27+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
2728
ReturnErrorOnFailure(ThreadStackMgr().SetSrpDnsCallbacks(initCallback, errorCallback, context));
2829

2930
uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
@@ -33,6 +34,9 @@ CHIP_ERROR OpenThreadDnssdInit(DnssdAsyncReturnCallback initCallback, DnssdAsync
3334
MakeHostName(hostname, sizeof(hostname), mac);
3435

3536
return ThreadStackMgr().ClearSrpHost(hostname);
37+
#else
38+
return CHIP_ERROR_NOT_IMPLEMENTED;
39+
#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
3640
}
3741

3842
const char * GetProtocolString(DnssdServiceProtocol protocol)

0 commit comments

Comments
 (0)