From a82e11be917158b2e0358253258e0cd1694d4dde Mon Sep 17 00:00:00 2001 From: jijianwen <jijianwen@localhost.localdomain> Date: Tue, 4 Sep 2018 16:34:51 +0800 Subject: [PATCH] Fix the control message length issue on Linux Signed-off-by: jijianwen <jijianwen@localhost.localdomain> --- .../linux/sctp/api_tests/cmsgs/sendmsg_sctp_init.pkt | 2 +- .../linux/sctp/api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_init.pkt b/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_init.pkt index 3f00c4ff..d87f6a97 100644 --- a/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_init.pkt +++ b/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_init.pkt @@ -8,7 +8,7 @@ +0.0 sendmsg(3, {msg_name(...)=..., msg_iov(1)=[{iov_base=..., iov_len=1000}], - msg_control(20)=[{cmsg_len=20, + msg_control(24)=[{cmsg_len=24, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_INIT, cmsg_data={sinit_num_ostreams=1, diff --git a/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt b/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt index 9f57a3ca..a67602a4 100644 --- a/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt +++ b/gtests/net/packetdrill/tests/linux/sctp/api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt @@ -25,7 +25,7 @@ spp_dscp=0}, 152) = 0 +0.0 sendmsg(3, {msg_name(...)=..., msg_iov(1)=[{iov_base=..., iov_len=1000}], - msg_control(44)=[{cmsg_len=44, + msg_control(48)=[{cmsg_len=48, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_SNDRCV, cmsg_data={sinfo_stream=3, @@ -44,7 +44,7 @@ //test for sndrcvinfo +0.0 sendmsg(3, {msg_name(...)=..., msg_iov(1)=[{iov_base=..., iov_len=1000}], - msg_control(44)=[{cmsg_len=44, + msg_control(48)=[{cmsg_len=48, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_SNDRCV, cmsg_data={sinfo_stream=3, @@ -62,7 +62,7 @@ +0.0 sendmsg(3, {msg_name(...)=..., msg_iov(1)=[{iov_base=..., iov_len=1000}], - msg_control(44)=[{cmsg_len=44, + msg_control(48)=[{cmsg_len=48, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_SNDRCV, cmsg_data={sinfo_stream=3, @@ -80,7 +80,7 @@ +0.0 sendmsg(3, {msg_name(...)=..., msg_iov(1)=[{iov_base=..., iov_len=1000}], - msg_control(44)=[{cmsg_len=44, + msg_control(48)=[{cmsg_len=48, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_SNDRCV, cmsg_data={sinfo_stream=3, -- GitLab