Max payload size check in TCP

pidarped · pidarped · commit 9fdab4394f2d · 2024-04-20T01:30:02.000Z
diff --git a/src/transport/raw/TCP.cpp b/src/transport/raw/TCP.cpp
@@ -43,7 +43,7 @@ using namespace chip::Encoding;
 constexpr size_t kPacketSizeBytes = 2;
 
 // TODO: Actual limit may be lower (spec issue #2119)
-constexpr uint16_t kMaxMessageSize = static_cast<uint16_t>(System::PacketBuffer::kMaxSizeWithoutReserve - kPacketSizeBytes);
+constexpr uint32_t kMaxTCPMessageSize = static_cast<uint32_t>(CHIP_CONFIG_LARGE_PAYLOAD_MAX_SIZE - kPacketSizeBytes);
 
 constexpr int kListenBacklogSize = 2;
 
@@ -273,7 +273,7 @@ CHIP_ERROR TCPBase::ProcessReceivedBuffer(Inet::TCPEndPoint * endPoint, const Pe
             return err;
         }
         uint16_t messageSize = LittleEndian::Get16(messageSizeBuf);
-        if (messageSize >= kMaxMessageSize)
+        if (messageSize >= kMaxTCPMessageSize)
         {
             // This message is too long for upper layers.
             return CHIP_ERROR_MESSAGE_TOO_LONG;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ using namespace chip::Encoding;`
`43`	`43`	`constexpr size_t kPacketSizeBytes = 2;`
`44`	`44`
`45`	`45`	`// TODO: Actual limit may be lower (spec issue #2119)`
`46`		`-constexpr uint16_t kMaxMessageSize = static_cast<uint16_t>(System::PacketBuffer::kMaxSizeWithoutReserve - kPacketSizeBytes);`
	`46`	`+constexpr uint32_t kMaxTCPMessageSize = static_cast<uint32_t>(CHIP_CONFIG_LARGE_PAYLOAD_MAX_SIZE - kPacketSizeBytes);`
`47`	`47`
`48`	`48`	`constexpr int kListenBacklogSize = 2;`
`49`	`49`
`@@ -273,7 +273,7 @@ CHIP_ERROR TCPBase::ProcessReceivedBuffer(Inet::TCPEndPoint * endPoint, const Pe`
`273`	`273`	`return err;`
`274`	`274`	`}`
`275`	`275`	`uint16_t messageSize = LittleEndian::Get16(messageSizeBuf);`
`276`		`- if (messageSize >= kMaxMessageSize)`
	`276`	`+ if (messageSize >= kMaxTCPMessageSize)`
`277`	`277`	`{`
`278`	`278`	`// This message is too long for upper layers.`
`279`	`279`	`return CHIP_ERROR_MESSAGE_TOO_LONG;`