espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-21 16:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ip6] add support for ECN in IPv6 MessageInfo and Header (#6790)

Browse Source
This commit is contained in:
Sam Kumar
2021-08-16 18:26:51 -07:00
committed by Jonathan Hui
parent f426ff35c0
commit 306e030f96
5 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openthread/instance.h
+1 -1
View File
@@ -53,7 +53,7 @@ extern "C" {
* @note This number versions both OpenThread platform and user APIs.
*
*/
#define OPENTHREAD_API_VERSION (153)
#define OPENTHREAD_API_VERSION (154)
/**
* @addtogroup api-instance
include/openthread/ip6.h
+24 -11
View File
@@ -207,23 +207,36 @@ typedef struct otSockAddr
uint16_t mPort; ///< A transport-layer port.
} otSockAddr;
/**
* ECN statuses, represented as in the IP header.
*
*/
enum
{
OT_ECN_NOT_CAPABLE = 0x0, ///< Non-ECT
OT_ECN_CAPABLE_0 = 0x2, ///< ECT(0)
OT_ECN_CAPABLE_1 = 0x1, ///< ECT(1)
OT_ECN_MARKED = 0x3, ///< Congestion encountered (CE)
};
/**
* This structure represents the local and peer IPv6 socket addresses.
*
*/
typedef struct otMessageInfo
{
otIp6Address mSockAddr; ///< The local IPv6 address.
otIp6Address mPeerAddr; ///< The peer IPv6 address.
uint16_t mSockPort; ///< The local transport-layer port.
uint16_t mPeerPort; ///< The peer transport-layer port.
const void * mLinkInfo; ///< A pointer to link-specific information.
uint8_t mHopLimit; ///< The IPv6 Hop Limit value. Only applies if `mAllowZeroHopLimit` is FALSE.
///< If `0`, IPv6 Hop Limit is default value `OPENTHREAD_CONFIG_IP6_HOP_LIMIT_DEFAULT`.
///< Otherwise, specifies the IPv6 Hop Limit.
bool mIsHostInterface : 1; ///< TRUE if packets sent/received via host interface, FALSE otherwise.
bool mAllowZeroHopLimit : 1; ///< TRUE to allow IPv6 Hop Limit 0 in `mHopLimit`, FALSE otherwise.
bool mMulticastLoop : 1; ///< TRUE to allow looping back multicast, FALSE otherwise.
otIp6Address mSockAddr; ///< The local IPv6 address.
otIp6Address mPeerAddr; ///< The peer IPv6 address.
uint16_t mSockPort; ///< The local transport-layer port.
uint16_t mPeerPort; ///< The peer transport-layer port.
const void * mLinkInfo; ///< A pointer to link-specific information.
uint8_t mHopLimit; ///< The IPv6 Hop Limit value. Only applies if `mAllowZeroHopLimit` is FALSE.
///< If `0`, IPv6 Hop Limit is default value `OPENTHREAD_CONFIG_IP6_HOP_LIMIT_DEFAULT`.
///< Otherwise, specifies the IPv6 Hop Limit.
uint8_t mEcn : 2; ///< The ECN status of the packet, represented as in the IPv6 header.
bool mIsHostInterface : 1; ///< TRUE if packets sent/received via host interface, FALSE otherwise.
bool mAllowZeroHopLimit : 1; ///< TRUE to allow IPv6 Hop Limit 0 in `mHopLimit`, FALSE otherwise.
bool mMulticastLoop : 1; ///< TRUE to allow looping back multicast, FALSE otherwise.
} otMessageInfo;
/**
src/core/net/ip6.cpp
+1
View File
@@ -454,6 +454,7 @@ Error Ip6::SendDatagram(Message &aMessage, MessageInfo &aMessageInfo, uint8_t aI
header.Init();
header.SetDscp(PriorityToDscp(aMessage.GetPriority()));
header.SetEcn(aMessageInfo.mEcn);
header.SetPayloadLength(payloadLength);
header.SetNextHeader(aIpProto);
src/core/net/ip6_headers.hpp
+26
View File
@@ -190,6 +190,25 @@ public:
((static_cast<uint16_t>(aDscp) << kDscpOffset) & kDscpMask));
}
/**
* This method returns the IPv6 ECN value.
*
* @returns The IPv6 ECN value.
*
*/
uint8_t GetEcn(void) const { return (mVersionClassFlow.m8[1] & kEcnMask) >> kEcnOffset; }
/**
* This method sets the Ipv6 ECN value.
*
* @param[in] aEcn The Ipv6 ECN value.
*
*/
void SetEcn(uint8_t aEcn)
{
mVersionClassFlow.m8[1] = (mVersionClassFlow.m8[1] & ~kEcnMask) | ((aEcn << kEcnOffset) & kEcnMask);
}
/**
* This method returns the IPv6 Payload Length value.
*
@@ -291,8 +310,15 @@ private:
static constexpr uint8_t kVersionMask = 0xf0; // To use with `mVersionClassFlow.m8[0]`
static constexpr uint8_t kDscpOffset = 6; // To use with `mVersionClassFlow.m16[0]`
static constexpr uint16_t kDscpMask = 0x0fc0; // To use with `mVersionClassFlow.m16[0]`
static constexpr uint8_t kEcnOffset = 4; // To use with `mVersionClassFlow.m8[1]`
static constexpr uint8_t kEcnMask = 0x30; // To use with `mVersionClassFlow.m8[1]`
static constexpr uint32_t kVersionClassFlowInit = 0x60000000; // Version 6, TC and flow zero.
static constexpr uint8_t kEcnNotCapable = OT_ECN_NOT_CAPABLE; ///< Non-ECT
static constexpr uint8_t kEcnCapable0 = OT_ECN_CAPABLE_0; ///< ECT(0)
static constexpr uint8_t kEcnCapable1 = OT_ECN_CAPABLE_1; ///< ECT(1)
static constexpr uint8_t kEcnMarked = OT_ECN_MARKED; ///< Congestion encountered (CE)
union OT_TOOL_PACKED_FIELD
{
uint8_t m8[sizeof(uint32_t) / sizeof(uint8_t)];
src/core/net/socket.hpp
+16
View File
@@ -203,6 +203,22 @@ public:
*/
const ThreadLinkInfo *GetThreadLinkInfo(void) const { return reinterpret_cast<const ThreadLinkInfo *>(mLinkInfo); }
/**
* This method gets the ECN status.
*
* @returns The ECN status, as represented in the IP header.
*
*/
uint8_t GetEcn(void) const { return mEcn; }
/**
* This method sets the ECN status.
*
* @param[in] aEcn The ECN status, as represented in the IP header.
*
*/
void SetEcn(uint8_t aEcn) { mEcn = aEcn; }
/**
* This method indicates whether peer is via the host interface.
*