From ef50894dbb87835243e26772c7ed0ce44121237d Mon Sep 17 00:00:00 2001
From: Jens Hoelscher <jens.hoelscher@fh-muenster.de>
Date: Sun, 24 Jan 2016 13:12:04 +0100
Subject: [PATCH] fix testcase for cmsg sctp_sndrcv for sendmsg

---
 .../api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt   | 49 +++++--------------
 1 file changed, 13 insertions(+), 36 deletions(-)

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 4485ccf4..9f57a3ca 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,97 +25,74 @@
 							 spp_dscp=0}, 152) = 0
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(140)=[{cmsg_len=140,
+		 msg_control(44)=[{cmsg_len=44,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,
 					       sinfo_ssn=0,
-					       sinfo_flags=SCTP_SENDALL,
+					       sinfo_flags=SCTP_UNORDERED,
 					       sinfo_ppid=htonl(7),
 					       sinfo_context=0,
 					       sinfo_timetolive=0,
 					       sinfo_tsn=1,
 					       sinfo_cumtsn=1,
-					       sinfo_assoc_id=3}}],
+					       sinfo_assoc_id=...}}],
 		msg_flags=0}, 0) = 1000
-*    > sctp: DATA[flgs=BE, len=1016, tsn=1, sid=3, ssn=0, ppid=7]
+*    > sctp: DATA[flgs=UBE, len=1016, tsn=1, sid=3, ssn=0, ppid=7]
 +0.0 < sctp: SACK[flgs=0, cum_tsn=1, a_rwnd=1500, gaps=[], dups=[]]
 
 //test for sndrcvinfo
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(168)=[{cmsg_len=28,
-				    cmsg_level=IPPROTO_SCTP,
-				    cmsg_type=SCTP_SNDINFO,
-				    cmsg_data={snd_sid=2,
-					       snd_flags=0,
-					       snd_ppid=htonl(6),
-					       snd_context=2,
-					       snd_assoc_id=0}},
-				   {cmsg_len=140,
+		 msg_control(44)=[{cmsg_len=44,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,
 					       sinfo_ssn=3,
 					       sinfo_flags=0,
-					       sinfo_ppid=htonl(7),
+					       sinfo_ppid=htonl(8),
 					       sinfo_context=0,
 					       sinfo_timetolive=0,
 					       sinfo_tsn=3,
 					       sinfo_cumtsn=3,
 					       sinfo_assoc_id=3}}],
 		msg_flags=0}, 0) = 1000
-*    > sctp: DATA[flgs=BE, len=1016, tsn=2, sid=3, ssn=1, ppid=7]
+*    > sctp: DATA[flgs=BE, len=1016, tsn=2, sid=3, ssn=0, ppid=8]
 +0.0 < sctp: SACK[flgs=0, cum_tsn=2, a_rwnd=1500, gaps=[], dups=[]]
 
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(168)=[{cmsg_len=28,
-				    cmsg_level=IPPROTO_SCTP,
-				    cmsg_type=SCTP_SNDINFO,
-				    cmsg_data={snd_sid=2,
-					       snd_flags=0,
-					       snd_ppid=htonl(6),
-					       snd_context=2,
-					       snd_assoc_id=0}},
-				   {cmsg_len=140,
+		 msg_control(44)=[{cmsg_len=44,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,
 					       sinfo_ssn=3,
 					       sinfo_flags=0,
-					       sinfo_ppid=htonl(7),
+					       sinfo_ppid=htonl(9),
 					       sinfo_context=0,
 					       sinfo_timetolive=0,
 					       sinfo_tsn=...,
 					       sinfo_cumtsn=...,
 					       sinfo_assoc_id=3}}],
 		msg_flags=0}, 0) = 1000
-*    > sctp: DATA[flgs=BE, len=1016, tsn=3, sid=3, ssn=2, ppid=7]
+*    > sctp: DATA[flgs=BE, len=1016, tsn=3, sid=3, ssn=1, ppid=9]
 +0.0 < sctp: SACK[flgs=0, cum_tsn=3, a_rwnd=1500, gaps=[], dups=[]]
 
 +0.0 sendmsg(3, {msg_name(...)=...,
 		 msg_iov(1)=[{iov_base=..., iov_len=1000}],
-		 msg_control(168)=[{cmsg_len=28,
-				    cmsg_level=IPPROTO_SCTP,
-				    cmsg_type=SCTP_SNDINFO,
-				    cmsg_data={snd_sid=2,
-					       snd_flags=0,
-					       snd_ppid=htonl(6),
-					       snd_context=2}},
-				   {cmsg_len=140,
+		 msg_control(44)=[{cmsg_len=44,
 				    cmsg_level=IPPROTO_SCTP,
 				    cmsg_type=SCTP_SNDRCV,
 				    cmsg_data={sinfo_stream=3,
 					       sinfo_ssn=3,
 					       sinfo_flags=0,
-					       sinfo_ppid=htonl(7),
+					       sinfo_ppid=htonl(10),
 					       sinfo_context=0,
 					       sinfo_timetolive=0,
 					       sinfo_tsn=...,
 					       sinfo_cumtsn=...}}],
 		msg_flags=0}, 0) = 1000
-*    > sctp: DATA[flgs=BE, len=1016, tsn=4, sid=3, ssn=3, ppid=7]
+*    > sctp: DATA[flgs=BE, len=1016, tsn=4, sid=3, ssn=2, ppid=10]
 +0.0 < sctp: SACK[flgs=0, cum_tsn=4, a_rwnd=1500, gaps=[], dups=[]]
 
 +0.0 close(3) = 0
-- 
GitLab