From c9350f705ef568a6f92cc8baa3ccd445a1c19607 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Tue, 12 Apr 2022 06:45:34 +0200 Subject: [PATCH] [Server] Ensure that the interface id that is passed as a parameter is used when auto pairing is enabled (#17243) --- src/app/server/Server.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp index 002e32cc99a606..2bbed884ed6c49 100644 --- a/src/app/server/Server.cpp +++ b/src/app/server/Server.cpp @@ -207,6 +207,10 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams) SuccessOrExit(err); #endif + app::DnssdServer::Instance().SetSecuredPort(mOperationalServicePort); + app::DnssdServer::Instance().SetUnsecuredPort(mUserDirectedCommissioningPort); + app::DnssdServer::Instance().SetInterfaceId(mInterfaceId); + if (GetFabricTable().FabricCount() != 0) { // The device is already commissioned, proactively disable BLE advertisement. @@ -223,10 +227,6 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams) #endif } - app::DnssdServer::Instance().SetSecuredPort(mOperationalServicePort); - app::DnssdServer::Instance().SetUnsecuredPort(mUserDirectedCommissioningPort); - app::DnssdServer::Instance().SetInterfaceId(mInterfaceId); - // TODO @bzbarsky-apple @cecille Move to examples // ESP32 and Mbed OS examples have a custom logic for enabling DNS-SD #if !CHIP_DEVICE_LAYER_TARGET_ESP32 && !CHIP_DEVICE_LAYER_TARGET_MBED && \