From 4dc58da9276db97ef76546f105bd94c9a9d81bc5 Mon Sep 17 00:00:00 2001 From: Simon Lin Date: Thu, 12 Sep 2019 23:51:39 +0800 Subject: [PATCH] [mle] always echo back AR TLV in Child ID/Update Response (#4162) This commit ensures that a Child ID/Update Response message always includes an Address Registration TLV when the Child ID/Update Request message includes an Address Registration TLV, even when there are no IPv6 addresses to include. This commit reverts a change in commit 1133983. --- src/core/thread/mle_router.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index ecbc45bc5..c7646d79f 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -4355,16 +4355,8 @@ otError MleRouter::AppendChildAddresses(Message &aMessage, Child &aChild) length += entry.GetLength(); } - if (length > 0) - { - tlv.SetLength(length); - aMessage.Write(startOffset, sizeof(tlv), &tlv); - } - else - { - // remove AddressRegistrationTlv if no address to be echoed back - aMessage.SetLength(startOffset); - } + tlv.SetLength(length); + aMessage.Write(startOffset, sizeof(tlv), &tlv); exit: return error;