espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-11-08 23:41:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MTD configuration for leader network data. (#982)

Browse Source
This commit is contained in:
Jonathan Hui
2016-11-18 09:37:08 +08:00
committed by GitHub
parent fba3198c9e
commit 94a84e0f01
10 changed files with 1418 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/visual-studio/libopenthread.vcxproj
+1
View File
@@ -109,6 +109,7 @@
<ClCompile Include="..\..\src\core\thread\mle_tlvs.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_leader.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_leader_ftd.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag_tlvs.cpp" />
etc/visual-studio/libopenthread.vcxproj.filters
+3
View File
@@ -162,6 +162,9 @@
<ClCompile Include="..\..\src\core\thread\network_data_leader.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_data_leader_ftd.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
etc/visual-studio/libopenthread_k.vcxproj
+1
View File
@@ -119,6 +119,7 @@
<ClCompile Include="..\..\src\core\thread\mle_tlvs.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_leader.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_leader_ftd.cpp" />
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag.cpp" />
<ClCompile Include="..\..\src\core\thread\network_diag_tlvs.cpp" />
etc/visual-studio/libopenthread_k.vcxproj.filters
+3
View File
@@ -156,6 +156,9 @@
<ClCompile Include="..\..\src\core\thread\network_data_leader.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_data_leader_ftd.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\thread\network_data_local.cpp">
<Filter>Source Files\thread</Filter>
</ClCompile>
src/core/Makefile.am
+3
View File
@@ -140,6 +140,7 @@ libopenthread_ftd_a_SOURCES = \
meshcop/leader.cpp \
thread/address_resolver.cpp \
thread/mle_router.cpp \
thread/network_data_leader_ftd.cpp \
thread/network_data_local.cpp \
$(NULL)
@@ -229,6 +230,8 @@ noinst_HEADERS = \
thread/mle_tlvs.hpp \
thread/network_data.hpp \
thread/network_data_leader.hpp \
thread/network_data_leader_ftd.hpp \
thread/network_data_leader_mtd.hpp \
thread/network_data_local.hpp \
thread/network_data_local_ftd.hpp \
thread/network_data_local_mtd.hpp \
src/core/thread/network_data_leader.cpp
+18 -1036
View File
File diff suppressed because it is too large Load Diff
src/core/thread/network_data_leader.hpp
+13 -123
View File
@@ -62,7 +62,7 @@ namespace NetworkData {
* This class implements the Thread Network Data maintained by the Leader.
*
*/
class Leader: public NetworkData
class LeaderBase: public NetworkData
{
public:
/**
@@ -71,7 +71,7 @@ public:
* @param[in] aThreadNetif A reference to the Thread network interface.
*
*/
explicit Leader(ThreadNetif &aThreadNetif);
explicit LeaderBase(ThreadNetif &aThreadNetif);
/**
* This method reset the Thread Network Data.
@@ -79,18 +79,6 @@ public:
*/
void Reset(void);
/**
* This method starts the Leader services.
*
*/
void Start(void);
/**
* This method stops the Leader services.
*
*/
void Stop(void);
/**
* This method returns the Thread Network Data version.
*
@@ -99,12 +87,6 @@ public:
*/
uint8_t GetVersion(void) const;
/**
* This method increments the Thread Network Data version.
*
*/
void IncrementVersion(void);
/**
* This method returns the Thread Network Data stable version.
*
@@ -113,30 +95,6 @@ public:
*/
uint8_t GetStableVersion(void) const;
/**
* This method increments the Thread Network Data stable version.
*
*/
void IncrementStableVersion(void);
/**
* This method returns CONTEXT_ID_RESUSE_DELAY value.
*
* @returns The CONTEXT_ID_REUSE_DELAY value.
*
*/
uint32_t GetContextIdReuseDelay(void) const;
/**
* This method sets CONTEXT_ID_RESUSE_DELAY value.
*
* @warning This method should only be used for testing.
*
* @param[in] aDelay The CONTEXT_ID_REUSE_DELAY value.
*
*/
ThreadError SetContextIdReuseDelay(uint32_t aDelay);
/**
* This method retrieves the 6LoWPAN Context information based on a given IPv6 address.
*
@@ -200,14 +158,6 @@ public:
void SetNetworkData(uint8_t aVersion, uint8_t aStableVersion, bool aStableOnly, const uint8_t *aData,
uint8_t aDataLength);
/**
* This method removes Network Data associated with a given RLOC16.
*
* @param[in] aRloc16 A RLOC16 value.
*
*/
void RemoveBorderRouter(uint16_t aRloc16);
/**
* This method sends a Server Data Notification message to the Leader indicating an invalid RLOC16.
*
@@ -255,83 +205,17 @@ public:
ThreadError GetRlocByContextId(uint8_t aContextId, uint16_t &aRloc16);
#endif // OPENTHREAD_ENABLE_DHCP6_SERVER || OPENTHREAD_ENABLE_DHCP6_CLIENT
protected:
uint8_t mStableVersion;
uint8_t mVersion;
ThreadNetif &mNetif;
private:
static void HandleServerData(void *aContext, otCoapHeader *aHeader, otMessage aMessage,
const otMessageInfo *aMessageInfo);
void HandleServerData(Coap::Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
void SendServerDataResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aMessageInfo,
const uint8_t *aTlvs, uint8_t aTlvsLength);
static void HandleTimer(void *aContext);
void HandleTimer(void);
ThreadError RegisterNetworkData(uint16_t aRloc16, uint8_t *aTlvs, uint8_t aTlvsLength);
ThreadError AddHasRoute(PrefixTlv &aPrefix, HasRouteTlv &aHasRoute);
ThreadError AddBorderRouter(PrefixTlv &aPrefix, BorderRouterTlv &aBorderRouter);
ThreadError AddNetworkData(uint8_t *aTlv, uint8_t aTlvLength);
ThreadError AddPrefix(PrefixTlv &aTlv);
int AllocateContext(void);
ThreadError FreeContext(uint8_t aContextId);
ThreadError ConfigureAddresses(void);
ThreadError ConfigureAddress(PrefixTlv &aPrefix);
ThreadError RemoveContext(uint8_t aContextId);
ThreadError RemoveContext(PrefixTlv &aPrefix, uint8_t aContextId);
ThreadError RemoveCommissioningData(void);
ThreadError RemoveRloc(uint16_t aRloc16);
ThreadError RemoveRloc(PrefixTlv &aPrefix, uint16_t aRloc16);
ThreadError RemoveRloc(PrefixTlv &aPrefix, HasRouteTlv &aHasRoute, uint16_t aRloc16);
ThreadError RemoveRloc(PrefixTlv &aPrefix, BorderRouterTlv &aBorderRouter, uint16_t aRloc16);
ThreadError ExternalRouteLookup(uint8_t aDomainId, const Ip6::Address &destination,
uint8_t *aPrefixMatch, uint16_t *aRloc16);
ThreadError DefaultRouteLookup(PrefixTlv &aPrefix, uint16_t *aRloc16);
void RlocLookup(uint16_t aRloc16, bool &aIn, bool &aStable, uint8_t *aTlvs, uint8_t aTlvsLength);
bool IsStableUpdated(uint16_t aRloc16, uint8_t *aTlvs, uint8_t aTlvsLength, uint8_t *aTlvsBase,
uint8_t aTlvsBaseLength);
static void HandleCommissioningSet(void *aContext, otCoapHeader *aHeader, otMessage aMessage,
const otMessageInfo *aMessageInfo);
void HandleCommissioningSet(Coap::Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
static void HandleCommissioningGet(void *aContext, otCoapHeader *aHeader, otMessage aMessage,
const otMessageInfo *aMessageInfo);
void HandleCommissioningGet(Coap::Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
void SendCommissioningGetResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aMessageInfo,
uint8_t *aTlvs, uint8_t aLength);
void SendCommissioningSetResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aMessageInfo,
MeshCoP::StateTlv::State aState);
/**
* Thread Specification Constants
*
*/
enum
{
kMinContextId = 1, ///< Minimum Context ID (0 is used for Mesh Local)
kNumContextIds = 15, ///< Maximum Context ID
kContextIdReuseDelay = 48 * 60 * 60, ///< CONTEXT_ID_REUSE_DELAY (seconds)
kStateUpdatePeriod = 1000, ///< State update period in milliseconds
};
uint16_t mContextUsed;
uint32_t mContextLastUsed[kNumContextIds];
uint32_t mContextIdReuseDelay;
Timer mTimer;
Coap::Resource mServerData;
uint8_t mStableVersion;
uint8_t mVersion;
Coap::Resource mCommissioningDataGet;
Coap::Resource mCommissioningDataSet;
Coap::Server &mCoapServer;
ThreadNetif &mNetif;
};
/**
@@ -341,4 +225,10 @@ private:
} // namespace NetworkData
} // namespace Thread
#ifdef OPENTHREAD_MTD
#include "network_data_leader_mtd.hpp"
#else
#include "network_data_leader_ftd.hpp"
#endif
#endif // NETWORK_DATA_LEADER_HPP_
src/core/thread/network_data_leader_ftd.cpp
+1088
View File
File diff suppressed because it is too large Load Diff
src/core/thread/network_data_leader_ftd.hpp
+221
View File
@@ -0,0 +1,221 @@
/*
* Copyright (c) 2016, The OpenThread Authors.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holder nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/**
* @file
* This file includes definitions for manipulating Thread Network Data managed by the Thread Leader.
*/
#ifndef NETWORK_DATA_LEADER_FTD_HPP_
#define NETWORK_DATA_LEADER_FTD_HPP_
#include <stdint.h>
#include <coap/coap_server.hpp>
#include <common/timer.hpp>
#include <net/ip6_address.hpp>
#include <thread/mle_router.hpp>
#include <thread/network_data.hpp>
namespace Thread {
class ThreadNetif;
namespace NetworkData {
/**
* @addtogroup core-netdata-leader
*
* @brief
* This module includes definitions for manipulating Thread Network Data managed by the Thread Leader.
*
* @{
*
*/
/**
* This class implements the Thread Network Data maintained by the Leader.
*
*/
class Leader: public LeaderBase
{
public:
/**
* This constructor initializes the object.
*
* @param[in] aThreadNetif A reference to the Thread network interface.
*
*/
explicit Leader(ThreadNetif &aThreadNetif);
/**
* This method reset the Thread Network Data.
*
*/
void Reset(void);
/**
* This method starts the Leader services.
*
*/
void Start(void);
/**
* This method stops the Leader services.
*
*/
void Stop(void);
/**
* This method increments the Thread Network Data version.
*
*/
void IncrementVersion(void);
/**
* This method increments the Thread Network Data stable version.
*
*/
void IncrementStableVersion(void);
/**
* This method returns CONTEXT_ID_RESUSE_DELAY value.
*
* @returns The CONTEXT_ID_REUSE_DELAY value.
*
*/
uint32_t GetContextIdReuseDelay(void) const;
/**
* This method sets CONTEXT_ID_RESUSE_DELAY value.
*
* @warning This method should only be used for testing.
*
* @param[in] aDelay The CONTEXT_ID_REUSE_DELAY value.
*
*/
ThreadError SetContextIdReuseDelay(uint32_t aDelay);
/**
* This method removes Network Data associated with a given RLOC16.
*
* @param[in] aRloc16 A RLOC16 value.
*
*/
void RemoveBorderRouter(uint16_t aRloc16);
/**
* This method sends a Server Data Notification message to the Leader indicating an invalid RLOC16.
*
* @param[in] aRloc16 The invalid RLOC16 to notify.
*
* @retval kThreadError_None Successfully enqueued the notification message.
* @retval kThreadError_NoBufs Insufficient message buffers to generate the notification message.
*
*/
ThreadError SendServerDataNotification(uint16_t aRloc16);
private:
static void HandleServerData(void *aContext, otCoapHeader *aHeader, otMessage aMessage,
const otMessageInfo *aMessageInfo);
void HandleServerData(Coap::Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
void SendServerDataResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aMessageInfo,
const uint8_t *aTlvs, uint8_t aTlvsLength);
static void HandleTimer(void *aContext);
void HandleTimer(void);
ThreadError RegisterNetworkData(uint16_t aRloc16, uint8_t *aTlvs, uint8_t aTlvsLength);
ThreadError AddHasRoute(PrefixTlv &aPrefix, HasRouteTlv &aHasRoute);
ThreadError AddBorderRouter(PrefixTlv &aPrefix, BorderRouterTlv &aBorderRouter);
ThreadError AddNetworkData(uint8_t *aTlv, uint8_t aTlvLength);
ThreadError AddPrefix(PrefixTlv &aTlv);
int AllocateContext(void);
ThreadError FreeContext(uint8_t aContextId);
ThreadError RemoveContext(uint8_t aContextId);
ThreadError RemoveContext(PrefixTlv &aPrefix, uint8_t aContextId);
ThreadError RemoveCommissioningData(void);
ThreadError RemoveRloc(uint16_t aRloc16);
ThreadError RemoveRloc(PrefixTlv &aPrefix, uint16_t aRloc16);
ThreadError RemoveRloc(PrefixTlv &aPrefix, HasRouteTlv &aHasRoute, uint16_t aRloc16);
ThreadError RemoveRloc(PrefixTlv &aPrefix, BorderRouterTlv &aBorderRouter, uint16_t aRloc16);
void RlocLookup(uint16_t aRloc16, bool &aIn, bool &aStable, uint8_t *aTlvs, uint8_t aTlvsLength);
bool IsStableUpdated(uint16_t aRloc16, uint8_t *aTlvs, uint8_t aTlvsLength, uint8_t *aTlvsBase,
uint8_t aTlvsBaseLength);
static void HandleCommissioningSet(void *aContext, otCoapHeader *aHeader, otMessage aMessage,
const otMessageInfo *aMessageInfo);
void HandleCommissioningSet(Coap::Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
static void HandleCommissioningGet(void *aContext, otCoapHeader *aHeader, otMessage aMessage,
const otMessageInfo *aMessageInfo);
void HandleCommissioningGet(Coap::Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
void SendCommissioningGetResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aMessageInfo,
uint8_t *aTlvs, uint8_t aLength);
void SendCommissioningSetResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aMessageInfo,
MeshCoP::StateTlv::State aState);
/**
* Thread Specification Constants
*
*/
enum
{
kMinContextId = 1, ///< Minimum Context ID (0 is used for Mesh Local)
kNumContextIds = 15, ///< Maximum Context ID
kContextIdReuseDelay = 48 * 60 * 60, ///< CONTEXT_ID_REUSE_DELAY (seconds)
kStateUpdatePeriod = 1000, ///< State update period in milliseconds
};
uint16_t mContextUsed;
uint32_t mContextLastUsed[kNumContextIds];
uint32_t mContextIdReuseDelay;
Timer mTimer;
Coap::Resource mServerData;
Coap::Resource mCommissioningDataGet;
Coap::Resource mCommissioningDataSet;
Coap::Server &mCoapServer;
};
/**
* @}
*/
} // namespace NetworkData
} // namespace Thread
#endif // NETWORK_DATA_LEADER_FTD_HPP_
src/core/thread/network_data_leader_mtd.hpp
+67
View File
@@ -0,0 +1,67 @@
/*
* Copyright (c) 2016, The OpenThread Authors.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holder nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/**
* @file
* This file includes definitions for manipulating Thread Network Data managed by the Thread Leader.
*/
#ifndef NETWORK_DATA_LEADER_MTD_HPP_
#define NETWORK_DATA_LEADER_MTD_HPP_
#include <stdint.h>
namespace Thread {
class ThreadNetif;
namespace NetworkData {
class Leader: public LeaderBase
{
public:
explicit Leader(ThreadNetif &aThreadNetif) : LeaderBase(aThreadNetif) { }
void Start(void) { }
void Stop(void) { }
void IncrementVersion(void) { }
void IncrementStableVersion(void) { }
uint32_t GetContextIdReuseDelay(void) const { return 0; }
ThreadError SetContextIdReuseDelay(uint32_t) { return kThreadError_NotImplemented; }
void RemoveBorderRouter(uint16_t) { }
ThreadError SendServerDataNotification(uint16_t) { return kThreadError_NotImplemented; }
};
} // namespace NetworkData
} // namespace Thread
#endif // NETWORK_DATA_LEADER_MTD_HPP_