espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-06-06 05:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mesh-forwarder] support DHCP traffic forward when DHCP is disabled (#4219)

Browse Source
This commit is contained in:
Rongli Sun
2019-10-03 01:21:21 +08:00
committed by Jonathan Hui
parent 378183e21e
commit d40b273a84
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mesh_forwarder_ftd.cpp
-4
View File
@@ -395,8 +395,6 @@ otError MeshForwarder::UpdateIp6RouteFtd(Ip6::Header &ip6Header)
{
SuccessOrExit(error = MeshCoP::GetBorderAgentRloc(Get<ThreadNetif>(), mMeshDest));
}
#if OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
else if (aloc16 <= Mle::kAloc16DhcpAgentEnd)
{
uint16_t agentRloc16;
@@ -418,8 +416,6 @@ otError MeshForwarder::UpdateIp6RouteFtd(Ip6::Header &ip6Header)
mMeshDest = Mle::Mle::GetRloc16(routerId);
}
}
#endif // OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
#if OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE
else if ((aloc16 >= Mle::kAloc16ServiceStart) && (aloc16 <= Mle::kAloc16ServiceEnd))
{
src/core/thread/network_data_leader.cpp
-2
View File
@@ -163,7 +163,6 @@ exit:
return error;
}
#if OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
otError LeaderBase::GetRlocByContextId(uint8_t aContextId, uint16_t &aRloc16)
{
otError error = OT_ERROR_NOT_FOUND;
@@ -188,7 +187,6 @@ otError LeaderBase::GetRlocByContextId(uint8_t aContextId, uint16_t &aRloc16)
exit:
return error;
}
#endif // OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
bool LeaderBase::IsOnMesh(const Ip6::Address &aAddress)
{
src/core/thread/network_data_leader.hpp
-2
View File
@@ -217,7 +217,6 @@ public:
*/
otError SetCommissioningData(const uint8_t *aValue, uint8_t aValueLength);
#if OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
/**
* This method gets the Rloc of Dhcp Agent of specified contextId.
*
@@ -229,7 +228,6 @@ public:
*
*/
otError GetRlocByContextId(uint8_t aContextId, uint16_t &aRloc16);
#endif // OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
protected:
uint8_t mStableVersion;