Fix a couple of compilation issues:

* Wrap some ephemeral key API calls with `OTBR_ENABLE_EPSKC` * Fix a small nit in `ncp_spinel.cpp` related to a dummy va_list variable being uninitialized. It causes problems with certain architectures and compiler flags, and initializing it using va_start doesn't work since it's not in a variadic function.
SiliconLabs · Jul 24, 2024 · 44f4d62 · 44f4d62
1 parent 2325a35
commit 44f4d62
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/border_agent/border_agent.cpp b/src/border_agent/border_agent.cpp
@@ -69,9 +69,11 @@
 
 namespace otbr {
 
-static const char    kBorderAgentServiceType[]      = "_meshcop._udp";   ///< Border agent service type of mDNS
-static const char    kBorderAgentEpskcServiceType[] = "_meshcop-e._udp"; ///< Border agent ePSKc service
-static constexpr int kBorderAgentServiceDummyPort   = 49152;
+static const char kBorderAgentServiceType[] = "_meshcop._udp"; ///< Border agent service type of mDNS
+#if OTBR_ENABLE_EPSKC
+static const char kBorderAgentEpskcServiceType[] = "_meshcop-e._udp"; ///< Border agent ePSKc service
+#endif
+static constexpr int kBorderAgentServiceDummyPort = 49152;
 
 /**
  * Locators
@@ -226,7 +228,9 @@ void BorderAgent::Start(void)
     mServiceInstanceName = GetServiceInstanceNameWithExtAddr(mBaseServiceInstanceName);
     UpdateMeshCopService();
 
+#if OTBR_ENABLE_EPSKC
     otBorderAgentSetEphemeralKeyCallback(mHost.GetInstance(), BorderAgent::HandleEpskcStateChanged, this);
+#endif
 }
 
 void BorderAgent::Stop(void)
@@ -235,6 +239,7 @@ void BorderAgent::Stop(void)
     UnpublishMeshCopService();
 }
 
+#if OTBR_ENABLE_EPSKC
 void BorderAgent::HandleEpskcStateChanged(void *aContext)
 {
     BorderAgent *borderAgent = static_cast<BorderAgent *>(aContext);
@@ -295,6 +300,7 @@ void BorderAgent::UnpublishEpskcService()
                       kBorderAgentEpskcServiceType);
     });
 }
+#endif
 
 void BorderAgent::HandleMdnsState(Mdns::Publisher::State aState)
 {

diff --git a/src/border_agent/border_agent.hpp b/src/border_agent/border_agent.hpp
@@ -151,9 +151,11 @@ class BorderAgent : private NonCopyable
     std::string GetServiceInstanceNameWithExtAddr(const std::string &aServiceInstanceName) const;
     std::string GetAlternativeServiceInstanceName() const;
 
+#if OTBR_ENABLE_EPSKC
     static void HandleEpskcStateChanged(void *aContext);
     void        PublishEpskcService(void);
     void        UnpublishEpskcService(void);
+#endif
 
     otbr::Ncp::RcpHost &mHost;
     Mdns::Publisher    &mPublisher;

diff --git a/src/ncp/ncp_spinel.cpp b/src/ncp/ncp_spinel.cpp
@@ -69,9 +69,10 @@ void NcpSpinel::GetDeviceRole(GetDeviceRoleHandler aHandler)
 {
     otError      error = OT_ERROR_NONE;
     spinel_tid_t tid   = GetNextTid();
-    va_list      args;
+    va_list      args  = {};
 
     error = mSpinelDriver->SendCommand(SPINEL_CMD_PROP_VALUE_GET, SPINEL_PROP_NET_ROLE, tid, nullptr, args);
+
     if (error != OT_ERROR_NONE)
     {
         FreeTid(tid);