dnssd plat api

etc/cmake/options.cmake

@@ -98,6 +98,12 @@ if (OTBR_DNSSD_DISCOVERY_PROXY)
  target_compile_definitions(otbr-config INTERFACE OTBR_ENABLE_DNSSD_DISCOVERY_PROXY=1)
 endif()
 
+# When enabled the Advertising Proxy and Discovery proxy will be supported by OpenThread core
+option(OTBR_DNSSD_PLAT "Enable DNS-SD plat APIs for Advertising proxy and Discovery proxy in core" OFF)
+if (OTBR_DNSSD_PLAT)
+ target_compile_definitions(otbr-config INTERFACE OTBR_ENABLE_DNSSD_PLAT=1)
+endif()
+
 option(OTBR_UNSECURE_JOIN "Enable unsecure joining" OFF)
 if(OTBR_UNSECURE_JOIN)
  target_compile_definitions(otbr-config INTERFACE OTBR_ENABLE_UNSECURE_JOIN=1)

script/_otbr

@@ -73,6 +73,8 @@ otbr_install()
  "-DOTBR_DBUS=ON"
  "-DOTBR_DNSSD_DISCOVERY_PROXY=ON"
  "-DOTBR_SRP_ADVERTISING_PROXY=ON"
+ # TODO: Change this later
+ "-DOTBR_DNSSD_PLAT=ON"
  "-DOTBR_INFRA_IF_NAME=${INFRA_IF_NAME}"
  "-DOTBR_MDNS=${OTBR_MDNS:=mDNSResponder}"
  # Force re-evaluation of version strings

src/mdns/CMakeLists.txt

@@ -30,6 +30,7 @@ if(OTBR_MDNS STREQUAL "avahi")
  add_library(otbr-mdns
  mdns.cpp
  mdns_avahi.cpp
+ dnssd_plat.cpp
  )
  target_compile_definitions(otbr-mdns PUBLIC
  OTBR_ENABLE_MDNS_AVAHI=1
@@ -48,6 +49,7 @@ if(OTBR_MDNS STREQUAL "mDNSResponder")
  add_library(otbr-mdns
  mdns.cpp
  mdns_mdnssd.cpp
+ dnssd_plat.cpp
  )
  target_compile_definitions(otbr-mdns PUBLIC
  OTBR_ENABLE_MDNS_MDNSSD=1

src/mdns/dnssd_plat.cpp

@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2023, The OpenThread Authors.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file
+ * This file includes definitions for implementing OpenThread DNS-SD platform APIs.
+ */
+
+#define OTBR_LOG_TAG "DnssdPlat"
+
+#include "mdns/dnssd_plat.hpp"
+
+#include <openthread/platform/toolchain.h>
+
+#include "common/code_utils.hpp"
+#include "utils/dns_utils.hpp"
+
+namespace otbr {
+
+#if OTBR_ENABLE_DNSSD_PLAT
+
+extern "C" otPlatDnssdState otPlatDnssdGetState(otInstance *aInstance)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+
+ return OT_PLAT_DNSSD_STOPPED;
+}
+
+extern "C" void otPlatDnssdRegisterService(otInstance *aInstance,
+ const otPlatDnssdService *aService,
+ otPlatDnssdRequestId aRequestId,
+ otPlatDnssdRegisterCallback aCallback)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aService);
+ OT_UNUSED_VARIABLE(aRequestId);
+ OT_UNUSED_VARIABLE(aCallback);
+}
+
+extern "C" void otPlatDnssdUnregisterService(otInstance *aInstance,
+ const otPlatDnssdService *aService,
+ otPlatDnssdRequestId aRequestId,
+ otPlatDnssdRegisterCallback aCallback)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aService);
+ OT_UNUSED_VARIABLE(aRequestId);
+ OT_UNUSED_VARIABLE(aCallback);
+}
+
+extern "C" void otPlatDnssdRegisterHost(otInstance *aInstance,
+ const otPlatDnssdHost *aHost,
+ otPlatDnssdRequestId aRequestId,
+ otPlatDnssdRegisterCallback aCallback)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aHost);
+ OT_UNUSED_VARIABLE(aRequestId);
+ OT_UNUSED_VARIABLE(aCallback);
+}
+
+extern "C" void otPlatDnssdUnregisterHost(otInstance *aInstance,
+ const otPlatDnssdHost *aHost,
+ otPlatDnssdRequestId aRequestId,
+ otPlatDnssdRegisterCallback aCallback)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aHost);
+ OT_UNUSED_VARIABLE(aRequestId);
+ OT_UNUSED_VARIABLE(aCallback);
+}
+
+extern "C" void otPlatDnssdRegisterKey(otInstance *aInstance,
+ const otPlatDnssdKey *aKey,
+ otPlatDnssdRequestId aRequestId,
+ otPlatDnssdRegisterCallback aCallback)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aKey);
+ OT_UNUSED_VARIABLE(aRequestId);
+ OT_UNUSED_VARIABLE(aCallback);
+}
+
+extern "C" void otPlatDnssdUnregisterKey(otInstance *aInstance,
+ const otPlatDnssdKey *aKey,
+ otPlatDnssdRequestId aRequestId,
+ otPlatDnssdRegisterCallback aCallback)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aKey);
+ OT_UNUSED_VARIABLE(aRequestId);
+ OT_UNUSED_VARIABLE(aCallback);
+}
+
+extern "C" void otPlatDnssdStartServiceBrowser(otInstance *aInstance, const char *aServiceType, uint32_t aInfraIfIndex)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aServiceType);
+ OT_UNUSED_VARIABLE(aInfraIfIndex);
+}
+
+extern "C" void otPlatDnssdStopServiceBrowser(otInstance *aInstance, const char *aServiceType, uint32_t aInfraIfIndex)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aServiceType);
+ OT_UNUSED_VARIABLE(aInfraIfIndex);
+}
+
+extern "C" void otPlatDnssdStartServiceResolver(otInstance *aInstance, const otPlatDnssdServiceInstance *aServiceInstance)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aServiceInstance);
+}
+
+extern "C" void otPlatDnssdStopServiceResolver(otInstance *aInstance, const otPlatDnssdServiceInstance *aServiceInstance)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aServiceInstance);
+}
+
+extern "C" void otPlatDnssdStartIp6AddressResolver(otInstance *aInstance, const char *aHostName, uint32_t aInfraIfIndex)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aHostName);
+ OT_UNUSED_VARIABLE(aInfraIfIndex);
+}
+
+extern "C" void otPlatDnssdStopIp6AddressResolver(otInstance *aInstance, const char *aHostName, uint32_t aInfraIfIndex)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aHostName);
+ OT_UNUSED_VARIABLE(aInfraIfIndex);
+}
+
+extern "C" void otPlatDnssdStartIp4AddressResolver(otInstance *aInstance, const char *aHostName, uint32_t aInfraIfIndex)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aHostName);
+ OT_UNUSED_VARIABLE(aInfraIfIndex);
+}
+
+extern "C" void otPlatDnssdStopIp4AddressResolver(otInstance *aInstance, const char *aHostName, uint32_t aInfraIfIndex)
+{
+ OT_UNUSED_VARIABLE(aInstance);
+ OT_UNUSED_VARIABLE(aHostName);
+ OT_UNUSED_VARIABLE(aInfraIfIndex);
+}
+
+#endif // OTBR_ENABLE_DNSSD_PLAT
+
+
+} // namespace otbr

