Skip to content

Commit 054ccca

Browse files
senthilkusenthilku
authored
Merge branch 'master' into feature/closure_control_cluster_update_xml_with_latest_spec
2 parents e3c74e9 + 79da246 commit 054ccca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+157
-108
lines changed

‎examples/contact-sensor-app/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ chip_enable_ble = true
2727
chip_generate_link_map_file = true
2828

2929
chip_system_config_provide_statistics = false
30-
chip_system_config_use_open_thread_inet_endpoints = true
30+
chip_system_config_use_openthread_inet_endpoints = true
3131
chip_with_lwip = false
3232

3333
chip_enable_icd_server = true

‎examples/contact-sensor-app/nxp/mcxw71/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_enable_ble = true
2626
chip_generate_link_map_file = true
2727

2828
chip_system_config_provide_statistics = false
29-
chip_system_config_use_open_thread_inet_endpoints = true
29+
chip_system_config_use_openthread_inet_endpoints = true
3030
chip_with_lwip = false
3131

3232
chip_enable_icd_server = true

‎examples/lighting-app/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ chip_openthread_ftd = true
3333
nxp_enable_ot_cli = false
3434

3535
chip_system_config_provide_statistics = false
36-
chip_system_config_use_open_thread_inet_endpoints = true
36+
chip_system_config_use_openthread_inet_endpoints = true
3737
chip_with_lwip = false
3838
#nxp_use_smu2_static = true
3939
#nxp_use_smu2_dynamic = true

‎examples/lighting-app/nxp/k32w1/with_pw_rpc.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ chip_openthread_ftd = true
2828
chip_stack_lock_tracking = "fatal"
2929

3030
chip_system_config_provide_statistics = false
31-
chip_system_config_use_open_thread_inet_endpoints = true
31+
chip_system_config_use_openthread_inet_endpoints = true
3232

3333
chip_with_lwip = false
3434
nxp_enable_ot_cli = false

‎examples/lighting-app/nxp/mcxw71/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ chip_openthread_ftd = true
3333
nxp_enable_ot_cli = false
3434

3535
chip_system_config_provide_statistics = false
36-
chip_system_config_use_open_thread_inet_endpoints = true
36+
chip_system_config_use_openthread_inet_endpoints = true
3737
chip_with_lwip = false
3838
#nxp_use_smu2_static = true
3939
#nxp_use_smu2_dynamic = true

‎examples/lighting-app/nxp/mcxw71/with_pw_rpc.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ chip_openthread_ftd = true
2828
chip_stack_lock_tracking = "fatal"
2929

3030
chip_system_config_provide_statistics = false
31-
chip_system_config_use_open_thread_inet_endpoints = true
31+
chip_system_config_use_openthread_inet_endpoints = true
3232

3333
chip_with_lwip = false
3434
nxp_enable_ot_cli = false

‎examples/lock-app/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_enable_ble = true
2626
chip_generate_link_map_file = true
2727

2828
chip_system_config_provide_statistics = false
29-
chip_system_config_use_open_thread_inet_endpoints = true
29+
chip_system_config_use_openthread_inet_endpoints = true
3030
chip_with_lwip = false
3131

3232
chip_enable_icd_server = true

‎examples/lock-app/nxp/mcxw71/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_enable_ble = true
2626
chip_generate_link_map_file = true
2727

2828
chip_system_config_provide_statistics = false
29-
chip_system_config_use_open_thread_inet_endpoints = true
29+
chip_system_config_use_openthread_inet_endpoints = true
3030
chip_with_lwip = false
3131

3232
chip_enable_icd_server = true

‎examples/lock-app/silabs/src/EventHandlerLibShell.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,7 @@ void EventWorkerFunction(intptr_t context)
209209
break;
210210
}
211211
}
212+
213+
// free the allocated memory from the event handlers
214+
Platform::Delete(data);
212215
}

‎examples/persistent-storage/qpg/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import("${chip_root}/examples/platform/qpg/args.gni")
1919
qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2020
chip_enable_openthread = false
2121
chip_openthread_ftd = false
22-
chip_system_config_use_open_thread_inet_endpoints = true
22+
chip_system_config_use_openthread_inet_endpoints = true
2323
chip_with_lwip = false
2424

2525
lwip_debug = false

‎examples/platform/qpg/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import("//build_overrides/chip.gni")
1717
import("${chip_root}/src/platform/qpg/args.gni")
1818

1919
chip_enable_openthread = true
20-
chip_system_config_use_open_thread_inet_endpoints = true
20+
chip_system_config_use_openthread_inet_endpoints = true
2121
chip_with_lwip = false
2222
openthread_project_core_config_file = "OpenThreadConfig.h"
2323
openthread_core_config_deps = []

‎scripts/build/builders/bouffalolab.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def __init__(self,
199199

200200
if enable_thread:
201201

202-
self.argsOpt.append('chip_system_config_use_open_thread_inet_endpoints=true')
202+
self.argsOpt.append('chip_system_config_use_openthread_inet_endpoints=true')
203203
self.argsOpt.append('chip_with_lwip=false')
204204
self.argsOpt.append(f'openthread_project_core_config_file="{bouffalo_chip}-openthread-core-bl-config.h"')
205205
self.argsOpt.append(f'openthread_package_version="7e32165be"')

‎src/app/server/Server.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,9 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
428428
//
429429
// Thread LWIP devices using dedicated Inet endpoint implementations are excluded because they call this function from:
430430
// src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp
431-
#if !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
431+
#if !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
432432
RejoinExistingMulticastGroups();
433-
#endif // !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
433+
#endif // !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
434434

435435
// Handle deferred clean-up of a previously armed fail-safe that occurred during FabricTable commit.
436436
// This is done at the very end since at the earlier time above when FabricTable::Init() is called,
@@ -532,7 +532,7 @@ void Server::OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event)
532532
ResumeSubscriptions();
533533
#endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
534534
break;
535-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
535+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
536536
case DeviceEventType::kThreadConnectivityChange:
537537
if (event.ThreadConnectivityChange.Result == kConnectivity_Established)
538538
{
@@ -541,7 +541,7 @@ void Server::OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event)
541541
RejoinExistingMulticastGroups();
542542
}
543543
break;
544-
#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
544+
#endif // CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
545545
default:
546546
break;
547547
}
@@ -618,8 +618,7 @@ void Server::GenerateShutDownEvent()
618618

619619
void Server::PostFactoryResetEvent()
620620
{
621-
DeviceLayer::ChipDeviceEvent event;
622-
event.Type = DeviceLayer::DeviceEventType::kFactoryReset;
621+
DeviceLayer::ChipDeviceEvent event{ .Type = DeviceLayer::DeviceEventType::kFactoryReset };
623622

624623
CHIP_ERROR error = DeviceLayer::PlatformMgr().PostEvent(&event);
625624
if (error != CHIP_NO_ERROR)

‎src/controller/java/OTAProviderDelegateBridge.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,10 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
275275
jboolean userConsentNeeded = JniReferences::GetInstance().BooleanToPrimitive(boxedUserConsentNeeded);
276276
response.userConsentNeeded.SetValue(userConsentNeeded == JNI_TRUE);
277277
}
278+
else
279+
{
280+
response.userConsentNeeded.SetValue(0);
281+
}
278282

279283
status = static_cast<uint8_t>(jStatus);
280284
if (status == static_cast<uint8_t>(OTAQueryStatus::kNotAvailable))
@@ -317,7 +321,6 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
317321
GenerateUpdateToken(mToken, kUpdateTokenLen);
318322

319323
response.updateToken.SetValue(chip::ByteSpan(mToken, kUpdateTokenLen));
320-
response.userConsentNeeded.SetValue(0);
321324

322325
err = mBdxOTASender->PrepareForTransfer(fabricIndex, nodeId);
323326
if (CHIP_NO_ERROR != err)

‎src/inet/BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import("${chip_root}/build/chip/tests.gni")
2222
import("${chip_root}/src/platform/device.gni")
2323
import("inet.gni")
2424

