espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-22 18:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[border-agent] reuse Dtls restart (#3489)

Browse Source 
`MeshCoP::Dtls` session will restart listening by itself. It's not
necessary for border agent to restart `MeshCoP::Dtls`.
This commit is contained in:
Yakun Xu
2019-01-22 16:11:07 -08:00
committed by Jonathan Hui
parent fe3d910853
commit 26c5d0ecb8
2 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/border_agent.cpp
+9 -36
View File
@@ -641,32 +641,12 @@ void BorderAgent::HandleConnected(bool aConnected)
}
else
{
ThreadNetif & netif = GetNetif();
Coap::CoapSecure &coaps = netif.GetCoapSecure();
otLogInfoMeshCoP("Commissioner disconnected");
netif.GetIp6().GetUdp().RemoveReceiver(mUdpReceiver);
netif.RemoveUnicastAddress(mCommissionerAloc);
coaps.Stop();
GetNetif().RemoveUnicastAddress(mCommissionerAloc);
SetState(OT_BORDER_AGENT_STATE_STARTED);
mTimer.Start(kRestartDelay);
}
}
otError BorderAgent::StartCoaps(void)
{
ThreadNetif & netif = GetNetif();
Coap::CoapSecure &coaps = netif.GetCoapSecure();
otError error;
SuccessOrExit(error = coaps.Start(kBorderAgentUdpPort));
SuccessOrExit(error = coaps.SetPsk(netif.GetKeyManager().GetPSKc(), OT_PSKC_MAX_SIZE));
coaps.SetConnectedCallback(HandleConnected, this);
exit:
return error;
}
otError BorderAgent::Start(void)
{
otError error;
@@ -676,7 +656,9 @@ otError BorderAgent::Start(void)
VerifyOrExit(mState == OT_BORDER_AGENT_STATE_STOPPED, error = OT_ERROR_ALREADY);
SuccessOrExit(error = StartCoaps());
SuccessOrExit(error = coaps.Start(kBorderAgentUdpPort));
SuccessOrExit(error = coaps.SetPsk(netif.GetKeyManager().GetPSKc(), OT_PSKC_MAX_SIZE));
coaps.SetConnectedCallback(HandleConnected, this);
coaps.AddResource(mActiveGet);
coaps.AddResource(mActiveSet);
@@ -706,24 +688,15 @@ void BorderAgent::HandleTimeout(void)
{
ThreadNetif & netif = GetNetif();
Coap::CoapSecure &coaps = netif.GetCoapSecure();
otError error;
if (coaps.IsConnected())
{
error = coaps.Stop();
otLogWarnMeshCoP("Reset commissioner session: %s", otThreadErrorToString(error));
}
else if (!coaps.IsConnectionActive())
{
error = StartCoaps();
otLogWarnMeshCoP("Restart border agent secure CoAP service: %s", otThreadErrorToString(error));
}
else
{
assert(false);
}
otError error;
OT_UNUSED_VARIABLE(error);
error = coaps.Disconnect();
otLogWarnMeshCoP("Reset commissioner session: %s", otThreadErrorToString(error));
OT_UNUSED_VARIABLE(error);
}
}
otError BorderAgent::Stop(void)
src/core/meshcop/border_agent.hpp
+1 -2
View File
@@ -88,8 +88,7 @@ private:
{
static_cast<BorderAgent *>(aContext)->HandleConnected(aConnected);
}
void HandleConnected(bool aConnected);
otError StartCoaps(void);
void HandleConnected(bool aConnected);
template <Coap::Resource BorderAgent::*aResource>
static void HandleRequest(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo)