[dbus] add force option for deactivate API

openthread · Oct 12, 2024 · 76cce5f · 76cce5f
1 parent 3e9be20
commit 76cce5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/dbus/server/dbus_thread_object_rcp.cpp b/src/dbus/server/dbus_thread_object_rcp.cpp
@@ -2009,9 +2009,20 @@ void DBusThreadObjectRcp::DeactivateEphemeralKeyModeHandler(DBusRequest &aReques
 {
  otError error = OT_ERROR_NONE;
  auto threadHelper = mHost.GetThreadHelper();
+ bool force;
+ auto args = std::tie(force);
 
  VerifyOrExit(mBorderAgent.GetEphemeralKeyEnabled(), error = OT_ERROR_NOT_CAPABLE);
 
+ if (DBusMessageToTuple(*aRequest.GetMessage(), args) == OTBR_ERROR_NONE)
+ {
+ if (force)
+ {
+ otBorderAgentDisconnect(threadHelper->GetInstance());
+ ExitNow();
+ }
+ }
+
  switch (otBorderAgentGetState(threadHelper->GetInstance()))
  {
  case OT_BORDER_AGENT_STATE_STOPPED:

diff --git a/src/dbus/server/introspect.xml b/src/dbus/server/introspect.xml
@@ -248,6 +248,7 @@
 
  <!-- DeactivateEphemeralKeyMode: Deactivate ePSKc mode. -->
  <method name="DeactivateEphemeralKeyMode">
+ <arg name="force" type="b" direction="in"/>
  </method>
 
  <!-- MeshLocalPrefix: The /64 mesh-local prefix. -->