25-
if (chip_system_config_use_open_thread_inet_endpoints) {
25+
if (chip_system_config_use_openthread_inet_endpoints) {
2626
import("//build_overrides/openthread.gni")
2727
}
2828

@@ -128,7 +128,7 @@ static_library("inet") {
128128
public_deps += [ "${lwip_root}:lwip" ]
129129
}
130130

131-
if (chip_system_config_use_open_thread_inet_endpoints) {
131+
if (chip_system_config_use_openthread_inet_endpoints) {
132132
public_deps += [ "${chip_root}/third_party/openthread:openthread" ]
133133
}
134134

‎src/inet/IPAddress-StringFuncts.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace Inet {
4141

4242
char * IPAddress::ToString(char * buf, uint32_t bufSize) const
4343
{
44-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
44+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
4545
#if INET_CONFIG_ENABLE_IPV4
4646
if (IsIPv4())
4747
{
@@ -76,7 +76,7 @@ char * IPAddress::ToString(char * buf, uint32_t bufSize) const
7676
// This cast is safe because |s| points into |buf| which is not const.
7777
buf = const_cast<char *>(s);
7878
}
79-
#elif CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
79+
#elif CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
8080
otIp6Address addr = ToIPv6();
8181
otIp6AddressToString(&addr, buf, static_cast<uint16_t>(bufSize));
8282
#endif // !CHIP_SYSTEM_CONFIG_USE_LWIP
@@ -89,7 +89,7 @@ bool IPAddress::FromString(const char * str, IPAddress & output)
8989
#if INET_CONFIG_ENABLE_IPV4
9090
if (strchr(str, ':') == nullptr)
9191
{
92-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
92+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
9393
ip4_addr_t ipv4Addr;
9494
if (!ip4addr_aton(str, &ipv4Addr))
9595
return false;
@@ -103,15 +103,15 @@ bool IPAddress::FromString(const char * str, IPAddress & output)
103103
else
104104
#endif // INET_CONFIG_ENABLE_IPV4
105105
{
106-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
106+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
107107
ip6_addr_t ipv6Addr;
108108
if (!ip6addr_aton(str, &ipv6Addr))
109109
return false;
110110
#elif CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
111111
struct in6_addr ipv6Addr;
112112
if (inet_pton(AF_INET6, str, &ipv6Addr) < 1)
113113
return false;
114-
#elif CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
114+
#elif CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
115115
otIp6Address ipv6Addr;
116116
if (OT_ERROR_NONE != otIp6AddressFromString(str, &ipv6Addr))
117117
return false;

‎src/inet/IPAddress.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ bool IPAddress::operator!=(const IPAddress & other) const
5353
return Addr[0] != other.Addr[0] || Addr[1] != other.Addr[1] || Addr[2] != other.Addr[2] || Addr[3] != other.Addr[3];
5454
}
5555

56-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
56+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
5757

5858
IPAddress::IPAddress(const ip6_addr_t & ipv6Addr)
5959
{
@@ -252,7 +252,7 @@ CHIP_ERROR IPAddress::GetIPAddressFromSockAddr(const SockAddrWithoutStorage & so
252252

253253
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
254254

255-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
255+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
256256
IPAddress::IPAddress(const otIp6Address & ipv6Addr)
257257
{
258258
static_assert(sizeof(ipv6Addr.mFields.m32) == sizeof(Addr), "otIp6Address size mismatch");
@@ -273,7 +273,7 @@ IPAddress IPAddress::FromOtAddr(const otIp6Address & address)
273273
memcpy(addr.Addr, address.mFields.m32, sizeof(addr.Addr));
274274
return addr;
275275
}
276-
#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
276+
#endif // CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
277277

278278
// Is address an IPv4 address encoded in IPv6 format?
279279
bool IPAddress::IsIPv4() const

‎src/inet/IPAddress.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
#include "inet/IANAConstants.h"
4444

45-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
45+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
4646
#include <lwip/init.h>
4747
#include <lwip/ip_addr.h>
4848
#if INET_CONFIG_ENABLE_IPV4
@@ -51,10 +51,10 @@
5151
#include <lwip/inet.h>
5252
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
5353

54-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
54+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
5555
#include <openthread/icmp6.h>
5656
#include <openthread/ip6.h>
57-
#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
57+
#endif // CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
5858

5959
#if CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS
6060
#include <net/if.h>
@@ -66,7 +66,7 @@
6666
#include "ZephyrSocket.h" // nogncheck
6767
#endif
6868

69-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT && INET_CONFIG_ENABLE_IPV4
69+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT && INET_CONFIG_ENABLE_IPV4
7070
#error Forbidden : native Open Thread implementation with IPV4 enabled
7171
#endif
7272

@@ -152,14 +152,14 @@ class DLL_EXPORT IPAddress
152152
/**
153153
* Maximum length of the string representation of an IP address, including a terminating NUL.
154154
*/
155-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
155+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
156156
static constexpr uint16_t kMaxStringLength = IP6ADDR_STRLEN_MAX;
157157
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
158158
#if CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
159159
static constexpr uint16_t kMaxStringLength = INET6_ADDRSTRLEN;
160160
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
161161

162-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
162+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
163163
#ifndef INET6_ADDRSTRLEN
164164
#define INET6_ADDRSTRLEN OT_IP6_ADDRESS_STRING_SIZE
165165
#endif
@@ -168,7 +168,7 @@ class DLL_EXPORT IPAddress
168168

169169
IPAddress() = default;
170170

171-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
171+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
172172
explicit IPAddress(const ip6_addr_t & ipv6Addr);
173173
#if INET_CONFIG_ENABLE_IPV4 || LWIP_IPV4
174174
explicit IPAddress(const ip4_addr_t & ipv4Addr);
@@ -183,7 +183,7 @@ class DLL_EXPORT IPAddress
183183
#endif // INET_CONFIG_ENABLE_IPV4
184184
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
185185

186-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
186+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
187187
explicit IPAddress(const otIp6Address & ipv6Addr);
188188
#endif
189189

@@ -520,7 +520,7 @@ class DLL_EXPORT IPAddress
520520
* either unspecified or not an IPv4 address.
521521
*/
522522

523-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
523+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
524524

525525
/**
526526
* @fn ToLwIPAddr() const
@@ -584,10 +584,10 @@ class DLL_EXPORT IPAddress
584584

585585
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_USE_NETWORK_FRAMEWORK
586586

587-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
587+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
588588
otIp6Address ToIPv6() const;
589589
static IPAddress FromOtAddr(const otIp6Address & address);
590-
#endif // CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
590+
#endif // CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
591591

592592
/**
593593
* @brief Construct an IPv6 unique-local address (ULA) from its parts.

‎src/inet/InetInterface.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <lib/support/DLLUtil.h>
3333
#include <lib/support/SafeInt.h>
3434

35-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
35+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
3636
#include <lwip/netif.h>
3737
#include <lwip/sys.h>
3838
#include <lwip/tcpip.h>
@@ -56,7 +56,7 @@
5656
#include <zephyr/net/net_if.h>
5757
#endif // CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
5858

59-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
59+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
6060
#include <inet/UDPEndPointImplOpenThread.h>
6161
#endif
6262

@@ -66,7 +66,7 @@
6666
namespace chip {
6767
namespace Inet {
6868

69-
#if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
69+
#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
7070
CHIP_ERROR InterfaceId::GetInterfaceName(char * nameBuf, size_t nameBufSize) const
7171
{
7272
if (mPlatformInterface && nameBufSize >= kMaxIfNameLength)
@@ -188,7 +188,7 @@ bool InterfaceAddressIterator::HasBroadcastAddress()
188188

189189
#endif
190190

191-
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT
191+
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
192192

193193
CHIP_ERROR InterfaceId::GetInterfaceName(char * nameBuf, size_t nameBufSize) const
194194
{

0 commit comments

Comments
 (0)