diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c index 1b661c2f4615d928733b284164d212d2420b5f0e..fc2339cac2a324a8c46eb50b3d14f7f7d7c2165e 100644 --- a/gtests/net/packetdrill/run_system_call.c +++ b/gtests/net/packetdrill/run_system_call.c @@ -2202,9 +2202,8 @@ static int check_sctp_assocparams(struct sctp_assocparams_expr *expr, return STATUS_ERR; } if (sctp_assocparams->sasoc_number_peer_destinations != sasoc_number_peer_destinations) { - asprintf(error, "Bad getsockopt sctp_assocparams.sasoc_number_peer_destinations: - expected: %hu actual: %hu", sasoc_number_peer_destinations, - sctp_assocparams->sasoc_number_peer_destinations); + asprintf(error, "Bad getsockopt sctp_assocparams.sasoc_number_peer_destinations: expected: %hu actual: %hu", + sasoc_number_peer_destinations, sctp_assocparams->sasoc_number_peer_destinations); return STATUS_ERR; } } @@ -2506,7 +2505,7 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall, live_optlen = sizeof(struct sctp_setadaptation); break; #endif - case EXPR_INTEGER: + case EXPR_LIST: s32_bracketed_arg(args, 3, &script_optval, error); live_optval = malloc(sizeof(int)); live_optlen = (socklen_t)sizeof(int); @@ -2597,7 +2596,7 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall, result = check_sctp_setadaptation(val_expression->value.sctp_setadaptation, live_optval, error); break; #endif - case EXPR_INTEGER: + case EXPR_LIST: if (*(int*)live_optval != script_optval) { asprintf(error, "Bad getsockopt optval: expected: %d actual: %d", (int)script_optval, *(int*)live_optval); diff --git a/gtests/net/packetdrill/tests/bsd/sctp/sctp_get_socket_options.pkt b/gtests/net/packetdrill/tests/bsd/sctp/sctp_get_socket_options.pkt index 0cd0e2782d3dac117cdea1e727f12af2c1a3b2c4..1c5977792ac854e857f3733b7803f8826aaa9c57 100644 --- a/gtests/net/packetdrill/tests/bsd/sctp/sctp_get_socket_options.pkt +++ b/gtests/net/packetdrill/tests/bsd/sctp/sctp_get_socket_options.pkt @@ -8,7 +8,7 @@ +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 ++0.0 getsockopt(3, SOL_SOCKET, SO_ERROR, [0], [4]) = 0 +0 setsockopt(3, IPPROTO_SCTP, SCTP_STATUS, {sstat_state=..., sstat_rwnd=..., sstat_unackdata=..., sstat_penddata=..., sstat_instrms=..., sstat_outstrms=..., sstat_fragmentation_point=..., sstat_primary=...}, 176) = -1