From 3b5daf937dc98023029405f068f84f2f46fad39d Mon Sep 17 00:00:00 2001
From: hoelscher <jens.hoelscher@fh-muenster.de>
Date: Fri, 27 Nov 2015 15:27:18 +0100
Subject: [PATCH] remove check for sinfo_assoc_id for sendcalls
---
gtests/net/packetdrill/run_system_call.c | 7 +------
.../tests/bsd/sctp/api_tests/run-all-tests | 20 ++++++++++++++++++-
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c
index 1fd9bf35..011dd62c 100644
--- a/gtests/net/packetdrill/run_system_call.c
+++ b/gtests/net/packetdrill/run_system_call.c
@@ -4109,12 +4109,7 @@ static int parse_expression_to_sctp_sndrcvinfo(struct expression *expr,
}
}
if (sndrcvinfo_expr->sinfo_assoc_id->type == EXPR_ELLIPSIS) {
- if (send) {
- asprintf(error, "sinfo_assoc_id must be specified");
- return STATUS_ERR;
- } else {
- info->sinfo_assoc_id = 0;
- }
+ info->sinfo_assoc_id = 0;
} else {
if (get_sctp_assoc_t(sndrcvinfo_expr->sinfo_assoc_id, &info->sinfo_assoc_id, error)) {
return STATUS_ERR;
diff --git a/gtests/net/packetdrill/tests/bsd/sctp/api_tests/run-all-tests b/gtests/net/packetdrill/tests/bsd/sctp/api_tests/run-all-tests
index 97fb7ec8..c5374c08 100755
--- a/gtests/net/packetdrill/tests/bsd/sctp/api_tests/run-all-tests
+++ b/gtests/net/packetdrill/tests/bsd/sctp/api_tests/run-all-tests
@@ -107,6 +107,7 @@ set testcases = (setsockopt/sctp_rtoinfo_1 \
sctp_send/sctp_send_1 \
sctp_send/sctp_send_2 \
sctp_sendx/sctp_sendx_1 \
+ sctp_sendx/sctp_sendx_2 \
sctp_sendv/sctp_sendv \
sctp_sendv/sctp_sendv_1 \
sctp_sendv/sctp_sendv_2 \
@@ -115,7 +116,24 @@ set testcases = (setsockopt/sctp_rtoinfo_1 \
sctp_sendv/sctp_sendv_5 \
sctp_sendv/sctp_sendv_6 \
sctp_sendv/sctp_sendv_7 \
- sctp_sendv/sctp_sendv_8 )
+ sctp_sendv/sctp_sendv_8 \
+ sctp_bindx/sctp_bindx \
+ sctp_peeloff/sctp_peeloff \
+ sctp_getpaddrs/sctp_getpaddrs \
+ sctp_getladdrs/sctp_getladdrs \
+ sctp_sendmsg/sctp_sendmsg_1 \
+ sctp_sendmsg/sctp_sendmsg_2 \
+ sctp_sendmsg/sctp_sendmsg_3 \
+ sctp_recvmsg/sctp_recvmsg_1 \
+ sctp_recvmsg/sctp_recvmsg_2 \
+ sctp_recvmsg/sctp_recvmsg_3 \
+ sctp_recvv/sctp_recvv_1 \
+ sctp_recvv/sctp_recvv_2 \
+ sctp_recvv/sctp_recvv_3 \
+ sctp_recvv/sctp_recvv_4 \
+ sctp_recvv/sctp_recvv_5 \
+ sctp_recvv/sctp_recvv_6 \
+ sctp_recvv/sctp_recvv_7 )
set rootdir = `/usr/bin/dirname $0`
set os = `uname -s | tr '[A-Z]' '[a-z]'`
--
GitLab