Skip to content
Snippets Groups Projects
Commit d90ae251 authored by hoelscher's avatar hoelscher
Browse files

modify tests for tests without assoc_id in cmsgs

parent b6785b47
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 199 additions and 46 deletions
gtests/net/packetdrill/parser.y
+ 1
− 1
View file @ d90ae251
......@@ -3578,7 +3578,7 @@ sctp_sndrcvinfo
$$->value.sctp_sndrcvinfo->sinfo_timetolive = $12;
$$->value.sctp_sndrcvinfo->sinfo_tsn = $14;
$$->value.sctp_sndrcvinfo->sinfo_cumtsn = $16;
$$->value.sctp_sndrcvinfo->sinfo_assoc_id = new_expression(EXPR_ELLIPSIS);
$$->value.sctp_sndrcvinfo->sinfo_assoc_id = new_integer_expression(0, "%u");
};
sinfo_pr_value
......
gtests/net/packetdrill/tests/bsd/sctp/api_tests/cmsgs/recvmsg_sctp_extrcv.pkt
+ 22
− 0
View file @ d90ae251
......@@ -84,3 +84,25 @@
serinfo_next_ppid=htonl(9879),
sinfo_assoc_id=...}}],
msg_flags=MSG_EOR}, 0) = 1000
+0.0 < sctp: DATA[flgs=IUBE, len=1016, tsn=4, sid=2, ssn=0, ppid=9880]
* > sctp: SACK[flgs=0, cum_tsn=4, a_rwnd=..., gaps=[], dups=[]]
+0.0 recvmsg(3, {msg_name(...)=...,
msg_iov(1)=[{iov_base=..., iov_len=1000}],
msg_control(140)=[{cmsg_len=140,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_EXTRCV,
cmsg_data={sinfo_stream=1,
sinfo_ssn=0,
sinfo_flags=SCTP_UNORDERED,
sinfo_ppid=htonl(9879),
sinfo_context=0,
sinfo_pr_value=0,
sinfo_tsn=3,
sinfo_cumtsn=4,
serinfo_next_flags=SCTP_NEXT_MSG_AVAIL|SCTP_NEXT_MSG_ISCOMPLETE|SCTP_NEXT_MSG_IS_UNORDERED,
serinfo_next_stream=2,
serinfo_next_aid=...,
serinfo_next_length=1000,
serinfo_next_ppid=htonl(9880)}}],
msg_flags=MSG_EOR}, 0) = 1000
gtests/net/packetdrill/tests/bsd/sctp/api_tests/cmsgs/recvmsg_sctp_nxtinfo.pkt
+ 27
− 2
View file @ d90ae251
......@@ -56,7 +56,7 @@
rcv_tsn=2,
rcv_cumtsn=3,
rcv_context=0,
rcv_assoc_id=...}},
rcv_assoc_id=3}},
{cmsg_len=28,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_NXTINFO,
......@@ -64,5 +64,30 @@
nxt_flags=SCTP_UNORDERED|SCTP_COMPLETE,
nxt_ppid=htonl(9876),
nxt_length=1000,
nxt_assoc_id=...}}],
nxt_assoc_id=3}}],
msg_flags=MSG_EOR}, 0) = 1000
+0.0 setsockopt(3, IPPROTO_SCTP, SCTP_RECVRCVINFO, [1], 4) = 0
+0.0 setsockopt(3, IPPROTO_SCTP, SCTP_RECVNXTINFO, [1], 4) = 0
+0.0 < sctp: DATA[flgs=IUBE, len=1016, tsn=4, sid=0, ssn=0, ppid=9876]
* > sctp: SACK[flgs=0, cum_tsn=4, a_rwnd=..., gaps=[], dups=[]]
+0.0 recvmsg(3, {msg_name(...)=...,
msg_iov(1)=[{iov_base=..., iov_len=1000}],
msg_control(68)=[{cmsg_len=40,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_RCVINFO,
cmsg_data={rcv_sid=0,
rcv_ssn=0,
rcv_flags=SCTP_UNORDERED,
rcv_ppid=htonl(9876),
rcv_tsn=3,
rcv_cumtsn=4,
rcv_context=0}},
{cmsg_len=28,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_NXTINFO,
cmsg_data= {nxt_sid=0,
nxt_flags=SCTP_UNORDERED|SCTP_COMPLETE,
nxt_ppid=htonl(9876),
nxt_length=1000}}],
msg_flags=MSG_EOR}, 0) = 1000
gtests/net/packetdrill/tests/bsd/sctp/api_tests/cmsgs/recvmsg_sctp_rcvinfo.pkt
+ 24
− 43
View file @ d90ae251
......@@ -119,50 +119,31 @@
sinfo_cumtsn=5,
sinfo_assoc_id=...}}],
msg_flags=MSG_EOR}, 0) = 1000
+0.0 setsockopt(3, IPPROTO_SCTP, SCTP_USE_EXT_RCVINFO, [1], 4) = 0
+0.0 < sctp: DATA[flgs=IBE, len=1016, tsn=6, sid=0, ssn=3, ppid=9877]
+0.0 setsockopt(3, IPPROTO_SCTP, SCTP_RECVRCVINFO, [1], 4) = 0
+0.0 setsockopt(3, IPPROTO_SCTP, SCTP_RECVNXTINFO, [0], 4) = 0
+0.0 setsockopt(3, IPPROTO_SCTP, SCTP_EVENTS, {sctp_data_io_event=0,
sctp_association_event=0,
sctp_address_event=0,
sctp_send_failure_event=0,
sctp_peer_error_event=0,
sctp_shutdown_event=0,
sctp_partial_delivery_event=0,
sctp_adaptation_layer_event=0,
sctp_authentication_event=0,
sctp_sender_dry_event=0}, 11) = 0
+0.0 < sctp: DATA[flgs=IUBE, len=1016, tsn=6, sid=0, ssn=0, ppid=9876]
* > sctp: SACK[flgs=0, cum_tsn=6, a_rwnd=..., gaps=[], dups=[]]
+0.0 recvmsg(3, {msg_name(...)=...,
msg_iov(1)=[{iov_base=..., iov_len=1000}],
msg_control(140)=[{cmsg_len=140,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_EXTRCV,
cmsg_data={sinfo_stream=0,
sinfo_ssn=3,
sinfo_flags=0,
sinfo_ppid=htonl(9877),
sinfo_context=0,
sinfo_pr_value=0,
sinfo_tsn=6,
sinfo_cumtsn=6,
serinfo_next_flags=0,
serinfo_next_stream=0,
serinfo_next_aid=0,
serinfo_next_length=0,
serinfo_next_ppid=htonl(0),
sinfo_assoc_id=...}}],
msg_flags=MSG_EOR}, 0) = 1000
+0.0 < sctp: DATA[flgs=IBE, len=1016, tsn=7, sid=0, ssn=4, ppid=9878]
* > sctp: SACK[flgs=0, cum_tsn=7, a_rwnd=..., gaps=[], dups=[]]
+0.0 < sctp: DATA[flgs=IUBE, len=1016, tsn=8, sid=1, ssn=0, ppid=9879]
* > sctp: SACK[flgs=0, cum_tsn=8, a_rwnd=..., gaps=[], dups=[]]
+0.0 recvmsg(3, {msg_name(...)=...,
msg_iov(1)=[{iov_base=..., iov_len=1000}],
msg_control(140)=[{cmsg_len=140,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_EXTRCV,
cmsg_data={sinfo_stream=0,
sinfo_ssn=4,
sinfo_flags=0,
sinfo_ppid=htonl(9878),
sinfo_context=0,
sinfo_pr_value=0,
sinfo_tsn=7,
sinfo_cumtsn=8,
serinfo_next_flags=SCTP_NEXT_MSG_AVAIL|SCTP_NEXT_MSG_ISCOMPLETE|SCTP_NEXT_MSG_IS_UNORDERED,
serinfo_next_stream=1,
serinfo_next_aid=...,
serinfo_next_length=1000,
serinfo_next_ppid=htonl(9879),
sinfo_assoc_id=...}}],
msg_control(40)=[{cmsg_len=40,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_RCVINFO,
cmsg_data={rcv_sid=0,
rcv_ssn=0,
rcv_flags=SCTP_UNORDERED,
rcv_ppid=htonl(9876),
rcv_tsn=6,
rcv_cumtsn=6,
rcv_context=0}}],
msg_flags=MSG_EOR}, 0) = 1000
gtests/net/packetdrill/tests/bsd/sctp/api_tests/cmsgs/recvmsg_sctp_sndrcv.pkt
+ 17
− 0
View file @ d90ae251
......@@ -70,3 +70,20 @@
sinfo_cumtsn=2,
sinfo_assoc_id=...}}],
msg_flags=MSG_EOR}, 0) = 1000
+0.0 < sctp: DATA[flgs=IUBE, len=1016, tsn=3, sid=0, ssn=2, ppid=9879]
* > sctp: SACK[flgs=0, cum_tsn=3, a_rwnd=..., gaps=[], dups=[]]
+0.0 recvmsg(3, {msg_name(...)=...,
msg_iov(1)=[{iov_base=..., iov_len=1000}],
msg_control(140)=[{cmsg_len=140,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_SNDRCV,
cmsg_data={sinfo_stream=0,
sinfo_ssn=2,
sinfo_flags=SCTP_UNORDERED,
sinfo_ppid=htonl(9879),
sinfo_context=0,
sinfo_timetolive=0,
sinfo_tsn=3,
sinfo_cumtsn=3}}],
msg_flags=MSG_EOR}, 0) = 1000
gtests/net/packetdrill/tests/bsd/sctp/api_tests/cmsgs/sendmsg_sctp_sndinfo.pkt
+ 13
− 0
View file @ d90ae251
......@@ -66,6 +66,19 @@
* > sctp: DATA[flgs=BE, len=1016, tsn=3, sid=3, ssn=0, ppid=32]
+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(28)=[{cmsg_len=28,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_SNDINFO,
cmsg_data={snd_sid=4,
snd_flags=0,
snd_ppid=htonl(33),
snd_context=2}}],
msg_flags=0}, 0) = 1000
* > sctp: DATA[flgs=BE, len=1016, tsn=4, sid=4, ssn=0, ppid=33]
+0.0 < sctp: SACK[flgs=0, cum_tsn=4, a_rwnd=1500, gaps=[], dups=[]]
+0.0 close(3) = 0
......
gtests/net/packetdrill/tests/bsd/sctp/api_tests/cmsgs/sendmsg_sctp_sndrcv.pkt
+ 24
− 0
View file @ d90ae251
......@@ -94,6 +94,30 @@
* > sctp: DATA[flgs=BE, len=1016, tsn=3, sid=3, ssn=2, ppid=7]
+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,
cmsg_level=IPPROTO_SCTP,
cmsg_type=SCTP_SNDRCV,
cmsg_data={sinfo_stream=3,
sinfo_ssn=3,
sinfo_flags=0,
sinfo_ppid=htonl(7),
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]
+0.0 < sctp: SACK[flgs=0, cum_tsn=4, a_rwnd=1500, gaps=[], dups=[]]
+0.0 close(3) = 0
+0.0 > sctp: SHUTDOWN[flgs=0, cum_tsn=0]
+0.1 < sctp: SHUTDOWN_ACK[flgs=0]
......
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_associnfo.pkt
+ 11
− 0
View file @ d90ae251
......@@ -40,5 +40,16 @@
sasoc_peer_rwnd=...,
sasoc_local_rwnd=...,
sasoc_cookie_life=...}, [20]) = 0
//now test structure without associd
+0 setsockopt(3, IPPROTO_SCTP, SCTP_ASSOCINFO, {sasoc_asocmaxrxt=5,
sasoc_number_peer_destinations=2,
sasoc_peer_rwnd=1800,
sasoc_local_rwnd=2000,
sasoc_cookie_life=40000}, 20) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_ASSOCINFO, {sasoc_asocmaxrxt=5,
sasoc_number_peer_destinations=1,
sasoc_peer_rwnd=1500,
sasoc_local_rwnd=1864135,
sasoc_cookie_life=40000}, [20]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_auth_active_key.pkt
+ 3
− 0
View file @ d90ae251
......@@ -13,4 +13,7 @@
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, {scact_assoc_id=0, scact_keynumber=123}, 6) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, {scact_assoc_id=0, scact_keynumber=123}, [6]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, {scact_keynumber=123}, 6) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, {scact_keynumber=123}, [6]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_auth_deactivate_key.pkt
+ 1
− 0
View file @ d90ae251
......@@ -11,5 +11,6 @@
+0 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_DEACTIVATE_KEY, {scact_assoc_id=..., scact_keynumber=0}, 6) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_DEACTIVATE_KEY, {scact_keynumber=0}, 6) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_auth_delete_key.pkt
+ 1
− 0
View file @ d90ae251
......@@ -11,5 +11,6 @@
+0 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY, {scact_assoc_id=..., scact_keynumber=0}, 8) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY, {scact_keynumber=0}, 8) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_auth_key.pkt
+ 1
− 0
View file @ d90ae251
......@@ -11,5 +11,6 @@
+0 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_KEY, {sca_assoc_id=..., sca_keynumber=123, sca_keylength=2, sca_key=[0x00, 0x00]}, 10) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_AUTH_KEY, {sca_keynumber=123, sca_keylength=2, sca_key=[0x00, 0x00]}, 10) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_context.pkt
+ 3
− 0
View file @ d90ae251
......@@ -13,4 +13,7 @@
+0 setsockopt(3, IPPROTO_SCTP, SCTP_CONTEXT, {assoc_id=0, assoc_value=1200}, 8) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_CONTEXT, {assoc_id=0, assoc_value=1200}, [8]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_CONTEXT, {assoc_value=1200}, 8) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_CONTEXT, {assoc_value=1200}, [8]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_default_prinfo.pkt
+ 5
− 0
View file @ d90ae251
......@@ -20,4 +20,9 @@
pr_value=5,
pr_assoc_id=...}, [12]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_DEFAULT_PRINFO, {pr_policy=SCTP_PR_SCTP_TTL,
pr_value=5}, 12) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_DEFAULT_PRINFO, {pr_policy=SCTP_PR_SCTP_TTL,
pr_value=5}, [12]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_default_send_param.pkt
+ 17
− 0
View file @ d90ae251
......@@ -29,4 +29,21 @@
sinfo_cumtsn=1,
sinfo_assoc_id=3}, [30]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_DEFAULT_SEND_PARAM, {sinfo_stream=0,
sinfo_ssn=1,
sinfo_flags=0,
sinfo_ppid=htonl(123),
sinfo_context=0,
sinfo_timetolive=0,
sinfo_tsn=2,
sinfo_cumtsn=1}, 30) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_DEFAULT_SEND_PARAM, {sinfo_stream=0,
sinfo_ssn=1,
sinfo_flags=0,
sinfo_ppid=htonl(123),
sinfo_context=0,
sinfo_timetolive=0,
sinfo_tsn=2,
sinfo_cumtsn=1}, [30]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_delayed_sack.pkt
+ 3
− 0
View file @ d90ae251
......@@ -18,4 +18,7 @@
+0 getsockopt(3, IPPROTO_SCTP, SCTP_DELAYED_SACK, {sack_assoc_id=..., sack_delay=..., sack_freq=1}, [12]) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_DELAYED_SACK, {sack_assoc_id=..., sack_delay=250, sack_freq=...}, [12]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_DELAYED_SACK, {sack_delay=200, sack_freq=1}, 12) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_DELAYED_SACK, {sack_delay=200, sack_freq=1}, [12]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_event.pkt
+ 3
− 0
View file @ d90ae251
......@@ -14,4 +14,7 @@
+0 setsockopt(3, IPPROTO_SCTP, SCTP_EVENT, {se_assoc_id=0, se_type=SCTP_SHUTDOWN_EVENT, se_on=1}, 8) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_EVENT, {se_assoc_id=0, se_type=SCTP_SHUTDOWN_EVENT, se_on=1}, [8]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_EVENT, {se_type=SCTP_SHUTDOWN_EVENT, se_on=0}, 8) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_EVENT, {se_type=SCTP_SHUTDOWN_EVENT, se_on=0}, [8]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_get_peer_addr_info.pkt
+ 17
− 0
View file @ d90ae251
......@@ -80,5 +80,22 @@
spinfo_mtu=...}, [152]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_GET_PEER_ADDR_INFO, {spinfo_address={sa_family=AF_INET,
sin_port=htons(8080),
sin_addr=inet_addr("192.0.2.1")},
spinfo_state=SCTP_ACTIVE,
spinfo_cwnd=4464,
spinfo_srtt=111,
spinfo_rto=1000,
spinfo_mtu=1468}, 152) = -1 (ENOPROTOOPT)
+0 getsockopt(3, IPPROTO_SCTP, SCTP_GET_PEER_ADDR_INFO, {spinfo_address={sa_family=AF_INET,
sin_port=htons(8080),
sin_addr=inet_addr("192.0.2.1")},
spinfo_state=SCTP_ACTIVE,
spinfo_cwnd=4464,
spinfo_srtt=...,
spinfo_rto=1000,
spinfo_mtu=1468}, [152]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_local_auth_chunks.pkt
+ 3
− 0
View file @ d90ae251
......@@ -14,4 +14,7 @@
gauth_number_of_chunks=...,
gauth_chunks=[...]}, [10]) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, {gauth_number_of_chunks=...,
gauth_chunks=[...]}, [10]) = 0
+0 close(3) = 0
gtests/net/packetdrill/tests/bsd/sctp/api_tests/getsockopt/sctp_max_burst.pkt
+ 3
− 0
View file @ d90ae251
......@@ -14,4 +14,7 @@
+0 setsockopt(3, IPPROTO_SCTP, SCTP_MAX_BURST, {assoc_id=0, assoc_value=5}, 8) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_MAX_BURST, {assoc_id=0, assoc_value=5}, [8]) = 0
+0 setsockopt(3, IPPROTO_SCTP, SCTP_MAX_BURST, {assoc_value=4}, 8) = 0
+0 getsockopt(3, IPPROTO_SCTP, SCTP_MAX_BURST, {assoc_value=4}, [8]) = 0
+0 close(3) = 0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment