Skip to content

Commit 8049ff6

Browse files
committed
[thread] Remove Thread Joiner functionality from platform layer
Thread Joiner role is not used by Matter so this should not be a part of Thread interface in Matter SDK. It is a leftover from Weave.
1 parent d3e3d97 commit 8049ff6

9 files changed

+0
-107
lines changed

src/include/platform/ThreadStackManager.h

-6
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ class ThreadStackManager
108108
CHIP_ERROR GetExternalIPv6Address(chip::Inet::IPAddress & addr);
109109
CHIP_ERROR GetPollPeriod(uint32_t & buf);
110110

111-
CHIP_ERROR JoinerStart();
112111
CHIP_ERROR SetThreadProvision(ByteSpan aDataset);
113112
CHIP_ERROR SetThreadEnabled(bool val);
114113
CHIP_ERROR AttachToThreadNetwork(const Thread::OperationalDataset & dataset,
@@ -451,11 +450,6 @@ inline CHIP_ERROR ThreadStackManager::GetPollPeriod(uint32_t & buf)
451450
return static_cast<ImplClass *>(this)->_GetPollPeriod(buf);
452451
}
453452

454-
inline CHIP_ERROR ThreadStackManager::JoinerStart()
455-
{
456-
return static_cast<ImplClass *>(this)->_JoinerStart();
457-
}
458-
459453
inline void ThreadStackManager::ResetThreadNetworkDiagnosticsCounts()
460454
{
461455
static_cast<ImplClass *>(this)->_ResetThreadNetworkDiagnosticsCounts();

src/platform/Linux/ThreadStackManagerImpl.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -574,12 +574,6 @@ CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)
574574
return CHIP_ERROR_NOT_IMPLEMENTED;
575575
}
576576

577-
CHIP_ERROR ThreadStackManagerImpl::_JoinerStart()
578-
{
579-
// TODO: Remove Weave legacy APIs
580-
return CHIP_ERROR_NOT_IMPLEMENTED;
581-
}
582-
583577
CHIP_ERROR ThreadStackManagerImpl::GLibMatterContextCallScan(ThreadStackManagerImpl * self)
584578
{
585579
VerifyOrDie(g_main_context_get_thread_default() != nullptr);

src/platform/Linux/ThreadStackManagerImpl.h

-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ class ThreadStackManagerImpl : public ThreadStackManager
117117

118118
CHIP_ERROR _GetPollPeriod(uint32_t & buf);
119119

120-
CHIP_ERROR _JoinerStart();
121-
122120
void _ResetThreadNetworkDiagnosticsCounts();
123121

124122
CHIP_ERROR _StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback);

src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h

-5
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ class GenericThreadStackManagerImpl_OpenThread
145145
bool IsThreadAttachedNoLock(void);
146146
bool IsThreadInterfaceUpNoLock(void);
147147

148-
CHIP_ERROR _JoinerStart(void);
149-
150148
private:
151149
// ===== Private members for use by this class only.
152150

@@ -264,9 +262,6 @@ class GenericThreadStackManagerImpl_OpenThread
264262
#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT
265263
#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
266264

267-
static void OnJoinerComplete(otError aError, void * aContext);
268-
void OnJoinerComplete(otError aError);
269-
270265
inline ImplClass * Impl() { return static_cast<ImplClass *>(this); }
271266
};
272267

src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp

-72
Original file line numberDiff line numberDiff line change
@@ -1199,78 +1199,6 @@ void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_ErasePersistentInfo(v
11991199
Impl()->UnlockThreadStack();
12001200
}
12011201

