From 2c48972068a75fd83e389c1d67e01fb5455ebad6 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Fri, 6 Nov 2015 21:58:40 +0100
Subject: [PATCH] Cleanups. No functional change. Still don't know why it
works...
---
.../tests/bsd/sctp/sctp_recvmsg.pkt | 37 ++++++++++++++-----
1 file changed, 27 insertions(+), 10 deletions(-)
diff --git a/gtests/net/packetdrill/tests/bsd/sctp/sctp_recvmsg.pkt b/gtests/net/packetdrill/tests/bsd/sctp/sctp_recvmsg.pkt
index bafe269a..7a9bcb12 100644
--- a/gtests/net/packetdrill/tests/bsd/sctp/sctp_recvmsg.pkt
+++ b/gtests/net/packetdrill/tests/bsd/sctp/sctp_recvmsg.pkt
@@ -9,22 +9,39 @@
+0.0 > sctp: COOKIE_ECHO[flgs=0, len=4, val=...]
+0.1 < sctp: COOKIE_ACK[flgs=0]
+0.0 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
-//sctp_recvmsg(int sd, void * msg, size_t len, struct sockaddr * from, socklen_t * fromlen, struct sctp_sndrcvinfo* sinfo, int * msg_flags);
-
+//sctp_recvmsg(int sd, void * msg, size_t len,
+// struct sockaddr * from, socklen_t *fromlen,
+// struct sctp_sndrcvinfo* sinfo, int *msg_flags)
+0.0 < sctp: DATA[flgs=BE, len=1016, tsn=1, sid=0, ssn=0, ppid=0]
* > sctp: SACK[flgs=0, cum_tsn=1, a_rwnd=..., gaps=[], dups=[]]
-+0.0 sctp_recvmsg(3, ..., 1000, ..., ..., ..., 8) = 1000
-
++0.0 sctp_recvmsg(3, ..., 1000, ..., ..., ..., MSG_EOR) = 1000
+0.0 < sctp: DATA[flgs=BE, len=1016, tsn=2, sid=0, ssn=1, ppid=1234]
* > sctp: SACK[flgs=0, cum_tsn=2, a_rwnd=..., gaps=[], dups=[]]
-+0.0 sctp_recvmsg(3, ..., 1000, ..., ..., {sinfo_stream=0, sinfo_ssn=1, sinfo_flags=0, sinfo_ppid=htonl(1234), sinfo_context=0, sinfo_timetolive=0, sinfo_tsn=2,
-sinfo_cumtsn=2, sinfo_assoc_id=3}, 8) = 1000
-
++0.0 sctp_recvmsg(3, ..., 1000, ..., ..., {sinfo_stream=0,
+ sinfo_ssn=...,
+ sinfo_flags=0,
+ sinfo_ppid=htonl(1234),
+ sinfo_context=0,
+ sinfo_timetolive=0,
+ sinfo_tsn=2,
+ sinfo_cumtsn=2,
+ sinfo_assoc_id=...}, 8) = 1000
+0.0 < sctp: DATA[flgs=BE, len=1016, tsn=3, sid=0, ssn=2, ppid=0]
* > sctp: SACK[flgs=0, cum_tsn=3, a_rwnd=..., gaps=[], dups=[]]
-+0.0 sctp_recvmsg(3, ..., 1000, {sa_family=AF_INET, sin_port=htons(8080), sin_addr=inet_addr("192.0.2.1")}, 16,
-{sinfo_stream=0, sinfo_ssn=2, sinfo_flags=0, sinfo_ppid=htonl(0), sinfo_context=0, sinfo_timetolive=0, sinfo_tsn=3, sinfo_cumtsn=3, sinfo_assoc_id=3}, 8) = 1000
-
++0.0 sctp_recvmsg(3, ..., 1000,
+ {sa_family=AF_INET,
+ sin_port=htons(8080),
+ sin_addr=inet_addr("192.0.2.1")},
+ 16,
+ {sinfo_stream=0,
+ sinfo_ssn=2,
+ sinfo_flags=0,
+ sinfo_ppid=htonl(0),
+ sinfo_context=0,
+ sinfo_timetolive=0,
+ sinfo_tsn=3,
+ sinfo_cumtsn=3,
+ sinfo_assoc_id=...}, MSG_EOR) = 1000
+0.0 close(3) = 0
+0.0 > sctp: SHUTDOWN[flgs=0, cum_tsn=3]
+0.1 < sctp: SHUTDOWN_ACK[flgs=0]
--
GitLab