commit 05c18124369372893b8d856d93ee6a9b13b95f63
author Austin Schuh <austin.schuh@bluerivertech.com> Sat Jul 31 20:39:47 2021 -0700
committer Austin Schuh <austin.schuh@bluerivertech.com> Sat Jul 31 20:39:47 2021 -0700
tree cbe0a0dce8b1241bf3ad33821924d1ea158a9a70
parent a5f545b318b94be772afb54009fc2a42a0a0b4e0

Move some sctp variables to smaller scopes

Easier to follow, per the style guide.

Change-Id: I375ced64de241d2e890ea6f4fe7bfcc79f89538b
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 babe7ab..c5e2080 100644
--- a/aos/network/sctp_lib.cc
+++ b/aos/network/sctp_lib.cc
@@ -186,10 +186,6 @@
 }
 
 aos::unique_c_ptr<Message> ReadSctpMessage(int fd, size_t max_size) {
-  char incmsg[CMSG_SPACE(sizeof(_sctp_cmsg_data_t))];
-  struct iovec iov;
-  struct msghdr inmessage;
-
   aos::unique_c_ptr<Message> result(
       reinterpret_cast<Message *>(malloc(sizeof(Message) + max_size + 1)));
   result->size = 0;
@@ -197,14 +193,17 @@
   int count = 0;
   int last_flags = 0;
   for (count = 0; !(last_flags & MSG_EOR); count++) {
+    struct msghdr inmessage;
     memset(&inmessage, 0, sizeof(struct msghdr));
 
+    struct iovec iov;
     iov.iov_len = max_size + 1 - result->size;
     iov.iov_base = result->mutable_data() + result->size;
 
     inmessage.msg_iov = &iov;
     inmessage.msg_iovlen = 1;
 
+    char incmsg[CMSG_SPACE(sizeof(_sctp_cmsg_data_t))];
     inmessage.msg_control = incmsg;
     inmessage.msg_controllen = sizeof(incmsg);
 
@@ -220,7 +219,8 @@
       VLOG(1) << "msg_flags: " << inmessage.msg_flags;
       VLOG(1) << "Current size: " << result->size;
       VLOG(1) << "Received size: " << size;
-      CHECK_EQ(MSG_NOTIFICATION & inmessage.msg_flags, MSG_NOTIFICATION & last_flags);
+      CHECK_EQ(MSG_NOTIFICATION & inmessage.msg_flags,
+               MSG_NOTIFICATION & last_flags);
     }
 
     result->size += size;
@@ -230,7 +230,8 @@
          scmsg = CMSG_NXTHDR(&inmessage, scmsg)) {
       switch (scmsg->cmsg_type) {
         case SCTP_RCVINFO: {
-          struct sctp_rcvinfo *data = reinterpret_cast<struct sctp_rcvinfo *>(CMSG_DATA(scmsg));
+          struct sctp_rcvinfo *data =
+              reinterpret_cast<struct sctp_rcvinfo *>(CMSG_DATA(scmsg));
           if (count > 0) {
             VLOG(1) << "Got sctp_rcvinfo on continued packet";
             CHECK_EQ(result->header.rcvinfo.rcv_sid, data->rcv_sid);
@@ -246,7 +247,7 @@
       }
     }
 
-    CHECK_NE(inmessage.msg_flags & MSG_CTRUNC, MSG_CTRUNC)
+    CHECK_NE(last_flags & MSG_CTRUNC, MSG_CTRUNC)
         << ": Control message truncated.";
 
     CHECK_LE(result->size, max_size) << ": Message overflowed buffer on stream "
@@ -259,7 +260,7 @@
     VLOG(1) << "Final size: " << result->size;
   }
 
-  if ((MSG_NOTIFICATION & inmessage.msg_flags)) {
+  if ((MSG_NOTIFICATION & last_flags)) {
     result->message_type = Message::kNotification;
   } else {
     result->message_type = Message::kMessage;