src/mdns/dnssd_plat.hpp

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023, The OpenThread Authors.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file
+ * This file includes definitions for implementing OpenThread DNS-SD platform APIs.
+ */
+
+#ifndef OTBR_AGENT_DNSSD_PLAT_HPP_
+#define OTBR_AGENT_DNSSD_PLAT_HPP_
+
+#include "openthread-br/config.h"
+
+#include <openthread/platform/dnssd.h>
+
+#include "common/types.hpp"
+
+namespace otbr {
+
+
+} // namespace otbr
+
+#endif // OTBR_AGENT_DNSSD_PLAT_HPP_

third_party/openthread/CMakeLists.txt

@@ -46,7 +46,6 @@ set(OT_DAEMON ON CACHE STRING "enable daemon mode" FORCE)
 set(OT_DATASET_UPDATER ON CACHE STRING "enable dataset updater" FORCE)
 set(OT_DNS_CLIENT ON CACHE STRING "enable DNS client" FORCE)
 set(OT_DNS_UPSTREAM_QUERY ${OTBR_DNS_UPSTREAM_QUERY} CACHE STRING "enable sending DNS queries to upstream" FORCE)
-set(OT_DNSSD_SERVER ${OTBR_DNSSD_DISCOVERY_PROXY} CACHE STRING "enable DNS-SD server support" FORCE)
 set(OT_ECDSA ON CACHE STRING "enable ECDSA" FORCE)
 set(OT_FIREWALL ON CACHE STRING "enable firewall feature")
 set(OT_HISTORY_TRACKER ON CACHE STRING "enable history tracker" FORCE)
@@ -69,11 +68,21 @@ set(OT_TREL ${OTBR_TREL} CACHE STRING "enable TREL" FORCE)
 set(OT_UDP_FORWARD OFF CACHE STRING "disable udp forward" FORCE)
 set(OT_UPTIME ON CACHE STRING "enable uptime" FORCE)
 
-if (OTBR_SRP_ADVERTISING_PROXY)
+if (OTBR_DNSSD_PLAT)
  set(OT_SRP_SERVER ON CACHE STRING "enable SRP server" FORCE)
  set(OT_EXTERNAL_HEAP ON CACHE STRING "enable external heap" FORCE)
+ set(OT_SRP_ADV_PROXY ON CACHE STRING "enable SRP adv proxy" FORCE)
+ set(OT_DNSSD_SERVER ON CACHE STRING "enable DNS-SD server support" FORCE)
+ # TODO: Add for Discovery proxy later
+else ()
+ if (OTBR_SRP_ADVERTISING_PROXY)
+ set(OT_SRP_SERVER ON CACHE STRING "enable SRP server" FORCE)
+ set(OT_EXTERNAL_HEAP ON CACHE STRING "enable external heap" FORCE)
+ endif()
+ set(OT_DNSSD_SERVER ${OTBR_DNSSD_DISCOVERY_PROXY} CACHE STRING "enable DNS-SD server support" FORCE)
 endif()
 
+
 if (NOT OT_THREAD_VERSION STREQUAL "1.1")
  if (OT_REFERENCE_DEVICE)
  set(OT_DUA ON CACHE STRING "Enable Thread 1.2 DUA for reference devices")