Hello community, here is the log from the commit of package lksctp-tools for openSUSE:Factory checked in at 2015-01-21 21:55:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lksctp-tools (Old) and /work/SRC/openSUSE:Factory/.lksctp-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lksctp-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/lksctp-tools/lksctp-tools.changes 2013-08-04 23:52:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lksctp-tools.new/lksctp-tools.changes 2015-01-21 21:56:16.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Jan 11 17:59:00 UTC 2015 - Led <[email protected]> + +- upgrade to 1.0.16 + * code cleanups + * various sctp_status fixes + * avoid using file descriptor 0 to get ENOTSOCK + * various fixes + * fix build for prefixed architectures +- remove patches: + * lksctp-fixes.patch + +------------------------------------------------------------------- Old: ---- lksctp-fixes.patch lksctp-tools-1.0.15.tar.gz New: ---- lksctp-tools-1.0.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lksctp-tools.spec ++++++ --- /var/tmp/diff_new_pack.eHFPqe/_old 2015-01-21 21:56:17.000000000 +0100 +++ /var/tmp/diff_new_pack.eHFPqe/_new 2015-01-21 21:56:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lksctp-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,10 @@ Summary: Utilities for SCTP (Stream Control Transmission Protocol) License: LGPL-2.1+ Group: Productivity/Networking/Other -Version: 1.0.15 +Version: 1.0.16 Release: 0 Url: http://lksctp.sourceforge.net Source0: http://downloads.sourceforge.net/project/lksctp/lksctp-tools/%{name}-%{version}.tar.gz -Patch0: lksctp-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool @@ -52,7 +51,6 @@ %prep %setup -q -%patch0 -p1 %build ./bootstrap ++++++ lksctp-tools-1.0.15.tar.gz -> lksctp-tools-1.0.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/ChangeLog new/lksctp-tools-1.0.16/ChangeLog --- old/lksctp-tools-1.0.15/ChangeLog 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/ChangeLog 2014-02-18 11:42:49.000000000 +0100 @@ -1,8 +1,15 @@ -Version 1.0.15 of the Developers' Release of the SCTP +Version 1.0.16 of the Developers' Release of the SCTP Linux Kernel Implementation is available from http://www.kernel.org +lksctp-1.0.16: Tue Feb 18 11:01 EDT 2014 +T:APP Code cleanups +T:APP Various sctp_status fixes +T:TEST Avoid using file descriptor 0 to get ENOTSOCK +T:TEST Various fixes +T:LIB Fix build for prefixed architectures + lksctp-1.0.15: Sun May 12 11:01 EDT 2013 T:BUILD Allow build with no AM_SILENT_RULES support T:APP Fix sctp_status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/configure.ac new/lksctp-tools-1.0.16/configure.ac --- old/lksctp-tools-1.0.15/configure.ac 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/configure.ac 2014-02-18 11:42:49.000000000 +0100 @@ -13,7 +13,7 @@ dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE, dnl configure will fail ...) -AC_INIT([lksctp-tools], [1.0.15], [], [], [http://www.lksctp.org/]) +AC_INIT([lksctp-tools], [1.0.16], [], [], [http://www.lksctp.org/]) AC_CONFIG_AUX_DIR(bin) AC_CONFIG_SRCDIR([src/apps/sctp_darn.c]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/lksctp-tools.spec.in new/lksctp-tools-1.0.16/lksctp-tools.spec.in --- old/lksctp-tools-1.0.15/lksctp-tools.spec.in 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/lksctp-tools.spec.in 2014-02-18 11:42:49.000000000 +0100 @@ -124,6 +124,9 @@ %doc doc/*.txt %changelog +* Tue Feb 18 2014 Daniel Borkmann <[email protected]> 1.0.16-1 +- 1.0.16 Release + * Sun May 12 2013 Daniel Borkmann <[email protected]> 1.0.15-1 - 1.0.15 Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/apps/myftp.c new/lksctp-tools-1.0.16/src/apps/myftp.c --- old/lksctp-tools-1.0.15/src/apps/myftp.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/apps/myftp.c 2014-02-18 11:42:49.000000000 +0100 @@ -51,7 +51,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> /* for sockaddr_in */ -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/apps/nagle_rcv.c new/lksctp-tools-1.0.16/src/apps/nagle_rcv.c --- old/lksctp-tools-1.0.15/src/apps/nagle_rcv.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/apps/nagle_rcv.c 2014-02-18 11:42:49.000000000 +0100 @@ -51,7 +51,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/apps/nagle_snd.c new/lksctp-tools-1.0.16/src/apps/nagle_snd.c --- old/lksctp-tools-1.0.15/src/apps/nagle_snd.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/apps/nagle_snd.c 2014-02-18 11:42:49.000000000 +0100 @@ -50,7 +50,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/apps/sctp_darn.c new/lksctp-tools-1.0.16/src/apps/sctp_darn.c --- old/lksctp-tools-1.0.15/src/apps/sctp_darn.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/apps/sctp_darn.c 2014-02-18 11:42:49.000000000 +0100 @@ -60,7 +60,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <sys/param.h> #include <sys/poll.h> #include <arpa/inet.h> @@ -1468,7 +1467,7 @@ if (NULL != hst4) { for (j = 0; j < i4; ++j) { b4ap = (struct sockaddr_in *)aptr; - bzero(b4ap, sizeof(*b4ap)); + memset(b4ap, 0x00, sizeof(*b4ap)); b4ap->sin_family = AF_INET; b4ap->sin_port = htons(local_port); bcopy(hst4->h_addr_list[j], &b4ap->sin_addr, @@ -1481,7 +1480,7 @@ if (NULL != hst6) { for (j = 0; j < i6; ++j) { b6ap = (struct sockaddr_in6 *)aptr; - bzero(b6ap, sizeof(*b6ap)); + memset(b6ap, 0x00, sizeof(*b6ap)); b6ap->sin6_family = AF_INET6; b6ap->sin6_port = htons(local_port); b6ap->sin6_scope_id = if_index; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/apps/sctp_status.c new/lksctp-tools-1.0.16/src/apps/sctp_status.c --- old/lksctp-tools-1.0.15/src/apps/sctp_status.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/apps/sctp_status.c 2014-02-18 11:42:49.000000000 +0100 @@ -127,7 +127,7 @@ struct sockaddr_in6 *t_addr6; /* Parse the arguments. */ - while ((c = getopt(argc, argv, ":H:L:P:h:p:c:d:lm:sx:X:o:M:r:Di:I:f:")) >= 0 ) { + while ((c = getopt(argc, argv, ":H:L:P:h:p:c:d:lm:sx:X:o:M:Di:I:f:")) >= 0 ) { switch (c) { case 'H': local_host = optarg; @@ -547,6 +547,8 @@ } /* receive_r () */ void server(int sk) { + int i; + if (max_msgsize > DEFAULT_MAX_WINDOW) { if (setsockopt(sk, IPPROTO_SCTP, SO_RCVBUF, &max_msgsize, sizeof(max_msgsize)) < 0) { @@ -555,7 +557,10 @@ } } - receive_r(sk); + for (i = 0; i < msg_cnt; i++) { + receive_r(sk); + DEBUG_PRINT(DEBUG_MIN, "count %d\n", i+1); + } } /* server() */ void * build_msg(int len) { @@ -670,11 +675,11 @@ { switch (pattern){ case STREAM_PATTERN_RANDOM: - state = rand() % (max_stream + 1); + state = rand() % max_stream; break; case STREAM_PATTERN_SEQUENTIAL: state = state + 1; - if (state > max_stream) + if (state >= max_stream) state = 0; break; } @@ -718,7 +723,7 @@ } /* client() */ void start_test(int role) { - int sk, pid; + int sk, pid, ret; int i = 0; DEBUG_PRINT(DEBUG_NONE, "\nStarting tests...\n"); @@ -740,6 +745,22 @@ listen_r(sk, 1); accept_r(sk); } else { + if (max_stream > 0) { + struct sctp_initmsg initmsg; + + memset(&initmsg, 0, sizeof(initmsg)); + initmsg.sinit_num_ostreams = max_stream; + initmsg.sinit_max_instreams = max_stream; + initmsg.sinit_max_attempts = 3; + + ret = setsockopt(sk, IPPROTO_SCTP, SCTP_INITMSG, + &initmsg, sizeof(initmsg)); + if (ret < 0) { + perror("setsockopt(SCTP_INITMSG)"); + exit(0); + } + } + connect_r(sk, (struct sockaddr *)&s_rem, r_len); } @@ -812,6 +833,7 @@ fprintf(stderr, "\t-c value = Packets of specifed size.\n"); fprintf(stderr, "\t-m msgsize(1500-65515, default value 32768)\n"); fprintf(stderr, "\t-x number of repeats\n"); + fprintf(stderr, "\t-X number of messages\n"); fprintf(stderr, "\t-o order-pattern\n"); fprintf(stderr, "\t 0 = all unordered(default) \n"); fprintf(stderr, "\t 1 = all ordered \n"); @@ -819,6 +841,7 @@ fprintf(stderr, "\t 3 = random\n"); fprintf(stderr, "\t-M max-stream (default value 0)\n"); fprintf(stderr, "\t-D drain. If in client mode do a read following send.\n"); + fprintf(stderr, "\t-I receive after <n> times of send, default value 1.\n"); fprintf(stderr, "\n"); fflush(stderr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/apps/sctp_test.c new/lksctp-tools-1.0.16/src/apps/sctp_test.c --- old/lksctp-tools-1.0.15/src/apps/sctp_test.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/apps/sctp_test.c 2014-02-18 11:42:49.000000000 +0100 @@ -48,7 +48,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <string.h> @@ -552,7 +551,7 @@ if (NULL != hst4) { for (j = 0; j < i4; ++j) { b4ap = (struct sockaddr_in *)aptr; - bzero(b4ap, sizeof(*b4ap)); + memset(b4ap, 0x00, sizeof(*b4ap)); b4ap->sin_family = AF_INET; b4ap->sin_port = htons(local_port); bcopy(hst4->h_addr_list[j], &b4ap->sin_addr, @@ -565,7 +564,7 @@ if (NULL != hst6) { for (j = 0; j < i6; ++j) { b6ap = (struct sockaddr_in6 *)aptr; - bzero(b6ap, sizeof(*b6ap)); + memset(b6ap, 0x00, sizeof(*b6ap)); b6ap->sin6_family = AF_INET6; b6ap->sin6_port = htons(local_port); b6ap->sin6_scope_id = if_index; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_accept_close.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_accept_close.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_accept_close.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_accept_close.c 2014-02-18 11:42:49.000000000 +0100 @@ -78,6 +78,8 @@ int sk,lstn_sk,clnt_sk[SK_MAX],acpt_sk,pf_class; int new_sk[SK_MAX],clnt2_sk[SK_MAX]; int error; + int fd, err_no = 0; + char filename[21]; struct sockaddr_in conn_addr,lstn_addr,acpt_addr; @@ -134,10 +136,19 @@ tst_resm(TPASS, "accept() with a bad socket descriptor - EBADF"); /*accept() TEST2: Invalid socket ENOTSOCK, Expected error*/ - error = accept(0, (struct sockaddr *) &acpt_addr, &len); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = accept(fd, (struct sockaddr *) &acpt_addr, &len); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "accept with invalid socket" - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "accept() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_addrs.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_addrs.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_addrs.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_addrs.c 2014-02-18 11:42:49.000000000 +0100 @@ -92,6 +92,8 @@ char * buffer_rcv; char incmsg[CMSG_SPACE(sizeof(sctp_cmsg_data_t))]; struct sockaddr *laddrs, *paddrs; + int fd, err_no = 0; + char filename[21]; struct sockaddr_in conn_addr,lstn_addr,acpt_addr; struct sockaddr_in *addr; @@ -176,10 +178,19 @@ "EBADF"); /*sctp_getladdrs() TEST2: Invalid socket, ENOTSOCK Expected error*/ - error = sctp_getladdrs(0, 0, &laddrs); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = sctp_getladdrs(fd, 0, &laddrs); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "sctp_getladdrs with invalid socket " - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "sctp_getladdrs() with invalid socket - ENOTSOCK"); @@ -225,10 +236,19 @@ "EBADF"); /*sctp_getpaddrs() TEST7: Invalid socket, ENOTSOCK Expected error*/ - error = sctp_getpaddrs(0, 0, &paddrs); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = sctp_getpaddrs(fd, 0, &paddrs); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "sctp_getpaddrs with invalid socket " - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "sctp_getpaddrs() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_connect.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_connect.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_connect.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_connect.c 2014-02-18 11:42:49.000000000 +0100 @@ -54,7 +54,7 @@ #include <linux/socket.h> #include <netinet/in.h> /* for sockaddr_in */ #include <arpa/inet.h> -#include <sys/errno.h> +#include <errno.h> #include <sys/uio.h> #include <netinet/sctp.h> #include "sctputil.h" @@ -72,6 +72,8 @@ socklen_t len; int sk,lstn_sk,clnt_sk[SK_MAX],acpt_sk[SK_MAX],pf_class; int sk1,clnt2_sk; + int fd, err_no = 0; + char filename[21]; struct sockaddr_in conn_addr,lstn_addr,acpt_addr; @@ -120,10 +122,19 @@ tst_resm(TPASS, "connect() with bad socket descriptor - EBADF"); /*connect () TEST2: Invalid socket, ENOTSOCK Expected error*/ - error = connect(0, (const struct sockaddr *) &conn_addr, len); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = connect(fd, (const struct sockaddr *) &conn_addr, len); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "connect with invalid socket " - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "connect() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_connectx.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_connectx.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_connectx.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_connectx.c 2014-02-18 11:42:49.000000000 +0100 @@ -54,7 +54,7 @@ #include <linux/socket.h> #include <netinet/in.h> /* for sockaddr_in */ #include <arpa/inet.h> -#include <sys/errno.h> +#include <errno.h> #include <sys/uio.h> #include <netinet/sctp.h> #include "sctputil.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_recvfrom.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_recvfrom.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_recvfrom.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_recvfrom.c 2014-02-18 11:42:49.000000000 +0100 @@ -69,6 +69,8 @@ char *message = "hello, world!\n"; char *message_rcv; int count; + int fd, err_no = 0; + char filename[21]; struct sockaddr_in conn_addr,lstn_addr,svr_addr; @@ -122,11 +124,20 @@ tst_resm(TPASS, "recvfrom() with a bad socket descriptor - EBADF"); /*recvfrom () TEST2: Invalid socket , ENOTSOCK Expected error*/ - count = recvfrom(0, message_rcv, msg_count, flag, + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + count = recvfrom(fd, message_rcv, msg_count, flag, (struct sockaddr *)&svr_addr, &len); - if (count != -1 || errno != ENOTSOCK) + if (count == -1) + err_no = errno; + close(fd); + unlink(filename); + if (count != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "recvfrom with invalid socket " - "count:%d, errno:%d", count, errno); + "count:%d, errno:%d", count, err_no); tst_resm(TPASS, "recvfrom() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_recvmsg.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_recvmsg.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_recvmsg.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_recvmsg.c 2014-02-18 11:42:49.000000000 +0100 @@ -67,6 +67,8 @@ socklen_t len; int sk,pf_class,lstn_sk,acpt_sk; int flag = 0; + int fd, err_no = 0; + char filename[21]; struct msghdr inmessage; char *message = "hello, world!\n"; struct iovec iov_rcv; @@ -128,10 +130,19 @@ tst_resm(TPASS, "recvmsg() with a bad socket descriptor - EBADF"); /*recvmsg () TEST2: Invalid socket , ENOTSOCK Expected error*/ - count = recvmsg(0, &inmessage, flag); - if (count != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + count = recvmsg(fd, &inmessage, flag); + if (count == -1) + err_no = errno; + close(fd); + unlink(filename); + if (count != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "recvmsg with invalid socket " - "count:%d, errno:%d", count, errno); + "count:%d, errno:%d", count, err_no); tst_resm(TPASS, "recvmsg() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_rtoinfo.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_rtoinfo.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_rtoinfo.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_rtoinfo.c 2014-02-18 11:42:49.000000000 +0100 @@ -48,7 +48,7 @@ #include <linux/socket.h> #include <linux/in.h> /* for sockaddr_in */ #include <linux/in6.h> /* for sockaddr_in6 */ -#include <sys/errno.h> +#include <errno.h> #include <sys/uio.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_send.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_send.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_send.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_send.c 2014-02-18 11:42:49.000000000 +0100 @@ -69,6 +69,8 @@ int sk,sk1,pf_class,lstn_sk,acpt_sk,acpt1_sk, flag, count; char *message = "hello, world!\n"; char *message_rcv; + int fd, err_no = 0; + char filename[21]; struct sockaddr_in conn_addr,lstn_addr,svr_addr; @@ -118,10 +120,19 @@ tst_resm(TPASS, "send() with a bad socket descriptor - EBADF"); /*send () TEST2: Invalid socket, ENOTSOCK Expected error*/ - count = send(0, message, len_snd, flag); - if (count != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + count = send(fd, message, len_snd, flag); + if (count == -1) + err_no = errno; + close(fd); + unlink(filename); + if (count != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "send with invalid socket " - "count:%d, errno:%d", count, errno); + "count:%d, errno:%d", count, err_no); tst_resm(TPASS, "send() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_sendmsg.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_sendmsg.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_sendmsg.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_sendmsg.c 2014-02-18 11:42:49.000000000 +0100 @@ -86,6 +86,8 @@ struct sockaddr_in conn_addr,lstn_addr,svr_addr; struct iovec iov_rcv; char incmsg[CMSG_SPACE(sizeof(sctp_cmsg_data_t))]; + int fd, err_no = 0; + char filename[21]; /* Rather than fflush() throughout the code, set stdout to * be unbuffered. @@ -151,10 +153,19 @@ tst_resm(TPASS, "sendmsg() with a bad socket descriptor - EBADF"); /*sendmsg () TEST2: Invalid socket, ENOTSOCK Expected error*/ - count = sendmsg(0, &outmessage, flag); - if (count != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + count = sendmsg(fd, &outmessage, flag); + if (count == -1) + err_no = errno; + close(fd); + unlink(filename); + if (count != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "sendmsg with invalid socket " - "count:%d, errno:%d", count, errno); + "count:%d, errno:%d", count, err_no); tst_resm(TPASS, "sendmsg() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_shutdown.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_shutdown.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_shutdown.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_shutdown.c 2014-02-18 11:42:49.000000000 +0100 @@ -41,7 +41,7 @@ */ #include <stdio.h> -#include <sys/errno.h> +#include <errno.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -70,6 +70,8 @@ char *message = "hello, world!\n"; char msgbuf[100]; int pf_class; + int fd, err_no = 0; + char filename[21]; /* Rather than fflush() throughout the code, set stdout to * be unbuffered. @@ -112,10 +114,19 @@ tst_resm(TPASS, "shutdown() with a bad socket descriptor - EBADF"); /*shutdown() TEST2: Invalid socket, ENOTSOCK Expected error*/ - error = shutdown(0, SHUT_WR); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = shutdown(fd, SHUT_WR); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "shutdown with an invalid socket " - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "shutdown() with an invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_socket_bind_listen.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_socket_bind_listen.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_socket_bind_listen.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_socket_bind_listen.c 2014-02-18 11:42:49.000000000 +0100 @@ -85,6 +85,8 @@ int sk,pf_class; int error = 0; int uid; + int fd, err_no = 0; + char filename[21]; struct sockaddr_in bind_addr; @@ -141,10 +143,19 @@ tst_resm(TPASS, "bind() with invalid address length - EINVAL"); /*bind() TEST6: Invalid socket descriptor, ENOTSOCK Expect Error*/ - error = bind(0, (struct sockaddr *) &bind_addr, sizeof(bind_addr)); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = bind(fd, (struct sockaddr *) &bind_addr, sizeof(bind_addr)); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "bind() with invalid socket " - "descriptor error:%d, errno:%d", error, errno); + "descriptor error:%d, errno:%d", error, err_no); tst_resm(TPASS, "bind() with invalid socket descriptor - ENOTSOCK"); @@ -247,10 +258,19 @@ tst_resm(TPASS, "listen() with bad socket descriptor - EBADF"); /*listen() TEST14: Invalid socket ENOTSOCK, Expected error*/ - error = listen(0, 3); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = listen(fd, 3); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "listen() with invalid socket " - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "listen() with invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_sockopt.c new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_sockopt.c --- old/lksctp-tools-1.0.15/src/func_tests/test_1_to_1_sockopt.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_1_to_1_sockopt.c 2014-02-18 11:42:49.000000000 +0100 @@ -98,6 +98,8 @@ struct sctp_prim sprimaddr;/*SCTP_PRIMARY_ADDR set*/ struct sctp_assocparams sassocparams; /* SCTP_ASSOCPARAMS set */ struct sctp_assocparams gassocparams; /* SCTP_ASSOCPARAMS get */ + int fd, err_no = 0; + char filename[21]; /* Rather than fflush() throughout the code, set stdout to * be unbuffered. @@ -118,10 +120,19 @@ tst_resm(TPASS, "setsockopt() with a bad socket descriptor - EBADF"); /*setsockopt() TEST2: Invalid socket ENOTSOCK, Expected error*/ - error = setsockopt(0, IPPROTO_SCTP, 0, 0, 0); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = setsockopt(fd, IPPROTO_SCTP, 0, 0, 0); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "setsockopt with an invalid socket " - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "setsockopt() with an invalid socket - ENOTSOCK"); @@ -159,10 +170,19 @@ tst_resm(TPASS, "getsockopt() with a bad socket descriptor - EBADF"); /*getsockopt() TEST7: Invalid socket ENOTSOCK, Expected error*/ - error = getsockopt(0, IPPROTO_SCTP, 0, 0, 0); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = getsockopt(fd, IPPROTO_SCTP, 0, 0, 0); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "getsockopt with an invalid socket " - "error:%d, errno:%d", error, errno); + "error:%d, errno:%d", error, err_no); tst_resm(TPASS, "getsockopt() with an invalid socket - ENOTSOCK"); #if 0 @@ -299,7 +319,7 @@ tst_resm(TPASS, "getsockopt() SCTP_STATUS - SUCCESS"); /* Reducing the SO_RCVBUF value using setsockopt() */ - /*Minimum value is 128 and hence I am using it*/ + /* Upstream has changed the MIN_RCVBUF (2048 + sizeof(struct sk_buff)) */ len = sizeof(int); rcvbuf_val_set = 2048; /* TEST16: Test case for setsockopt SO_RCVBUF */ @@ -320,7 +340,7 @@ "got value differs Set Value=%d Get Value=%d", (2*rcvbuf_val_set), rcvbuf_val_get); - sndbuf_val_set = 2048; + sndbuf_val_set = 2304; /* TEST17: Test case for setsockopt SO_SNDBUF */ error = setsockopt(sk2, SOL_SOCKET, SO_SNDBUF, &sndbuf_val_set, len); if (error < 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_assoc_abort.c new/lksctp-tools-1.0.16/src/func_tests/test_assoc_abort.c --- old/lksctp-tools-1.0.15/src/func_tests/test_assoc_abort.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_assoc_abort.c 2014-02-18 11:42:49.000000000 +0100 @@ -49,7 +49,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_assoc_shutdown.c new/lksctp-tools-1.0.16/src/func_tests/test_assoc_shutdown.c --- old/lksctp-tools-1.0.15/src/func_tests/test_assoc_shutdown.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_assoc_shutdown.c 2014-02-18 11:42:49.000000000 +0100 @@ -48,7 +48,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_autoclose.c new/lksctp-tools-1.0.16/src/func_tests/test_autoclose.c --- old/lksctp-tools-1.0.15/src/func_tests/test_autoclose.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_autoclose.c 2014-02-18 11:42:49.000000000 +0100 @@ -49,7 +49,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_basic.c new/lksctp-tools-1.0.16/src/func_tests/test_basic.c --- old/lksctp-tools-1.0.15/src/func_tests/test_basic.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_basic.c 2014-02-18 11:42:49.000000000 +0100 @@ -52,7 +52,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_fragments.c new/lksctp-tools-1.0.16/src/func_tests/test_fragments.c --- old/lksctp-tools-1.0.15/src/func_tests/test_fragments.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_fragments.c 2014-02-18 11:42:49.000000000 +0100 @@ -60,7 +60,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_getname.c new/lksctp-tools-1.0.16/src/func_tests/test_getname.c --- old/lksctp-tools-1.0.15/src/func_tests/test_getname.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_getname.c 2014-02-18 11:42:49.000000000 +0100 @@ -66,6 +66,8 @@ socklen_t len; int error; int pf_class; + int fd, err_no = 0; + char filename[21]; /* Rather than fflush() throughout the code, set stdout to * be unbuffered. @@ -89,7 +91,7 @@ svr_sk = test_socket(pf_class, SOCK_STREAM, IPPROTO_SCTP); test_bind(svr_sk, &svr_loop.sa, sizeof(svr_loop)); - bzero(&svr_local_addr, sizeof(svr_local_addr)); + memset(&svr_local_addr, 0x00, sizeof(svr_local_addr)); len = sizeof(svr_local_addr); /* Verify that getsockname() on an unconnected socket works fine. */ error = getsockname(svr_sk, (struct sockaddr *)&svr_local_addr, &len); @@ -98,7 +100,7 @@ tst_resm(TPASS, "getsockname on an unconnected socket"); - bzero(&svr_peer_addr, sizeof(svr_peer_addr)); + memset(&svr_peer_addr, 0x00, sizeof(svr_peer_addr)); len = sizeof(svr_peer_addr); /* Verify that getpeername() on an unconnected socket fails. */ error = getpeername(svr_sk, (struct sockaddr *)&svr_peer_addr, &len); @@ -122,7 +124,7 @@ #endif test_connect(clt_sk, &svr_loop.sa, sizeof(svr_loop)); - bzero(&clt_local_addr, sizeof(clt_local_addr)); + memset(&clt_local_addr, 0x00, sizeof(clt_local_addr)); len = sizeof(clt_local_addr); /* Get the client's local address. */ error = getsockname(clt_sk, (struct sockaddr *)&clt_local_addr, &len); @@ -132,7 +134,7 @@ tst_resm(TPASS, "getsockname on a connected client socket"); - bzero(&clt_peer_addr, sizeof(clt_peer_addr)); + memset(&clt_peer_addr, 0x00, sizeof(clt_peer_addr)); len = sizeof(clt_peer_addr); /* Get the client's peer address. */ error = getpeername(clt_sk, (struct sockaddr *)&clt_peer_addr, &len); @@ -146,7 +148,7 @@ len = sizeof(accept_loop); accept_sk = test_accept(svr_sk, &accept_loop.sa, &len); - bzero(&svr_local_addr, sizeof(svr_local_addr)); + memset(&svr_local_addr, 0x00, sizeof(svr_local_addr)); len = sizeof(svr_local_addr); /* Get the server's local address. */ error = getsockname(accept_sk, (struct sockaddr *)&svr_local_addr, @@ -157,7 +159,7 @@ tst_resm(TPASS, "getsockname on a connected server socket"); - bzero(&svr_peer_addr, sizeof(svr_peer_addr)); + memset(&svr_peer_addr, 0x00, sizeof(svr_peer_addr)); len = sizeof(svr_peer_addr); /* Get the server's peer address. */ error = getpeername(accept_sk, (struct sockaddr *)&svr_peer_addr, @@ -197,7 +199,7 @@ #endif tst_resm(TPASS, "getsockname/getpeername server/client match"); - bzero(&clt_local_addr, sizeof(clt_local_addr)); + memset(&clt_local_addr, 0x00, sizeof(clt_local_addr)); len = sizeof(clt_local_addr); /*getsockname(): Bad socket descriptor, EBADF expected error*/ error = getsockname(-1, (struct sockaddr *)&clt_local_addr, &len); @@ -208,10 +210,19 @@ tst_resm(TPASS, "getsockname on a bad socket descriptor - EBADF"); /*getsockname(): Invalid socket, ENOTSOCK expected error*/ - error = getsockname(0, (struct sockaddr *)&clt_local_addr, &len); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = getsockname(fd, (struct sockaddr *)&clt_local_addr, &len); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "getsockname on an invalid socket " - "error:%d errno:%d", error, errno); + "error:%d errno:%d", error, err_no); tst_resm(TPASS, "getsockname on an invalid socket - ENOTSOCK"); @@ -223,7 +234,7 @@ tst_resm(TPASS, "getsockname with invalid buffer - EFAULT"); - bzero(&clt_peer_addr, sizeof(clt_peer_addr)); + memset(&clt_peer_addr, 0x00, sizeof(clt_peer_addr)); len = sizeof(clt_peer_addr); /*getpeername(): Bad socket descriptor, EBADF expected error*/ error = getpeername(-1, (struct sockaddr *)&clt_local_addr, &len); @@ -234,10 +245,19 @@ tst_resm(TPASS, "getpeername on a bad socket descriptor - EBADF"); /*getpeername(): Invalid socket, ENOTSOCK expected error*/ - error = getpeername(0, (struct sockaddr *)&clt_local_addr, &len); - if (error != -1 || errno != ENOTSOCK) + strcpy(filename, "/tmp/sctptest.XXXXXX"); + fd = mkstemp(filename); + if (fd == -1) + tst_brkm(TBROK, tst_exit, "Failed to mkstemp %s: %s", + filename, strerror(errno)); + error = getpeername(fd, (struct sockaddr *)&clt_local_addr, &len); + if (error == -1) + err_no = errno; + close(fd); + unlink(filename); + if (error != -1 || err_no != ENOTSOCK) tst_brkm(TBROK, tst_exit, "getpeername on an invalid socket " - "error:%d errno:%d", error, errno); + "error:%d errno:%d", error, err_no); tst_resm(TPASS, "getpeername on an invalid socket - ENOTSOCK"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_sctp_sendrecvmsg.c new/lksctp-tools-1.0.16/src/func_tests/test_sctp_sendrecvmsg.c --- old/lksctp-tools-1.0.15/src/func_tests/test_sctp_sendrecvmsg.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_sctp_sendrecvmsg.c 2014-02-18 11:42:49.000000000 +0100 @@ -50,7 +50,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> @@ -143,7 +142,6 @@ /* * Set the RWND small so we can fill it up easily. - * then reset RCVBUF to avoid frame droppage */ len = sizeof(int); error = getsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &oldlen, &len); @@ -187,14 +185,6 @@ SCTP_ASSOC_CHANGE, SCTP_COMM_UP); - /* restore the rcvbuffer size for the receiving socket */ - error = setsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &oldlen, - sizeof(oldlen)); - - if (error) - tst_brkm(TBROK, tst_exit, "setsockopt(SO_RCVBUF): %s", - strerror(errno)); - /* Get the communication up message on sk1. */ buflen = REALLY_BIG; msgname_len = sizeof(msgname); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_sockopt.c new/lksctp-tools-1.0.16/src/func_tests/test_sockopt.c --- old/lksctp-tools-1.0.15/src/func_tests/test_sockopt.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_sockopt.c 2014-02-18 11:42:49.000000000 +0100 @@ -52,7 +52,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/uio.h> -#include <sys/errno.h> +#include <errno.h> #include <netinet/in.h> #include <netinet/sctp.h> #include <sctputil.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/func_tests/test_timetolive.c new/lksctp-tools-1.0.16/src/func_tests/test_timetolive.c --- old/lksctp-tools-1.0.15/src/func_tests/test_timetolive.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/func_tests/test_timetolive.c 2014-02-18 11:42:49.000000000 +0100 @@ -64,7 +64,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <netinet/sctp.h> #include <sctputil.h> @@ -173,10 +172,8 @@ * This code sets the associations RWND very small so we can * fill it. It does this by manipulating the rcvbuf as follows: * 1) Reduce the rcvbuf size on the socket - * 2) create an association so that we advertize rcvbuf/2 as + * 2) create an association so that we advertise rcvbuf/2 as * our initial rwnd - * 3) raise the rcvbuf value so that we don't drop data wile - * receiving later data */ len = SMALL_RCVBUF; error = setsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &len, @@ -240,14 +237,6 @@ sac = (struct sctp_assoc_change *)iov.iov_base; associd1 = sac->sac_assoc_id; - /* restore the rcvbuffer size for the receiving socket */ - error = setsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &orig_len, - sizeof(orig_len)); - - if (error) - tst_brkm(TBROK, tst_exit, "setsockopt(SO_RCVBUF): %s", - strerror(errno)); - /* Get the first data message which was sent. */ inmessage.msg_controllen = sizeof(incmsg); error = test_recvmsg(sk2, &inmessage, MSG_WAITALL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/lib/Makefile.am new/lksctp-tools-1.0.16/src/lib/Makefile.am --- old/lksctp-tools-1.0.15/src/lib/Makefile.am 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/lib/Makefile.am 2014-02-18 11:42:49.000000000 +0100 @@ -9,4 +9,4 @@ lib_LTLIBRARIES = libsctp.la libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c addrs.c sendmsg.c recvmsg.c Versions.map -libsctp_la_LDFLAGS = -version-info 1:15:0 -Wl,--version-script=$(srcdir)/Versions.map +libsctp_la_LDFLAGS = -version-info 1:16:0 -Wl,--version-script=$(srcdir)/Versions.map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/lib/connectx.c new/lksctp-tools-1.0.16/src/lib/connectx.c --- old/lksctp-tools-1.0.15/src/lib/connectx.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/lib/connectx.c 2014-02-18 11:42:49.000000000 +0100 @@ -179,7 +179,12 @@ return __connectx(fd, addrs, addrs_size, id); } -__asm__(".symver __sctp_connectx, sctp_connectx@"); -__asm__(".symver sctp_connectx_orig, sctp_connectx@VERS_1"); -__asm__(".symver sctp_connectx2, sctp_connectx@VERS_2"); -__asm__(".symver sctp_connectx3, sctp_connectx@@VERS_3"); +#define __SYMPFX(pfx, sym) #pfx sym +#define _SYMPFX(pfx, sym) __SYMPFX(pfx, sym) +#define SYMPFX(sym) _SYMPFX(__USER_LABEL_PREFIX__, #sym) +#define SYMVER(name, name2) __asm__(".symver " SYMPFX(name) "," SYMPFX(name2)) + +SYMVER(__sctp_connectx, sctp_connectx@); +SYMVER(sctp_connectx_orig, sctp_connectx@VERS_1); +SYMVER(sctp_connectx2, sctp_connectx@VERS_2); +SYMVER(sctp_connectx3, sctp_connectx@@VERS_3); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/testlib/sctputil.c new/lksctp-tools-1.0.16/src/testlib/sctputil.c --- old/lksctp-tools-1.0.15/src/testlib/sctputil.c 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/testlib/sctputil.c 2014-02-18 11:42:49.000000000 +0100 @@ -42,14 +42,12 @@ */ #include <stdio.h> -#include <errno.h> #include <ctype.h> #include <string.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/uio.h> #include <netinet/in.h> -#include <sys/errno.h> #include <errno.h> #include <malloc.h> #include <netinet/sctp.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/withsctp/Makefile.am new/lksctp-tools-1.0.16/src/withsctp/Makefile.am --- old/lksctp-tools-1.0.15/src/withsctp/Makefile.am 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/withsctp/Makefile.am 2014-02-18 11:42:49.000000000 +0100 @@ -14,7 +14,7 @@ pkglib_LTLIBRARIES = libwithsctp.la libwithsctp_la_SOURCES = sctp_load_libs.c sctp_socket.c sctp_bind.c \ sctp_sockopt.c sctp_socket.h -libwithsctp_la_LDFLAGS = -version-info 1:15:0 -ldl +libwithsctp_la_LDFLAGS = -version-info 1:16:0 -ldl pkgdoc_DATA = sctp_load_libs.c sctp_socket.c sctp_bind.c \ sctp_sockopt.c sctp_socket.h checksctp.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.15/src/withsctp/withsctp.in new/lksctp-tools-1.0.16/src/withsctp/withsctp.in --- old/lksctp-tools-1.0.15/src/withsctp/withsctp.in 2013-05-12 11:06:13.000000000 +0200 +++ new/lksctp-tools-1.0.16/src/withsctp/withsctp.in 2014-02-18 11:42:49.000000000 +0100 @@ -2,7 +2,7 @@ # -*- sh -*- LIBDIR=@libdir@/@PACKAGE@ BINDIR=@bindir@ -export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.15 +export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.16 if ! ${BINDIR}/checksctp 2> /dev/null then ${BINDIR}/checksctp; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
