Fix how group multicast addresses are constructed. (#19023)

They should be using fabric id, not fabric index. Fixes #18935
project-chip · Aug 1, 2023 · 2582210 · 2582210
1 parent eeede21
commit 2582210
Show file tree

Hide file tree

Showing 5 changed files with 785 additions and 33 deletions.
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -174,7 +174,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
 #endif
  );
 
- err = mListener.Init(&mTransports);
+ err = mListener.Init(this);
  SuccessOrExit(err);
  mGroupsProvider->SetListener(&mListener);
 
@@ -309,7 +309,7 @@ void Server::RejoinExistingMulticastGroups()
  while (iterator->Next(groupInfo))
  {
  err = mTransports.MulticastGroupJoinLeave(
- Transport::PeerAddress::Multicast(fabric.GetFabricIndex(), groupInfo.group_id), true);
+ Transport::PeerAddress::Multicast(fabric.GetFabricId(), groupInfo.group_id), true);
  if (err != CHIP_NO_ERROR)
  {
  ChipLogError(AppServer, "Error when trying to join Group %u of fabric index %u : %" CHIP_ERROR_FORMAT,

diff --git a/src/app/server/Server.h b/src/app/server/Server.h
@@ -270,30 +270,45 @@ class Server
  public:
  GroupDataProviderListener() {}
 
- CHIP_ERROR Init(ServerTransportMgr * transports)
+ CHIP_ERROR Init(Server * server)
  {
- VerifyOrReturnError(transports != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+ VerifyOrReturnError(server != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
 
- mTransports = transports;
+ mServer = server;
  return CHIP_NO_ERROR;
  };
 
  void OnGroupAdded(chip::FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & new_group) override
  {
- if (mTransports->MulticastGroupJoinLeave(Transport::PeerAddress::Multicast(fabric_index, new_group.group_id), true) !=
- CHIP_NO_ERROR)
+ FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
+ if (fabric == nullptr)
+ {
+ ChipLogError(AppServer, "Group added to nonexistent fabric?");
+ return;
+ }
+
+ if (mServer->GetTransportManager().MulticastGroupJoinLeave(
+ Transport::PeerAddress::Multicast(fabric->GetFabricId(), new_group.group_id), true) != CHIP_NO_ERROR)
  {
  ChipLogError(AppServer, "Unable to listen to group");
  }
  };
 
  void OnGroupRemoved(chip::FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & old_group) override
  {
- mTransports->MulticastGroupJoinLeave(Transport::PeerAddress::Multicast(fabric_index, old_group.group_id), false);
+ FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
+ if (fabric == nullptr)
+ {
+ ChipLogError(AppServer, "Group added to nonexistent fabric?");
+ return;
+ }
+
+ mServer->GetTransportManager().MulticastGroupJoinLeave(
+ Transport::PeerAddress::Multicast(fabric->GetFabricId(), old_group.group_id), false);
  };
 
  private:
- ServerTransportMgr * mTransports;
+ Server * mServer;
  };
 
  class ServerFabricDelegate final : public chip::FabricTable::Delegate