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

[dhcp6-client] remove undefined method declaration (#11539)

Browse Source 
This commit removes an undefined method declaration in `Dhcp6::Client`
and inlines a simple method used for prefix checks.
This commit is contained in:
Abtin Keshavarzian
2025-05-28 18:13:10 -07:00
committed by GitHub
parent 0216b59fe1
commit 1798f3b61c
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/dhcp6_client.cpp
+2 -7
View File
@@ -52,11 +52,6 @@ Client::Client(Instance &aInstance)
ClearAllBytes(mIdentityAssociations);
}
bool Client::MatchNetifAddressWithPrefix(const Ip6::Netif::UnicastAddress &aNetifAddress, const Ip6::Prefix &aIp6Prefix)
{
return aNetifAddress.HasPrefix(aIp6Prefix);
}
void Client::UpdateAddresses(void)
{
bool found = false;
@@ -82,7 +77,7 @@ void Client::UpdateAddresses(void)
continue;
}
if (MatchNetifAddressWithPrefix(idAssociation.mNetifAddress, config.GetPrefix()))
if (idAssociation.mNetifAddress.HasPrefix(config.GetPrefix()))
{
found = true;
break;
@@ -121,7 +116,7 @@ void Client::UpdateAddresses(void)
idAssociation = &ia;
}
}
else if (MatchNetifAddressWithPrefix(ia.mNetifAddress, config.GetPrefix()))
else if (ia.mNetifAddress.HasPrefix(config.GetPrefix()))
{
found = true;
idAssociation = &ia;
src/core/net/dhcp6_client.hpp
+6 -13
View File
@@ -81,6 +81,7 @@ public:
void UpdateAddresses(void);
private:
static constexpr uint16_t kNumPrefixes = OPENTHREAD_CONFIG_DHCP6_CLIENT_NUM_PREFIXES;
static constexpr uint32_t kTrickleTimerImin = 1;
static constexpr uint32_t kTrickleTimerImax = 120;
@@ -104,14 +105,8 @@ private:
void Start(void);
void Stop(void);
static bool MatchNetifAddressWithPrefix(const Ip6::Netif::UnicastAddress &aNetifAddress,
const Ip6::Prefix &aIp6Prefix);
void Solicit(uint16_t aRloc16);
void AddIdentityAssociation(uint16_t aRloc16, otIp6Prefix &aIp6Prefix);
void RemoveIdentityAssociation(uint16_t aRloc16, otIp6Prefix &aIp6Prefix);
bool ProcessNextIdentityAssociation(void);
Error AppendHeader(Message &aMessage);
@@ -136,13 +131,11 @@ private:
using ClientSocket = Ip6::Udp::SocketIn<Client, &Client::HandleUdpReceive>;
ClientSocket mSocket;
TrickleTimer mTrickleTimer;
TransactionId mTransactionId;
TimeMilli mStartTime;
IdentityAssociation mIdentityAssociations[OPENTHREAD_CONFIG_DHCP6_CLIENT_NUM_PREFIXES];
ClientSocket mSocket;
TrickleTimer mTrickleTimer;
TransactionId mTransactionId;
TimeMilli mStartTime;
IdentityAssociation mIdentityAssociations[kNumPrefixes];
IdentityAssociation *mIdentityAssociationCurrent;
};