From 02f38b8e72e3f29bb393184ca92922498d449dce Mon Sep 17 00:00:00 2001 From: Eduardo Montoya Date: Wed, 27 Oct 2021 06:55:15 +0200 Subject: [PATCH] [dua] send BB.ans with :BB destination port (#7108) According to the Thread 1.2 Specification, a Backbone Answer always has :BB (61631) as destination port. --- src/core/backbone_router/bbr_manager.cpp | 11 +++++------ src/core/backbone_router/bbr_manager.hpp | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/core/backbone_router/bbr_manager.cpp b/src/core/backbone_router/bbr_manager.cpp index 392c0ee24..f5c3c6018 100644 --- a/src/core/backbone_router/bbr_manager.cpp +++ b/src/core/backbone_router/bbr_manager.cpp @@ -650,8 +650,8 @@ Error Manager::SendProactiveBackboneNotification(const Ip6::Address & const Ip6::InterfaceIdentifier &aMeshLocalIid, uint32_t aTimeSinceLastTransaction) { - return SendBackboneAnswer(Get().GetAllDomainBackboneRoutersAddress(), BackboneRouter::kBackboneUdpPort, aDua, - aMeshLocalIid, aTimeSinceLastTransaction, Mac::kShortAddrInvalid); + return SendBackboneAnswer(Get().GetAllDomainBackboneRoutersAddress(), aDua, aMeshLocalIid, + aTimeSinceLastTransaction, Mac::kShortAddrInvalid); } Error Manager::SendBackboneAnswer(const Ip6::MessageInfo & aQueryMessageInfo, @@ -659,12 +659,11 @@ Error Manager::SendBackboneAnswer(const Ip6::MessageInfo & aQueryMessageInfo uint16_t aSrcRloc16, const NdProxyTable::NdProxy &aNdProxy) { - return SendBackboneAnswer(aQueryMessageInfo.GetPeerAddr(), aQueryMessageInfo.GetPeerPort(), aDua, - aNdProxy.GetMeshLocalIid(), aNdProxy.GetTimeSinceLastTransaction(), aSrcRloc16); + return SendBackboneAnswer(aQueryMessageInfo.GetPeerAddr(), aDua, aNdProxy.GetMeshLocalIid(), + aNdProxy.GetTimeSinceLastTransaction(), aSrcRloc16); } Error Manager::SendBackboneAnswer(const Ip6::Address & aDstAddr, - uint16_t aDstPort, const Ip6::Address & aDua, const Ip6::InterfaceIdentifier &aMeshLocalIid, uint32_t aTimeSinceLastTransaction, @@ -699,7 +698,7 @@ Error Manager::SendBackboneAnswer(const Ip6::Address & aDstAddr, } messageInfo.SetPeerAddr(aDstAddr); - messageInfo.SetPeerPort(aDstPort); + messageInfo.SetPeerPort(BackboneRouter::kBackboneUdpPort); messageInfo.SetHopLimit(Mle::kDefaultBackboneHoplimit); messageInfo.SetIsHostInterface(true); diff --git a/src/core/backbone_router/bbr_manager.hpp b/src/core/backbone_router/bbr_manager.hpp index c331813e3..b7f83bd72 100644 --- a/src/core/backbone_router/bbr_manager.hpp +++ b/src/core/backbone_router/bbr_manager.hpp @@ -207,7 +207,6 @@ private: uint16_t aSrcRloc16, const NdProxyTable::NdProxy &aNdProxy); Error SendBackboneAnswer(const Ip6::Address & aDstAddr, - uint16_t aDstPort, const Ip6::Address & aDua, const Ip6::InterfaceIdentifier &aMeshLocalIid, uint32_t aTimeSinceLastTransaction,