mirror of
https://github.com/espressif/openthread.git
synced 2026-09-30 21:07:39 +00:00
[net] use TcpHeader and UdpHeader directly (#13179)
This commit updates the codebase to use `TcpHeader` and `UdpHeader` types directly, instead of the nested `Tcp::Header` and `Udp::Header` types. The `TcpHeader` and `UdpHeader` classes are already defined in `ip6_headers.hpp`. This change reduces dependencies on the `Tcp` and `Udp` class definitions, which is particularly useful when TCP is disabled in the build configuration, avoiding the need to include their respective class headers just for the header definitions.
This commit is contained in:
@@ -172,7 +172,7 @@ void CorruptMessage(Message &aMessage)
|
||||
|
||||
void TestUdpMessageChecksum(void)
|
||||
{
|
||||
constexpr uint16_t kMinSize = sizeof(Ip6::Udp::Header);
|
||||
constexpr uint16_t kMinSize = sizeof(Ip6::UdpHeader);
|
||||
constexpr uint16_t kMaxSize = Buffer::kSize * 3 + 24;
|
||||
|
||||
const char *kSourceAddress = "fd00:1122:3344:5566:7788:99aa:bbcc:ddee";
|
||||
@@ -185,7 +185,7 @@ void TestUdpMessageChecksum(void)
|
||||
for (uint16_t size = kMinSize; size <= kMaxSize; size++)
|
||||
{
|
||||
Message *message = instance->Get<Ip6::Ip6>().NewMessage();
|
||||
Ip6::Udp::Header udpHeader;
|
||||
Ip6::UdpHeader udpHeader;
|
||||
Ip6::MessageInfo messageInfo;
|
||||
|
||||
VerifyOrQuit(message != nullptr, "Ip6::NewMesssage() failed");
|
||||
@@ -309,7 +309,7 @@ void TestIcmp6MessageChecksum(void)
|
||||
|
||||
void TestTcp4MessageChecksum(void)
|
||||
{
|
||||
constexpr size_t kMinSize = sizeof(Ip4::Tcp::Header);
|
||||
constexpr size_t kMinSize = sizeof(Ip4::TcpHeader);
|
||||
constexpr size_t kMaxSize = Buffer::kSize * 3 + 24;
|
||||
|
||||
const char *kSourceAddress = "12.34.56.78";
|
||||
@@ -327,8 +327,8 @@ void TestTcp4MessageChecksum(void)
|
||||
|
||||
for (uint16_t size = kMinSize; size <= kMaxSize; size++)
|
||||
{
|
||||
Message *message = instance->Get<Ip6::Ip6>().NewMessage();
|
||||
Ip4::Tcp::Header tcpHeader;
|
||||
Message *message = instance->Get<Ip6::Ip6>().NewMessage();
|
||||
Ip4::TcpHeader tcpHeader;
|
||||
|
||||
VerifyOrQuit(message != nullptr, "Ip6::NewMesssage() failed");
|
||||
SuccessOrQuit(message->SetLength(size));
|
||||
@@ -364,7 +364,7 @@ void TestTcp4MessageChecksum(void)
|
||||
|
||||
void TestUdp4MessageChecksum(void)
|
||||
{
|
||||
constexpr uint16_t kMinSize = sizeof(Ip4::Udp::Header);
|
||||
constexpr uint16_t kMinSize = sizeof(Ip4::UdpHeader);
|
||||
constexpr uint16_t kMaxSize = Buffer::kSize * 3 + 24;
|
||||
|
||||
const char *kSourceAddress = "12.34.56.78";
|
||||
@@ -382,8 +382,8 @@ void TestUdp4MessageChecksum(void)
|
||||
|
||||
for (uint16_t size = kMinSize; size <= kMaxSize; size++)
|
||||
{
|
||||
Message *message = instance->Get<Ip6::Ip6>().NewMessage();
|
||||
Ip4::Udp::Header udpHeader;
|
||||
Message *message = instance->Get<Ip6::Ip6>().NewMessage();
|
||||
Ip4::UdpHeader udpHeader;
|
||||
|
||||
VerifyOrQuit(message != nullptr, "Ip6::NewMesssage() failed");
|
||||
SuccessOrQuit(message->SetLength(size));
|
||||
|
||||
Reference in New Issue
Block a user