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

[mle] check netif is up before processing discover scan (#6919)

Browse Source 
This commit updates `Mle::DiscoverScanner` to check that IPv6
interface is enabled from `Discover()` (returns `kErrorInvalidState`
if netif is not up).
This commit is contained in:
Abtin Keshavarzian
2021-08-12 21:57:11 -07:00
committed by GitHub
parent e8e40229fd
commit b42261f88c
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openthread/instance.h
+1 -1
View File
@@ -53,7 +53,7 @@ extern "C" {
* @note This number versions both OpenThread platform and user APIs.
*
*/
#define OPENTHREAD_API_VERSION (151)
#define OPENTHREAD_API_VERSION (152)
/**
* @addtogroup api-instance
include/openthread/thread.h
+4 -2
View File
@@ -242,8 +242,10 @@ bool otThreadIsSingleton(otInstance *aInstance);
* scan completes.
* @param[in] aCallbackContext A pointer to application-specific context.
*
* @retval OT_ERROR_NONE Accepted the Thread Discovery request.
* @retval OT_ERROR_BUSY Already performing an Thread Discovery.
* @retval OT_ERROR_NONE Successfully started a Thread Discovery Scan.
* @retval OT_ERROR_INVALID_STATE The IPv6 interface is not enabled (netif is not up).
* @retval OT_ERROR_NO_BUFS Could not allocate message for Discovery Request.
* @retval OT_ERROR_BUSY Thread Discovery Scan is already in progress.
*
*/
otError otThreadDiscover(otInstance * aInstance,
src/core/thread/discover_scanner.cpp
+2
View File
@@ -73,6 +73,8 @@ Error DiscoverScanner::Discover(const Mac::ChannelMask &aScanChannels,
MeshCoP::DiscoveryRequestTlv discoveryRequest;
MeshCoP::JoinerAdvertisementTlv joinerAdvertisement;
VerifyOrExit(Get<ThreadNetif>().IsUp(), error = kErrorInvalidState);
VerifyOrExit(mState == kStateIdle, error = kErrorBusy);
mEnableFiltering = aEnableFiltering;
src/core/thread/discover_scanner.hpp
+4 -3
View File
@@ -115,9 +115,10 @@ public:
* @param[in] aHandler A pointer to a function that is called on receiving an MLE Discovery Response.
* @param[in] aContext A pointer to arbitrary context information.
*
* @retval kErrorNone Successfully started a Thread Discovery Scan.
* @retval kErrorNoBufs Could not allocate message for Discovery Request.
* @retval kErrorBusy Thread Discovery Scan is already in progress.
* @retval kErrorNone Successfully started a Thread Discovery Scan.
* @retval kErrorInvalidState The IPv6 interface is not enabled (netif is not up).
* @retval kErrorNoBufs Could not allocate message for Discovery Request.
* @retval kErrorBusy Thread Discovery Scan is already in progress.
*
*/
Error Discover(const Mac::ChannelMask &aScanChannels,
tests/scripts/expect/cli-scan-discover.exp
+2
View File
@@ -78,6 +78,8 @@ expect -re "\\| +$channel \\| +-?\\d+ \\|"
expect_line "Done"
switch_node 3
send "discover\n"
expect "Error 13: InvalidState"
send "ifconfig up\n"
expect_line "Done"
send "discover $channel\n"