commit 89e1e9ca57734b7cf5f9b283ff22611e08f29f73
author Austin Schuh <austin.schuh@bluerivertech.com> Mon May 15 14:38:44 2023 -0700
committer Austin Schuh <austin.schuh@bluerivertech.com> Mon May 15 14:41:06 2023 -0700
tree c29075fd88682f40a356342d6631338c5b8b48c7
parent 4f558e5a9668d79ceff004e3c845ad96981749f5

Fix (and test) sending large messages over message_bridge

Brennan installed message_bridge and it didn't start.  Whops...  I added
a test to reproduce it too.

Change-Id: I54e3e76af5588760599445660876071be37440df
Signed-off-by: Austin Schuh <austin.schuh@bluerivertech.com>

aos/network/sctp_lib.cc

diff --git a/aos/network/sctp_lib.cc b/aos/network/sctp_lib.cc
index 3729f9f..3f482c3 100644
--- a/aos/network/sctp_lib.cc
+++ b/aos/network/sctp_lib.cc
@@ -353,7 +353,7 @@
   if (!use_pool_) {
     constexpr size_t kMessageAlign = alignof(Message);
     const size_t max_message_size =
-        ((sizeof(Message) + max_size_ + 1 + (kMessageAlign - 1)) /
+        ((sizeof(Message) + max_read_size_ + 1 + (kMessageAlign - 1)) /
          kMessageAlign) *
         kMessageAlign;
     aos::unique_c_ptr<Message> result(reinterpret_cast<Message *>(
@@ -379,7 +379,7 @@
     memset(&inmessage, 0, sizeof(struct msghdr));
 
     struct iovec iov;
-    iov.iov_len = max_size_ + 1;
+    iov.iov_len = max_read_size_ + 1;
     iov.iov_base = result->mutable_data();
 
     inmessage.msg_iov = &iov;
@@ -404,7 +404,7 @@
     CHECK(!(inmessage.msg_flags & MSG_CTRUNC))
         << ": Control message truncated.";
 
-    CHECK_LE(size, static_cast<ssize_t>(max_size_))
+    CHECK_LE(size, static_cast<ssize_t>(max_read_size_))
         << ": Message overflowed buffer on stream "
         << result->header.rcvinfo.rcv_sid << ".";
 
@@ -472,7 +472,7 @@
           << result->header.rcvinfo.rcv_assoc_id;
 
       // Now copy the data over and update the size.
-      CHECK_LE(partial_message->size + result->size, max_size_)
+      CHECK_LE(partial_message->size + result->size, max_read_size_)
           << ": Assembled fragments overflowed buffer on stream "
           << result->header.rcvinfo.rcv_sid << ".";
       memcpy(partial_message->mutable_data() + partial_message->size,
@@ -568,10 +568,10 @@
 }
 
 void SctpReadWrite::DoSetMaxSize() {
-  size_t max_size = max_size_;
+  size_t max_size = max_write_size_;
 
   // This sets the max packet size that we can send.
-  CHECK_GE(ReadWMemMax(), max_size)
+  CHECK_GE(ReadWMemMax(), max_write_size_)
       << "wmem_max is too low. To increase wmem_max temporarily, do sysctl "
          "-w net.core.wmem_max="
       << max_size;