diff options
| author | Jonathan Hui <jonhui@google.com> | 2021-06-07 16:52:39 -0700 |
|---|---|---|
| committer | Jonathan Hui <jonhui@google.com> | 2021-06-07 20:27:08 -0700 |
| commit | e4c8f08e56bbfaa1769f090711ff6c3c83b158fe (patch) | |
| tree | f868671316cad6c6a358472030799379d27013ff /src | |
| parent | 55c409a31694013a9adfda3b96da060f7bccb489 (diff) | |
| download | ot-br-posix-e4c8f08e56bbfaa1769f090711ff6c3c83b158fe.tar.gz | |
[web-service] include PSKc as part of dataset (not separate cmd) (#881)
Diffstat (limited to 'src')
| -rw-r--r-- | src/web/web-service/wpan_service.cpp | 6 | ||||
| -rw-r--r-- | src/web/web-service/wpan_service.hpp | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/web/web-service/wpan_service.cpp b/src/web/web-service/wpan_service.cpp index 06228e5b..74631f21 100644 --- a/src/web/web-service/wpan_service.cpp +++ b/src/web/web-service/wpan_service.cpp @@ -142,8 +142,8 @@ std::string WpanService::HandleFormNetworkRequest(const std::string &aFormReques } VerifyOrExit(client.FactoryReset(), ret = kWpanStatus_LeaveFailed); - VerifyOrExit((ret = formActiveDataset(client, masterKey, networkName, channel, extPanId, panId)) == kWpanStatus_Ok); - VerifyOrExit(client.Execute("pskc %s", pskcStr) != nullptr, ret = kWpanStatus_SetFailed); + VerifyOrExit((ret = formActiveDataset(client, masterKey, networkName, pskcStr, channel, extPanId, panId)) == + kWpanStatus_Ok); VerifyOrExit(client.Execute("ifconfig up") != nullptr, ret = kWpanStatus_FormFailed); VerifyOrExit(client.Execute("thread start") != nullptr, ret = kWpanStatus_FormFailed); VerifyOrExit(client.Execute("prefix add %s paso%s", prefix.c_str(), (defaultRoute ? "r" : "")) != nullptr, @@ -533,6 +533,7 @@ exit: int WpanService::formActiveDataset(otbr::Web::OpenThreadClient &aClient, const std::string & aMasterKey, const std::string & aNetworkName, + const std::string & aPskc, uint16_t aChannel, uint64_t aExtPanId, uint16_t aPanId) @@ -543,6 +544,7 @@ int WpanService::formActiveDataset(otbr::Web::OpenThreadClient &aClient, VerifyOrExit(aClient.Execute("dataset masterkey %s", aMasterKey.c_str()) != nullptr, ret = kWpanStatus_SetFailed); VerifyOrExit(aClient.Execute("dataset networkname %s", escapeOtCliEscapable(aNetworkName).c_str()) != nullptr, ret = kWpanStatus_SetFailed); + VerifyOrExit(aClient.Execute("dataset pskc %s", aPskc.c_str()) != nullptr, ret = kWpanStatus_SetFailed); VerifyOrExit(aClient.Execute("dataset channel %u", aChannel) != nullptr, ret = kWpanStatus_SetFailed); VerifyOrExit(aClient.Execute("dataset extpanid %016" PRIx64, aExtPanId) != nullptr, ret = kWpanStatus_SetFailed); VerifyOrExit(aClient.Execute("dataset panid %u", aPanId) != nullptr, ret = kWpanStatus_SetFailed); diff --git a/src/web/web-service/wpan_service.hpp b/src/web/web-service/wpan_service.hpp index 43e6e7cb..87cbb187 100644 --- a/src/web/web-service/wpan_service.hpp +++ b/src/web/web-service/wpan_service.hpp @@ -177,6 +177,7 @@ private: int formActiveDataset(otbr::Web::OpenThreadClient &aClient, const std::string & aMasterKey, const std::string & aNetworkName, + const std::string & aPskc, uint16_t aChannel, uint64_t aExtPanId, uint16_t aPanId); |