espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-07 19:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ip6] simplify Ip6::InsertMplOption() (#10814)

Browse Source 
This commit refactors the `InsertMplOption()` method for improved
efficiency and readability. Cascading `if`/`else` blocks have been
eliminated by handling the simpler `IsMulticastLargerThanRealmLocal()`
case first. Redundant checks for multicast destination and scope
have been removed, as these conditions are already covered by
`IsRealmLocalMulticast()` and `IsMulticastLargerThanRealmLocal()`.
This commit is contained in:
Abtin Keshavarzian
2024-10-11 13:11:49 -07:00
committed by GitHub
parent ad29f8e886
commit 8fddb4cdf7
1 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/ip6.cpp
+42 -44
View File
@@ -231,60 +231,58 @@ Error Ip6::InsertMplOption(Message &aMessage, Header &aHeader)
{
Error error = kErrorNone;
VerifyOrExit(aHeader.GetDestination().IsMulticast() &&
aHeader.GetDestination().GetScope() >= Address::kRealmLocalScope);
if (aHeader.GetDestination().IsRealmLocalMulticast())
if (aHeader.GetDestination().IsMulticastLargerThanRealmLocal())
{
aMessage.RemoveHeader(sizeof(aHeader));
error = PrepareMulticastToLargerThanRealmLocal(aMessage, aHeader);
ExitNow();
}
if (aHeader.GetNextHeader() == kProtoHopOpts)
VerifyOrExit(aHeader.GetDestination().IsRealmLocalMulticast());
aMessage.RemoveHeader(sizeof(aHeader));
if (aHeader.GetNextHeader() == kProtoHopOpts)
{
HopByHopHeader hbh;
uint16_t hbhSize;
MplOption mplOption;
PadOption padOption;
// Read existing hop-by-hop option header
SuccessOrExit(error = aMessage.Read(0, hbh));
hbhSize = hbh.GetSize();
VerifyOrExit(hbhSize <= aHeader.GetPayloadLength(), error = kErrorParse);
// Increment hop-by-hop option header length by one which
// increases its total size by 8 bytes.
hbh.SetLength(hbh.GetLength() + 1);
aMessage.Write(0, hbh);
// Make space for MPL Option + padding (8 bytes) at the end
// of hop-by-hop header
SuccessOrExit(error = aMessage.InsertHeader(hbhSize, ExtensionHeader::kLengthUnitSize));
// Insert MPL Option
mMpl.InitOption(mplOption, aHeader.GetSource());
aMessage.WriteBytes(hbhSize, &mplOption, mplOption.GetSize());
// Insert Pad Option (if needed)
if (padOption.InitToPadHeaderWithSize(mplOption.GetSize()) == kErrorNone)
{
HopByHopHeader hbh;
uint16_t hbhSize;
MplOption mplOption;
PadOption padOption;
// Read existing hop-by-hop option header
SuccessOrExit(error = aMessage.Read(0, hbh));
hbhSize = hbh.GetSize();
VerifyOrExit(hbhSize <= aHeader.GetPayloadLength(), error = kErrorParse);
// Increment hop-by-hop option header length by one which
// increases its total size by 8 bytes.
hbh.SetLength(hbh.GetLength() + 1);
aMessage.Write(0, hbh);
// Make space for MPL Option + padding (8 bytes) at the end
// of hop-by-hop header
SuccessOrExit(error = aMessage.InsertHeader(hbhSize, ExtensionHeader::kLengthUnitSize));
// Insert MPL Option
mMpl.InitOption(mplOption, aHeader.GetSource());
aMessage.WriteBytes(hbhSize, &mplOption, mplOption.GetSize());
// Insert Pad Option (if needed)
if (padOption.InitToPadHeaderWithSize(mplOption.GetSize()) == kErrorNone)
{
aMessage.WriteBytes(hbhSize + mplOption.GetSize(), &padOption, padOption.GetSize());
}
// Update IPv6 Payload Length
aHeader.SetPayloadLength(aHeader.GetPayloadLength() + ExtensionHeader::kLengthUnitSize);
}
else
{
SuccessOrExit(error = AddMplOption(aMessage, aHeader));
aMessage.WriteBytes(hbhSize + mplOption.GetSize(), &padOption, padOption.GetSize());
}
SuccessOrExit(error = aMessage.Prepend(aHeader));
// Update IPv6 Payload Length
aHeader.SetPayloadLength(aHeader.GetPayloadLength() + ExtensionHeader::kLengthUnitSize);
}
else
{
SuccessOrExit(error = PrepareMulticastToLargerThanRealmLocal(aMessage, aHeader));
SuccessOrExit(error = AddMplOption(aMessage, aHeader));
}
SuccessOrExit(error = aMessage.Prepend(aHeader));
exit:
return error;
}