commit 90fed8b2d5b97cd63f6dd0c1be885ca8a36be2cf
author Austin Schuh <austin.linux@gmail.com> Wed Mar 31 21:05:39 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Wed Mar 31 21:05:39 2021 -0700
tree 6f81d4b90ba88a7f8d6cb7a4377e9bec6b8cd7bb
parent 62a0c27ac56ebf69419c7808760bb900af807b14

sctp_server,client: drop sctp_data_io_event

sctp_data_io_event sends a sctp_sndrcvinfo control message which
is identical in meaning to sctp_rcvinfo. Right now, both are
sent which causes MSG_CTRUNC.

This just happened to work because sctp_rcvinfo is set first
in the kernel:

        /* Check if we allow SCTP_RCVINFO. */
        if (sp->recvrcvinfo)
                sctp_ulpevent_read_rcvinfo(event, msg);
        /* Check if we allow SCTP_SNDRCVINFO. */
        if (sp->subscribe.sctp_data_io_event)
                sctp_ulpevent_read_sndrcvinfo(event, msg);

Change-Id: I80d6a8ad374447b8cdcfbc35329f88680ac1c5f3

aos/network/sctp_client.cc

diff --git a/aos/network/sctp_client.cc b/aos/network/sctp_client.cc
index d77392e..dbc0387 100644
--- a/aos/network/sctp_client.cc
+++ b/aos/network/sctp_client.cc
@@ -57,7 +57,6 @@
     // stack out in the wild for linux is old and primitive.
     struct sctp_event_subscribe subscribe;
     memset(&subscribe, 0, sizeof(subscribe));
-    subscribe.sctp_data_io_event = 1;
     subscribe.sctp_association_event = 1;
     subscribe.sctp_stream_change_event = 1;
     PCHECK(setsockopt(fd_, SOL_SCTP, SCTP_EVENTS, (char *)&subscribe,

aos/network/sctp_lib.cc

diff --git a/aos/network/sctp_lib.cc b/aos/network/sctp_lib.cc
index 0d31924..318c5a7 100644
--- a/aos/network/sctp_lib.cc
+++ b/aos/network/sctp_lib.cc
@@ -225,6 +225,9 @@
     }
   }
 
+  CHECK_NE(inmessage.msg_flags & MSG_CTRUNC, MSG_CTRUNC)
+      << ": Control message truncated.";
+
   CHECK_LE(size, max_size) << ": Message overflowed buffer on stream "
                            << result->header.rcvinfo.rcv_sid << ".";
 

aos/network/sctp_server.cc

diff --git a/aos/network/sctp_server.cc b/aos/network/sctp_server.cc
index 8bf14f6..b0f84d1 100644
--- a/aos/network/sctp_server.cc
+++ b/aos/network/sctp_server.cc
@@ -30,7 +30,6 @@
     {
       struct sctp_event_subscribe subscribe;
       memset(&subscribe, 0, sizeof(subscribe));
-      subscribe.sctp_data_io_event = 1;
       subscribe.sctp_association_event = 1;
       subscribe.sctp_send_failure_event = 1;
       subscribe.sctp_partial_delivery_event = 1;