espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-28 04:49:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ip6] style fixes and minor enhancements (#10560)

Browse Source 
This commit contains minor enhancements in the `Ip6` class:

- Removes unnecessary `static_cast<uint8>()` use
- Combines repeated `case` statements
- Use shorter variable/type names.
- Style fixes.
This commit is contained in:
Abtin Keshavarzian
2024-08-13 21:37:55 -07:00
committed by GitHub
parent 943d2302a3
commit 3bcea2467b
2 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/ip6.cpp
+25 -22
View File
@@ -228,7 +228,7 @@ Error Ip6::PrepareMulticastToLargerThanRealmLocal(Message &aMessage, const Heade
// Use IP-in-IP encapsulation (RFC2473) and ALL_MPL_FORWARDERS address.
tunnelHeader.InitVersionTrafficClassFlow();
tunnelHeader.SetHopLimit(static_cast<uint8_t>(kDefaultHopLimit));
tunnelHeader.SetHopLimit(kDefaultHopLimit);
tunnelHeader.SetPayloadLength(aHeader.GetPayloadLength() + sizeof(tunnelHeader));
tunnelHeader.GetDestination().SetToRealmLocalAllMplForwarders();
tunnelHeader.SetNextHeader(kProtoIp6);
@@ -451,7 +451,7 @@ Error Ip6::SendDatagram(Message &aMessage, MessageInfo &aMessageInfo, uint8_t aI
}
else
{
header.SetHopLimit(static_cast<uint8_t>(kDefaultHopLimit));
header.SetHopLimit(kDefaultHopLimit);
}
if (aMessageInfo.GetSockAddr().IsUnspecified() || aMessageInfo.GetSockAddr().IsMulticast())
@@ -828,8 +828,7 @@ Error Ip6::HandleExtensionHeaders(OwnedPtr<Message> &aMessagePtr,
uint8_t &aNextHeader,
bool &aReceive)
{
Error error = kErrorNone;
Error error = kErrorNone;
ExtensionHeader extHeader;
while (aReceive || aNextHeader == kProtoHopOpts)
@@ -839,6 +838,7 @@ Error Ip6::HandleExtensionHeaders(OwnedPtr<Message> &aMessagePtr,
switch (aNextHeader)
{
case kProtoHopOpts:
case kProtoDstOpts:
SuccessOrExit(error = HandleOptions(*aMessagePtr, aHeader, aReceive));
break;
@@ -847,10 +847,6 @@ Error Ip6::HandleExtensionHeaders(OwnedPtr<Message> &aMessagePtr,
SuccessOrExit(error = HandleFragment(*aMessagePtr));
break;
case kProtoDstOpts:
SuccessOrExit(error = HandleOptions(*aMessagePtr, aHeader, aReceive));
break;
case kProtoIp6:
ExitNow();
@@ -862,7 +858,7 @@ Error Ip6::HandleExtensionHeaders(OwnedPtr<Message> &aMessagePtr,
ExitNow();
}
aNextHeader = static_cast<uint8_t>(extHeader.GetNextHeader());
aNextHeader = extHeader.GetNextHeader();
}
exit:
@@ -1166,7 +1162,7 @@ Error Ip6::HandleDatagram(OwnedPtr<Message> aMessagePtr, bool aIsReassembled)
aMessagePtr->SetOffset(sizeof(header));
// Process IPv6 Extension Headers
nextHeader = static_cast<uint8_t>(header.GetNextHeader());
nextHeader = header.GetNextHeader();
SuccessOrExit(error = HandleExtensionHeaders(aMessagePtr, header, nextHeader, receive));
if (receive && (nextHeader == kProtoIp6))
@@ -1414,49 +1410,55 @@ Error Ip6::RouteLookup(const Address &aSource, const Address &aDestination) cons
}
#if OPENTHREAD_CONFIG_IP6_BR_COUNTERS_ENABLE
void Ip6::UpdateBorderRoutingCounters(const Header &aHeader, uint16_t aMessageLength, bool aIsInbound)
{
static constexpr uint8_t kPrefixLength = 48;
otPacketsAndBytes *counter = nullptr;
otPacketsAndBytes *internetCounter = nullptr;
static constexpr uint8_t kPrefixLength = 48;
otPacketsAndBytes *counter = nullptr;
otPacketsAndBytes *internetCounter = nullptr;
VerifyOrExit(!aHeader.GetSource().IsLinkLocalUnicast());
VerifyOrExit(!aHeader.GetDestination().IsLinkLocalUnicast());
VerifyOrExit(aHeader.GetSource().GetPrefix() != Get<Mle::Mle>().GetMeshLocalPrefix());
VerifyOrExit(aHeader.GetDestination().GetPrefix() != Get<Mle::Mle>().GetMeshLocalPrefix());
VerifyOrExit(!Get<Mle::Mle>().IsMeshLocalAddress(aHeader.GetSource()));
VerifyOrExit(!Get<Mle::Mle>().IsMeshLocalAddress(aHeader.GetDestination()));
if (aIsInbound)
{
VerifyOrExit(!Get<Netif>().HasUnicastAddress(aHeader.GetSource()));
if (!aHeader.GetSource().MatchesPrefix(aHeader.GetDestination().GetPrefix().m8, kPrefixLength))
{
internetCounter = &mBorderRoutingCounters.mInboundInternet;
internetCounter = &mBrCounters.mInboundInternet;
}
if (aHeader.GetDestination().IsMulticast())
{
VerifyOrExit(aHeader.GetDestination().IsMulticastLargerThanRealmLocal());
counter = &mBorderRoutingCounters.mInboundMulticast;
counter = &mBrCounters.mInboundMulticast;
}
else
{
counter = &mBorderRoutingCounters.mInboundUnicast;
counter = &mBrCounters.mInboundUnicast;
}
}
else
{
VerifyOrExit(!Get<Netif>().HasUnicastAddress(aHeader.GetDestination()));
if (!aHeader.GetSource().MatchesPrefix(aHeader.GetDestination().GetPrefix().m8, kPrefixLength))
{
internetCounter = &mBorderRoutingCounters.mOutboundInternet;
internetCounter = &mBrCounters.mOutboundInternet;
}
if (aHeader.GetDestination().IsMulticast())
{
VerifyOrExit(aHeader.GetDestination().IsMulticastLargerThanRealmLocal());
counter = &mBorderRoutingCounters.mOutboundMulticast;
counter = &mBrCounters.mOutboundMulticast;
}
else
{
counter = &mBorderRoutingCounters.mOutboundUnicast;
counter = &mBrCounters.mOutboundUnicast;
}
}
@@ -1473,7 +1475,8 @@ exit:
internetCounter->mBytes += aMessageLength;
}
}
#endif
#endif // OPENTHREAD_CONFIG_IP6_BR_COUNTERS_ENABLE
// LCOV_EXCL_START
src/core/net/ip6.hpp
+15 -11
View File
@@ -327,13 +327,8 @@ public:
static const char *EcnToString(Ecn aEcn);
#if OPENTHREAD_CONFIG_IP6_BR_COUNTERS_ENABLE
/**
* Returns a reference to the Border Routing counters.
*
* @returns A reference to the Border Routing counters.
*
*/
const otBorderRoutingCounters &GetBorderRoutingCounters(void) const { return mBorderRoutingCounters; }
typedef otBorderRoutingCounters BrCounters; ///< Border Routing counters.
/**
* Returns a reference to the Border Routing counters.
@@ -341,14 +336,23 @@ public:
* @returns A reference to the Border Routing counters.
*
*/
otBorderRoutingCounters &GetBorderRoutingCounters(void) { return mBorderRoutingCounters; }
const BrCounters &GetBorderRoutingCounters(void) const { return mBrCounters; }
/**
* Returns a reference to the Border Routing counters.
*
* @returns A reference to the Border Routing counters.
*
*/
BrCounters &GetBorderRoutingCounters(void) { return mBrCounters; }
/**
* Resets the Border Routing counters.
*
*/
void ResetBorderRoutingCounters(void) { ClearAllBytes(mBorderRoutingCounters); }
#endif
void ResetBorderRoutingCounters(void) { ClearAllBytes(mBrCounters); }
#endif // OPENTHREAD_CONFIG_IP6_BR_COUNTERS_ENABLE
#if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
@@ -446,7 +450,7 @@ private:
#endif
#if OPENTHREAD_CONFIG_IP6_BR_COUNTERS_ENABLE
otBorderRoutingCounters mBorderRoutingCounters;
BrCounters mBrCounters;
#endif
};