diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c index 3d9a5d723fdbe5cb8f78a4b1d51552f87d63468a..c7ed1c502c661fb24561dc0bc918b072de8c1c4e 100644 --- a/gtests/net/packetdrill/run_system_call.c +++ b/gtests/net/packetdrill/run_system_call.c @@ -1964,7 +1964,7 @@ static int check_cmsghdr(struct expression *expr_list, struct msghdr *msg, char } switch(cmsg_ptr->cmsg_type) { #ifdef SCTP_INITMSG - case SCTP_INITMSG: + case SCTP_INIT: if (check_sctp_initmsg(expr->cmsg_data->value.sctp_initmsg, (struct sctp_initmsg *) CMSG_DATA(cmsg_ptr), error)) { diff --git a/gtests/net/packetdrill/tests/bsd/sctp/sendmsg_init.pkt b/gtests/net/packetdrill/tests/bsd/sctp/sendmsg_init.pkt index a4e6d984a68f67eaeae8aa0bde1dbcdfee57fb74..bcf33ffdd37e4346d17eb2b55afcac588b40fdd5 100644 --- a/gtests/net/packetdrill/tests/bsd/sctp/sendmsg_init.pkt +++ b/gtests/net/packetdrill/tests/bsd/sctp/sendmsg_init.pkt @@ -9,7 +9,7 @@ [{cmsg_len=20, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_INIT, cmsg_data= {sinit_num_ostreams=1, sinit_max_instreams=1, sinit_max_attempts=1, sinit_max_init_timeo=100} },{cmsg_len=28, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_SNDINFO, cmsg_data= - {snd_sid=2, snd_flags=0, snd_ppid=htonl(4), snd_context=2, snd_assoc_id=0} + {snd_sid=2, snd_flags=0, snd_ppid=htonl(1234), snd_context=2, snd_assoc_id=0} },{cmsg_len=16, cmsg_level=IPPROTO_SCTP, cmsg_type=SCTP_DSTADDRV4, cmsg_data= {sa_family=AF_INET, sin_port=htons(8080), sin_addr=inet_addr("192.0.2.1")} }], @@ -17,6 +17,5 @@ +0.0 > sctp: INIT[flgs=0, tag=1, a_rwnd=..., os=..., is=..., tsn=1, ...] +0.1 < sctp: INIT_ACK[flgs=0, tag=2, a_rwnd=1500, os=16, is=16, tsn=1, STATE_COOKIE[len=4, val=...]] -+0.0 > sctp: COOKIE_ECHO[flgs=0, len=4, val=...]; DATA[flgs=BE, len=1016, tsn=1, sid=2, ssn=0, ppid=4] ++0.0 > sctp: COOKIE_ECHO[flgs=0, len=4, val=...]; DATA[flgs=BE, len=1016, tsn=1, sid=2, ssn=0, ppid=1234] +0.1 < sctp: COOKIE_ACK[flgs=0]; SACK[flgs=0, cum_tsn=1, a_rwnd=1500, gaps=[], dups=[]] -