1202-
template <class ImplClass>
1203-
void GenericThreadStackManagerImpl_OpenThread<ImplClass>::OnJoinerComplete(otError aError, void * aContext)
1204-
{
1205-
static_cast<GenericThreadStackManagerImpl_OpenThread *>(aContext)->OnJoinerComplete(aError);
1206-
}
1207-
1208-
template <class ImplClass>
1209-
void GenericThreadStackManagerImpl_OpenThread<ImplClass>::OnJoinerComplete(otError aError)
1210-
{
1211-
#if CHIP_PROGRESS_LOGGING
1212-
1213-
ChipLogProgress(DeviceLayer, "Join Thread network: %s", otThreadErrorToString(aError));
1214-
1215-
if (aError == OT_ERROR_NONE)
1216-
{
1217-
otError error = otThreadSetEnabled(mOTInst, true);
1218-
1219-
ChipLogProgress(DeviceLayer, "Start Thread network: %s", otThreadErrorToString(error));
1220-
}
1221-
#endif // CHIP_PROGRESS_LOGGING
1222-
}
1223-
1224-
template <class ImplClass>
1225-
CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_JoinerStart(void)
1226-
{
1227-
VerifyOrReturnError(mOTInst, CHIP_ERROR_INCORRECT_STATE);
1228-
CHIP_ERROR error = CHIP_NO_ERROR;
1229-
1230-
Impl()->LockThreadStack();
1231-
VerifyOrExit(!otDatasetIsCommissioned(mOTInst) && otThreadGetDeviceRole(mOTInst) == OT_DEVICE_ROLE_DISABLED,
1232-
error = MapOpenThreadError(OT_ERROR_INVALID_STATE));
1233-
VerifyOrExit(otJoinerGetState(mOTInst) == OT_JOINER_STATE_IDLE, error = MapOpenThreadError(OT_ERROR_BUSY));
1234-
1235-
if (!otIp6IsEnabled(mOTInst))
1236-
{
1237-
SuccessOrExit(error = MapOpenThreadError(otIp6SetEnabled(mOTInst, true)));
1238-
}
1239-
1240-
{
1241-
otJoinerDiscerner discerner;
1242-
// This is dead code to remove, so the placeholder value is OK.
1243-
// See ThreadStackManagerImpl.
1244-
uint16_t discriminator = 3840;
1245-
1246-
discerner.mLength = 12;
1247-
discerner.mValue = discriminator;
1248-
1249-
ChipLogProgress(DeviceLayer, "Joiner Discerner: %u", discriminator);
1250-
otJoinerSetDiscerner(mOTInst, &discerner);
1251-
}
1252-
1253-
{
1254-
otJoinerPskd pskd;
1255-
// This is dead code to remove, so the placeholder value is OK.d
1256-
// See ThreadStackManagerImpl.
1257-
uint32_t pincode = 20202021;
1258-
1259-
snprintf(pskd.m8, sizeof(pskd.m8) - 1, "%09" PRIu32, pincode);
1260-
1261-
ChipLogProgress(DeviceLayer, "Joiner PSKd: %s", pskd.m8);
1262-
error = MapOpenThreadError(otJoinerStart(mOTInst, pskd.m8, NULL, NULL, NULL, NULL, NULL,
1263-
&GenericThreadStackManagerImpl_OpenThread::OnJoinerComplete, this));
1264-
}
1265-
1266-
exit:
1267-
Impl()->UnlockThreadStack();
1268-
1269-
ChipLogProgress(DeviceLayer, "Joiner start: %s", chip::ErrorStr(error));
1270-
1271-
return error;
1272-
}
1273-
12741202
template <class ImplClass>
12751203
void GenericThreadStackManagerImpl_OpenThread<ImplClass>::_UpdateNetworkStatus()
12761204
{

src/platform/Tizen/ThreadStackManagerImpl.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -521,12 +521,6 @@ CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)
521521
return CHIP_ERROR_NOT_IMPLEMENTED;
522522
}
523523

524-
CHIP_ERROR ThreadStackManagerImpl::_JoinerStart()
525-
{
526-
ChipLogError(DeviceLayer, "Not implemented");
527-
return CHIP_ERROR_NOT_IMPLEMENTED;
528-
}
529-
530524
CHIP_ERROR ThreadStackManagerImpl::_StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback)
531525
{
532526
ChipLogError(DeviceLayer, "Not implemented");

src/platform/Tizen/ThreadStackManagerImpl.h

-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ class ThreadStackManagerImpl : public ThreadStackManager
103103

104104
CHIP_ERROR _GetPollPeriod(uint32_t & buf);
105105

106-
CHIP_ERROR _JoinerStart();
107-
108106
void _ResetThreadNetworkDiagnosticsCounts();
109107

110108
CHIP_ERROR _StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback);

src/platform/webos/ThreadStackManagerImpl.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -532,12 +532,6 @@ CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)
532532
return CHIP_ERROR_NOT_IMPLEMENTED;
533533
}
534534

535-
CHIP_ERROR ThreadStackManagerImpl::_JoinerStart()
536-
{
537-
// TODO: Remove Weave legacy APIs
538-
return CHIP_ERROR_NOT_IMPLEMENTED;
539-
}
540-
541535
CHIP_ERROR ThreadStackManagerImpl::_StartThreadScan(ThreadDriver::ScanCallback * callback)
542536
{
543537
// There is another ongoing scan request, reject the new one.

src/platform/webos/ThreadStackManagerImpl.h

-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ class ThreadStackManagerImpl : public ThreadStackManager
105105

106106
CHIP_ERROR _GetPollPeriod(uint32_t & buf);
107107

108-
CHIP_ERROR _JoinerStart();
109-
110108
void _ResetThreadNetworkDiagnosticsCounts();
111109

112110
CHIP_ERROR _StartThreadScan(NetworkCommissioning::ThreadDriver::ScanCallback * callback);

0 commit comments

Comments
 (0)