diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp index 88692049c3a8ee..ef3e0e89dffd99 100644 --- a/src/app/server/Server.cpp +++ b/src/app/server/Server.cpp @@ -139,9 +139,7 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint err = mFabrics.Init(&mDeviceStorage); SuccessOrExit(err); -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD app::DnssdServer::Instance().SetFabricTable(&mFabrics); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD // Group data provider must be initialized after mDeviceStorage err = mGroupsProvider.Init(); @@ -237,15 +235,13 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint #endif } -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD app::DnssdServer::Instance().SetSecuredPort(mSecuredServicePort); app::DnssdServer::Instance().SetUnsecuredPort(mUnsecuredServicePort); app::DnssdServer::Instance().SetInterfaceId(mInterfaceId); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD // TODO @bzbarsky-apple @cecille Move to examples // ESP32 and Mbed OS examples have a custom logic for enabling DNS-SD -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !CHIP_DEVICE_LAYER_TARGET_ESP32 && !CHIP_DEVICE_LAYER_TARGET_MBED && \ +#if !CHIP_DEVICE_LAYER_TARGET_ESP32 && !CHIP_DEVICE_LAYER_TARGET_MBED && \ (!CHIP_DEVICE_LAYER_TARGET_AMEBA || !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE) // StartServer only enables commissioning mode if device has not been commissioned app::DnssdServer::Instance().StartServer(); diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp index 4ba5616572f71f..d07ead483e2eee 100644 --- a/src/controller/AutoCommissioner.cpp +++ b/src/controller/AutoCommissioner.cpp @@ -157,12 +157,7 @@ CommissioningStage AutoCommissioner::GetNextCommissioningStage(CommissioningStag } else { - // TODO: I dont think this is to spec - not sure where we'd have a commissioner that doesn't have dnssd. -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD return CommissioningStage::kFindOperational; -#else - return CommissioningStage::kSendComplete; -#endif } case CommissioningStage::kWiFiNetworkSetup: if (mParams.GetThreadOperationalDataset().HasValue() && mDeviceCommissioningInfo.network.thread != kInvalidEndpointId) @@ -193,12 +188,7 @@ CommissioningStage AutoCommissioner::GetNextCommissioningStage(CommissioningStag return CommissioningStage::kFindOperational; } case CommissioningStage::kThreadNetworkEnable: - // TODO: I dont think this is to spec - not sure where we'd have a commissioner that doesn't have dnssd. -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD return CommissioningStage::kFindOperational; -#else - return CommissioningStage::kSendComplete; -#endif case CommissioningStage::kFindOperational: return CommissioningStage::kSendComplete; case CommissioningStage::kSendComplete: diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index c7db1e3a4cd035..835798af802643 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -126,13 +126,11 @@ CHIP_ERROR DeviceController::Init(ControllerInitParams params) VerifyOrReturnError(params.systemState->TransportMgr() != nullptr, CHIP_ERROR_INVALID_ARGUMENT); -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD ReturnErrorOnFailure(mDNSResolver.Init(params.systemState->UDPEndPointManager())); mDNSResolver.SetOperationalDelegate(this); mDNSResolver.SetCommissioningDelegate(this); RegisterDeviceAddressUpdateDelegate(params.deviceAddressUpdateDelegate); RegisterDeviceDiscoveryDelegate(params.deviceDiscoveryDelegate); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD VerifyOrReturnError(params.operationalCredentialsDelegate != nullptr, CHIP_ERROR_INVALID_ARGUMENT); mOperationalCredentialsDelegate = params.operationalCredentialsDelegate; @@ -165,11 +163,7 @@ CHIP_ERROR DeviceController::Init(ControllerInitParams params) .sessionInitParams = deviceInitParams, .dnsCache = &mDNSCache, .devicePool = &mDevicePool, -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - .dnsResolver = &mDNSResolver, -#else - .dnsResolver = nullptr, -#endif + .dnsResolver = &mDNSResolver, }; mCASESessionManager = chip::Platform::New(sessionManagerConfig); @@ -255,11 +249,9 @@ CHIP_ERROR DeviceController::Shutdown() mSystemState->Release(); mSystemState = nullptr; -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD mDNSResolver.Shutdown(); mDeviceAddressUpdateDelegate = nullptr; mDeviceDiscoveryDelegate = nullptr; -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD chip::Platform::Delete(mCASESessionManager); mCASESessionManager = nullptr; @@ -554,8 +546,6 @@ CHIP_ERROR DeviceController::OpenCommissioningWindowInternal() return CHIP_NO_ERROR; } -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - void DeviceController::OnOperationalNodeResolved(const chip::Dnssd::ResolvedNodeData & nodeData) { VerifyOrReturn(mState == State::Initialized, @@ -565,7 +555,7 @@ void DeviceController::OnOperationalNodeResolved(const chip::Dnssd::ResolvedNode { mDeviceAddressUpdateDelegate->OnAddressUpdateComplete(nodeData.mPeerId.GetNodeId(), CHIP_NO_ERROR); } -}; +} void DeviceController::OnOperationalNodeResolutionFailed(const chip::PeerId & peer, CHIP_ERROR error) { @@ -578,9 +568,7 @@ void DeviceController::OnOperationalNodeResolutionFailed(const chip::PeerId & pe { mDeviceAddressUpdateDelegate->OnAddressUpdateComplete(peer.GetNodeId(), error); } -}; - -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD +} ControllerDeviceInitParams DeviceController::GetControllerDeviceInitParams() { @@ -1355,7 +1343,6 @@ void DeviceCommissioner::OnSessionEstablishmentTimeoutCallback(System::Layer * a static_cast(aAppState)->OnSessionEstablishmentTimeout(); } -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD CHIP_ERROR DeviceCommissioner::DiscoverCommissionableNodes(Dnssd::DiscoveryFilter filter) { ReturnErrorOnFailure(SetUpNodeDiscovery()); @@ -1367,8 +1354,6 @@ const Dnssd::DiscoveredNodeData * DeviceCommissioner::GetDiscoveredDevice(int id return GetDiscoveredNode(idx); } -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD - #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY // make this commissioner discoverable CHIP_ERROR DeviceCommissioner::SetUdcListenPort(uint16_t listenPort) @@ -1390,8 +1375,6 @@ void DeviceCommissioner::FindCommissionableNode(char * instanceName) #endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - void DeviceCommissioner::OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData) { #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY @@ -1403,7 +1386,6 @@ void DeviceCommissioner::OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData AbstractDnssdDiscoveryController::OnNodeDiscovered(nodeData); mSetUpCodePairer.NotifyCommissionableDeviceDiscovered(nodeData); } -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD void OnBasicFailure(void * context, CHIP_ERROR error) { @@ -1431,7 +1413,6 @@ void DeviceCommissioner::CommissioningStageComplete(CHIP_ERROR err, Commissionin } } -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD void DeviceCommissioner::OnOperationalNodeResolved(const chip::Dnssd::ResolvedNodeData & nodeData) { ChipLogProgress(Controller, "OperationalDiscoveryComplete for device ID 0x" ChipLogFormatX64, @@ -1457,8 +1438,6 @@ void DeviceCommissioner::OnOperationalNodeResolutionFailed(const chip::PeerId & DeviceController::OnOperationalNodeResolutionFailed(peer, error); } -#endif - void DeviceCommissioner::OnDeviceConnectedFn(void * context, OperationalDeviceProxy * device) { // CASE session established. diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index 63a04bf9635348..50a7329f2e143b 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -70,12 +70,10 @@ #if CONFIG_NETWORK_LAYER_BLE #include #endif -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD #include #include #include #include -#endif namespace chip { @@ -91,12 +89,10 @@ void OnBasicFailure(void * context, CHIP_ERROR err); struct ControllerInitParams { - PersistentStorageDelegate * storageDelegate = nullptr; - DeviceControllerSystemState * systemState = nullptr; -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - DeviceAddressUpdateDelegate * deviceAddressUpdateDelegate = nullptr; - DeviceDiscoveryDelegate * deviceDiscoveryDelegate = nullptr; -#endif + PersistentStorageDelegate * storageDelegate = nullptr; + DeviceControllerSystemState * systemState = nullptr; + DeviceAddressUpdateDelegate * deviceAddressUpdateDelegate = nullptr; + DeviceDiscoveryDelegate * deviceDiscoveryDelegate = nullptr; OperationalCredentialsDelegate * operationalCredentialsDelegate = nullptr; /* The following keypair must correspond to the public key used for generating @@ -176,12 +172,9 @@ typedef void (*OnOpenCommissioningWindow)(void * context, NodeId deviceId, CHIP_ * and device pairing information for individual devices). Alternatively, this class can retrieve the * relevant information when the application tries to communicate with the device */ -class DLL_EXPORT DeviceController : public SessionRecoveryDelegate -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - , +class DLL_EXPORT DeviceController : public SessionRecoveryDelegate, public AbstractDnssdDiscoveryController, public Dnssd::OperationalResolveDelegate -#endif { public: DeviceController(); @@ -315,10 +308,8 @@ class DLL_EXPORT DeviceController : public SessionRecoveryDelegate Callback::Callback * callback, bool readVIDPIDAttributes = false); -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD void RegisterDeviceAddressUpdateDelegate(DeviceAddressUpdateDelegate * delegate) { mDeviceAddressUpdateDelegate = delegate; } void RegisterDeviceDiscoveryDelegate(DeviceDiscoveryDelegate * delegate) { mDeviceDiscoveryDelegate = delegate; } -#endif /** * @brief Get the Compressed Fabric ID assigned to the device. @@ -361,13 +352,11 @@ class DLL_EXPORT DeviceController : public SessionRecoveryDelegate FabricId mFabricId = kUndefinedFabricId; FabricInfo * mFabricInfo = nullptr; - PersistentStorageDelegate * mStorageDelegate = nullptr; -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD + PersistentStorageDelegate * mStorageDelegate = nullptr; DeviceAddressUpdateDelegate * mDeviceAddressUpdateDelegate = nullptr; // TODO(cecille): Make this configuarable. static constexpr int kMaxCommissionableNodes = 10; Dnssd::DiscoveredNodeData mCommissionableNodes[kMaxCommissionableNodes]; -#endif DeviceControllerSystemState * mSystemState = nullptr; CHIP_ERROR InitializePairedDeviceList(); @@ -383,12 +372,10 @@ class DLL_EXPORT DeviceController : public SessionRecoveryDelegate //////////// SessionRecoveryDelegate Implementation /////////////// void OnFirstMessageDeliveryFailed(const SessionHandle & session) override; -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD //////////// OperationalResolveDelegate Implementation /////////////// void OnOperationalNodeResolved(const chip::Dnssd::ResolvedNodeData & nodeData) override; void OnOperationalNodeResolutionFailed(const chip::PeerId & peerId, CHIP_ERROR error) override; DiscoveredNodeList GetDiscoveredNodes() override { return DiscoveredNodeList(mCommissionableNodes); } -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD private: void ReleaseOperationalDevice(OperationalDeviceProxy * device); @@ -605,7 +592,6 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController, */ CHIP_ERROR CloseBleConnection(); #endif -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD /** * @brief * Discover all devices advertising as commissionable. @@ -632,7 +618,7 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController, void OnOperationalNodeResolved(const chip::Dnssd::ResolvedNodeData & nodeData) override; void OnOperationalNodeResolutionFailed(const chip::PeerId & peerId, CHIP_ERROR error) override; -#endif + #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY // make this commissioner discoverable /** * @brief @@ -653,7 +639,6 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController, UserDirectedCommissioningServer * GetUserDirectedCommissioningServer() { return mUdcServer; } #endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD /** * @brief * Overrides method from AbstractDnssdDiscoveryController @@ -662,7 +647,6 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController, * */ void OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData) override; -#endif void RegisterPairingDelegate(DevicePairingDelegate * pairingDelegate) { mPairingDelegate = pairingDelegate; } diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp index be6579a576673c..3f6683a4fa2945 100644 --- a/src/controller/CHIPDeviceControllerFactory.cpp +++ b/src/controller/CHIPDeviceControllerFactory.cpp @@ -156,9 +156,7 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params) ReturnErrorOnFailure(chip::app::InteractionModelEngine::GetInstance()->Init(stateParams.exchangeMgr)); -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD ReturnErrorOnFailure(Dnssd::Resolver::Instance().Init(stateParams.udpEndPointManager)); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD if (params.enableServerInteractions) { @@ -205,9 +203,7 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params) void DeviceControllerFactory::PopulateInitParams(ControllerInitParams & controllerParams, const SetupParams & params) { -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - controllerParams.deviceAddressUpdateDelegate = params.deviceAddressUpdateDelegate; -#endif + controllerParams.deviceAddressUpdateDelegate = params.deviceAddressUpdateDelegate; controllerParams.operationalCredentialsDelegate = params.operationalCredentialsDelegate; controllerParams.operationalKeypair = params.operationalKeypair; controllerParams.controllerNOC = params.controllerNOC; @@ -287,9 +283,7 @@ CHIP_ERROR DeviceControllerSystemState::Shutdown() mCASEServer = nullptr; } -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD Dnssd::Resolver::Instance().Shutdown(); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD // Shut down the interaction model app::InteractionModelEngine::GetInstance()->Shutdown(); diff --git a/src/controller/CHIPDeviceControllerFactory.h b/src/controller/CHIPDeviceControllerFactory.h index e67d4fc78a694e..c33cf3af9fa4c0 100644 --- a/src/controller/CHIPDeviceControllerFactory.h +++ b/src/controller/CHIPDeviceControllerFactory.h @@ -39,9 +39,7 @@ namespace Controller { struct SetupParams { -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - DeviceAddressUpdateDelegate * deviceAddressUpdateDelegate = nullptr; -#endif + DeviceAddressUpdateDelegate * deviceAddressUpdateDelegate = nullptr; OperationalCredentialsDelegate * operationalCredentialsDelegate = nullptr; PersistentStorageDelegate * storageDelegate = nullptr; diff --git a/src/controller/SetUpCodePairer.cpp b/src/controller/SetUpCodePairer.cpp index 6817d2181bf801..97ce93ea4e920a 100644 --- a/src/controller/SetUpCodePairer.cpp +++ b/src/controller/SetUpCodePairer.cpp @@ -105,22 +105,16 @@ CHIP_ERROR SetUpCodePairer::StopConnectOverBle() CHIP_ERROR SetUpCodePairer::StartDiscoverOverIP(SetupPayload & payload) { -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD currentFilter.type = payload.isShortDiscriminator ? Dnssd::DiscoveryFilterType::kShortDiscriminator : Dnssd::DiscoveryFilterType::kLongDiscriminator; currentFilter.code = payload.isShortDiscriminator ? static_cast((payload.discriminator >> 8) & 0x0F) : payload.discriminator; return mCommissioner->DiscoverCommissionableNodes(currentFilter); -#else - return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE; -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD } CHIP_ERROR SetUpCodePairer::StopConnectOverIP() { -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD currentFilter.type = Dnssd::DiscoveryFilterType::kNone; -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD return CHIP_NO_ERROR; } @@ -163,8 +157,6 @@ void SetUpCodePairer::OnDiscoveredDeviceOverBleError(void * appState, CHIP_ERROR } #endif // CONFIG_NETWORK_LAYER_BLE -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD - bool SetUpCodePairer::NodeMatchesCurrentFilter(const Dnssd::DiscoveredNodeData & nodeData) { if (nodeData.commissioningMode == 0) @@ -199,7 +191,6 @@ void SetUpCodePairer::NotifyCommissionableDeviceDiscovered(const Dnssd::Discover RendezvousParameters params = RendezvousParameters().SetPeerAddress(peerAddress); OnDeviceDiscovered(params); } -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD } // namespace Controller } // namespace chip diff --git a/src/controller/SetUpCodePairer.h b/src/controller/SetUpCodePairer.h index 0ecd41c96b0597..e79440c3c026c9 100644 --- a/src/controller/SetUpCodePairer.h +++ b/src/controller/SetUpCodePairer.h @@ -38,9 +38,7 @@ #include #endif // CONFIG_NETWORK_BLE -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD #include -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD namespace chip { namespace Controller { @@ -55,10 +53,8 @@ class DLL_EXPORT SetUpCodePairer CHIP_ERROR PairDevice(chip::NodeId remoteId, const char * setUpCode); -// Called by the DeviceCommissioner to notify that we have discovered a new device. -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD + // Called by the DeviceCommissioner to notify that we have discovered a new device. void NotifyCommissionableDeviceDiscovered(const chip::Dnssd::DiscoveredNodeData & nodeData); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD #if CONFIG_NETWORK_LAYER_BLE void SetBleLayer(Ble::BleLayer * bleLayer) { mBleLayer = bleLayer; }; @@ -83,10 +79,8 @@ class DLL_EXPORT SetUpCodePairer static void OnDiscoveredDeviceOverBleError(void * appState, CHIP_ERROR err); #endif // CONFIG_NETWORK_LAYER_BLE -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD bool NodeMatchesCurrentFilter(const Dnssd::DiscoveredNodeData & nodeData); Dnssd::DiscoveryFilter currentFilter; -#endif DeviceCommissioner * mCommissioner = nullptr; chip::NodeId mRemoteId; diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h index 569230ed7f437a..921c042e74203b 100644 --- a/src/include/platform/CHIPDeviceConfig.h +++ b/src/include/platform/CHIPDeviceConfig.h @@ -1162,15 +1162,6 @@ // -------------------- Device DNS-SD Configuration -------------------- -/** - * CHIP_DEVICE_CONFIG_ENABLE_DNSSD - * - * Enable support to use DNS-SD for service advertising and discovery in CHIP. - */ -#ifndef CHIP_DEVICE_CONFIG_ENABLE_DNSSD -#define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 0 -#endif - /** * CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DISCOVERY * diff --git a/src/lib/shell/Engine.cpp b/src/lib/shell/Engine.cpp index 10bb2dcfa6723a..4f3bd45ffa9220 100644 --- a/src/lib/shell/Engine.cpp +++ b/src/lib/shell/Engine.cpp @@ -121,9 +121,7 @@ void Engine::RegisterDefaultCommands() #if CHIP_DEVICE_CONFIG_ENABLE_NFC RegisterNFCCommands(); #endif -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD RegisterDnsCommands(); -#endif #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR RegisterOtaCommands(); #endif diff --git a/src/lib/shell/commands/BUILD.gn b/src/lib/shell/commands/BUILD.gn index 3ae6b5b7626650..a635c3ac88cdd2 100644 --- a/src/lib/shell/commands/BUILD.gn +++ b/src/lib/shell/commands/BUILD.gn @@ -47,7 +47,7 @@ source_set("commands") { sources += [ "NFC.cpp" ] } - if (chip_mdns != "none" && chip_device_platform != "none") { + if (chip_device_platform != "none") { sources += [ "Dns.cpp" ] } diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn index 5ff75d52580573..216684aae28606 100644 --- a/src/platform/BUILD.gn +++ b/src/platform/BUILD.gn @@ -93,7 +93,6 @@ if (chip_device_platform != "none") { chip_with_gio = chip_enable_wifi chip_device_config_enable_wpa = chip_enable_wifi - chip_device_config_enable_dnssd = chip_mdns != "none" chip_stack_lock_tracking_log = chip_stack_lock_tracking != "none" chip_stack_lock_tracking_fatal = chip_stack_lock_tracking == "fatal" defines = [ @@ -102,7 +101,6 @@ if (chip_device_platform != "none") { "CHIP_DEVICE_CONFIG_THREAD_FTD=${chip_device_config_thread_ftd}", "CHIP_WITH_GIO=${chip_with_gio}", "OPENTHREAD_CONFIG_ENABLE_TOBLE=false", - "CHIP_DEVICE_CONFIG_ENABLE_DNSSD=${chip_device_config_enable_dnssd}", "CHIP_BYPASS_RENDEZVOUS=${chip_bypass_rendezvous}", "CHIP_STACK_LOCK_TRACKING_ENABLED=${chip_stack_lock_tracking_log}", "CHIP_STACK_LOCK_TRACKING_ERROR_FATAL=${chip_stack_lock_tracking_fatal}", @@ -245,11 +243,7 @@ if (chip_device_platform != "none") { ] if (current_os == "android") { - chip_device_config_enable_dnssd = chip_mdns != "none" - defines += [ - "CHIP_DEVICE_CONFIG_ENABLE_DNSSD=${chip_device_config_enable_dnssd}", - "EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER=\"controller/java/AndroidKeyValueStoreManagerImpl.h\"", - ] + defines += [ "EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER=\"controller/java/AndroidKeyValueStoreManagerImpl.h\"" ] } } } diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h index 068cf490579218..acdbf0c7bff8ac 100644 --- a/src/platform/EFR32/CHIPDevicePlatformConfig.h +++ b/src/platform/EFR32/CHIPDevicePlatformConfig.h @@ -41,7 +41,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 1 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_COMMISSIONABLE_DISCOVERY 1 -#define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 1 #endif /* CHIP_ENABLE_OPENTHREAD */ #endif /* defined(SL_WIFI) */ diff --git a/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h b/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h index ed7532d5ca1ea2..cae88c46eb1559 100644 --- a/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h +++ b/src/platform/cc13x2_26x2/CHIPDevicePlatformConfig.h @@ -53,7 +53,6 @@ #define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0 #define CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART 0 -#define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 1 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1 #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DISCOVERY 1 diff --git a/src/platform/mbed/CHIPDevicePlatformConfig.h b/src/platform/mbed/CHIPDevicePlatformConfig.h index 8f47d0c2c6bf6b..cc88b4d081cef1 100644 --- a/src/platform/mbed/CHIPDevicePlatformConfig.h +++ b/src/platform/mbed/CHIPDevicePlatformConfig.h @@ -53,8 +53,6 @@ #define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0 -#define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 1 - #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 8192 #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h index ccfb9244a9232a..047de04dfba017 100644 --- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h +++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h @@ -93,7 +93,6 @@ #endif // CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART #ifdef CONFIG_CHIP_ENABLE_DNSSD_SRP -#define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 1 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1 #define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES (CHIP_CONFIG_MAX_FABRICS + 1) #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h index 8bbfc047b3edb6..600b065f7f3e03 100644 --- a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h +++ b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h @@ -96,7 +96,6 @@ #if CHIP_ENABLE_OPENTHREAD #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 1 -#define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 1 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 1 #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 diff --git a/src/platform/qpg/CHIPDevicePlatformConfig.h b/src/platform/qpg/CHIPDevicePlatformConfig.h index 74be4b6bb2ff32..a4342e49f33d77 100644 --- a/src/platform/qpg/CHIPDevicePlatformConfig.h +++ b/src/platform/qpg/CHIPDevicePlatformConfig.h @@ -45,8 +45,6 @@ #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_GLOBAL_EIDC_KEY 2 -#define CHIP_DEVICE_CONFIG_ENABLE_DNSSD 1 - // ========== Platform-specific Configuration ========= // These are configuration options that are unique to the platform. diff --git a/src/system/SystemLayerImplLibevent.cpp b/src/system/SystemLayerImplLibevent.cpp index dc9f03184e160f..b8dcda3527ae26 100644 --- a/src/system/SystemLayerImplLibevent.cpp +++ b/src/system/SystemLayerImplLibevent.cpp @@ -72,10 +72,10 @@ CHIP_ERROR LayerImplLibevent::Init(System::Layer & systemLayer) mEventBase = event_base_new(); VerifyOrReturnError(mEventBase != nullptr, CHIP_ERROR_NO_MEMORY); -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#if !__ZEPHYR__ mMdnsTimeoutEvent = evtimer_new(mEventBase, MdnsTimeoutCallbackHandler, this); VerifyOrReturnError(mMdnsTimeoutEvent != nullptr, CHIP_ERROR_NO_MEMORY); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#endif // !__ZEPHYR__ #if CHIP_SYSTEM_CONFIG_POSIX_LOCKING mHandleSelectThread = PTHREAD_NULL; @@ -87,7 +87,7 @@ CHIP_ERROR LayerImplLibevent::Init(System::Layer & systemLayer) return CHIP_NO_ERROR; } -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#if !__ZEPHYR__ // static void LayerImplLibevent::MdnsTimeoutCallbackHandler(evutil_socket_t fd, short eventFlags, void * data) @@ -107,7 +107,7 @@ void LayerImplLibevent::MdnsTimeoutCallbackHandler() mHandleSelectThread = PTHREAD_NULL; #endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING } -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#endif // !__ZEPHYR__ CHIP_ERROR LayerImplLibevent::Shutdown() { @@ -115,13 +115,13 @@ CHIP_ERROR LayerImplLibevent::Shutdown() event_base_loopbreak(mEventBase); -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#if !__ZEPHYR__ if (mMdnsTimeoutEvent != nullptr) { event_free(mMdnsTimeoutEvent); mMdnsTimeoutEvent = nullptr; } -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#endif // !__ZEPHYR__ mTimerListMutex.Lock(); mTimers.clear(); @@ -386,14 +386,14 @@ LayerImplLibevent::SocketWatch::~SocketWatch() void LayerImplLibevent::PrepareEvents() { -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ && !__MBED__ +#if !__ZEPHYR__ && !__MBED__ timeval mdnsTimeout = { 0, 0 }; chip::Dnssd::GetMdnsTimeout(mdnsTimeout); if (mdnsTimeout.tv_sec || mdnsTimeout.tv_usec) { evtimer_add(mMdnsTimeoutEvent, &mdnsTimeout); } -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#endif // !__ZEPHYR__ && !__MBED__ } void LayerImplLibevent::WaitForEvents() diff --git a/src/system/SystemLayerImplLibevent.h b/src/system/SystemLayerImplLibevent.h index c013d730ee80d4..2f5d5439123a0d 100644 --- a/src/system/SystemLayerImplLibevent.h +++ b/src/system/SystemLayerImplLibevent.h @@ -125,10 +125,10 @@ class LayerImplLibevent : public LayerSocketsLoop std::atomic mHandleSelectThread; #endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING -#if CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#if !__ZEPHYR__ static void MdnsTimeoutCallbackHandler(evutil_socket_t fd, short eventFlags, void * data); void MdnsTimeoutCallbackHandler(); -#endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD && !__ZEPHYR__ +#endif // !__ZEPHYR__ event * mMdnsTimeoutEvent; };