From 2d4896f67584272f6128e0a3b05d54f5bb606880 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Tue, 16 Aug 2022 14:52:56 -0700 Subject: [PATCH] [ip6] remove extra param from `Ip6::HandleExtensionHeaders()` (#8035) This commit updates `Ip6::HandleExtensionHeaders()` removing `aIsOutbound` input and instead using `(aNetif == nullptr)` to determine this. --- src/core/net/ip6.cpp | 12 ++++++------ src/core/net/ip6.hpp | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp index 5ed12028d..5e5260f6f 100644 --- a/src/core/net/ip6.cpp +++ b/src/core/net/ip6.cpp @@ -890,11 +890,11 @@ Error Ip6::HandleExtensionHeaders(Message & aMessage, MessageInfo &aMessageInfo, Header & aHeader, uint8_t & aNextHeader, - bool aIsOutbound, bool aFromHost, bool & aReceive) { - Error error = kErrorNone; + Error error = kErrorNone; + bool isOutbound = (aNetif == nullptr); ExtensionHeader extHeader; while (aReceive || aNextHeader == kProtoHopOpts) @@ -904,7 +904,7 @@ Error Ip6::HandleExtensionHeaders(Message & aMessage, switch (aNextHeader) { case kProtoHopOpts: - SuccessOrExit(error = HandleOptions(aMessage, aHeader, aIsOutbound, aReceive)); + SuccessOrExit(error = HandleOptions(aMessage, aHeader, isOutbound, aReceive)); break; case kProtoFragment: @@ -916,7 +916,7 @@ Error Ip6::HandleExtensionHeaders(Message & aMessage, break; case kProtoDstOpts: - SuccessOrExit(error = HandleOptions(aMessage, aHeader, aIsOutbound, aReceive)); + SuccessOrExit(error = HandleOptions(aMessage, aHeader, isOutbound, aReceive)); break; case kProtoIp6: @@ -1213,8 +1213,8 @@ start: // process IPv6 Extension Headers nextHeader = static_cast(header.GetNextHeader()); - SuccessOrExit(error = HandleExtensionHeaders(aMessage, aNetif, messageInfo, header, nextHeader, aNetif == nullptr, - aFromHost, receive)); + SuccessOrExit(error = + HandleExtensionHeaders(aMessage, aNetif, messageInfo, header, nextHeader, aFromHost, receive)); // process IPv6 Payload if (receive) diff --git a/src/core/net/ip6.hpp b/src/core/net/ip6.hpp index 5e288b175..13fdcc86a 100644 --- a/src/core/net/ip6.hpp +++ b/src/core/net/ip6.hpp @@ -333,7 +333,6 @@ private: MessageInfo &aMessageInfo, Header & aHeader, uint8_t & aNextHeader, - bool aIsOutbound, bool aFromHost, bool & aReceive); Error FragmentDatagram(Message &aMessage, uint8_t aIpProto);