Hello community, here is the log from the commit of package lksctp-tools for openSUSE:Factory checked in at 2013-01-29 06:59:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lksctp-tools (Old) and /work/SRC/openSUSE:Factory/.lksctp-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lksctp-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/lksctp-tools/lksctp-tools.changes 2013-01-22 18:18:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lksctp-tools.new/lksctp-tools.changes 2013-01-29 06:59:18.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Jan 26 11:01:29 UTC 2013 - [email protected] + +- upgraded to 1.0.13 (bugfixes) + T:BUILD Use silent rules + T:BUILD Fix build warnings all over the place + T:APP Fix memory leak in sctp_xconnect + T:TEST Fix deprecated values in test cases +- lskctp-fixes.patch: implicit warning fix + +------------------------------------------------------------------- Old: ---- lksctp-tools-1.0.12.tar.gz New: ---- lksctp-fixes.patch lksctp-tools-1.0.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lksctp-tools.spec ++++++ --- /var/tmp/diff_new_pack.Wf9K8S/_old 2013-01-29 06:59:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Wf9K8S/_new 2013-01-29 06:59:19.000000000 +0100 @@ -20,10 +20,11 @@ Summary: Utilities for SCTP (Stream Control Transmission Protocol) License: LGPL-2.1+ Group: Productivity/Networking/Other -Version: 1.0.12 +Version: 1.0.13 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 @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p1 %build autoreconf --force --install @@ -58,7 +60,7 @@ %configure --prefix=/usr \ --enable-shared \ --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT ++++++ lksctp-fixes.patch ++++++ Index: lksctp-tools-1.0.13/src/withsctp/checksctp.c =================================================================== --- lksctp-tools-1.0.13.orig/src/withsctp/checksctp.c +++ lksctp-tools-1.0.13/src/withsctp/checksctp.c @@ -30,6 +30,7 @@ */ #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #include <sys/socket.h> #include <netinet/in.h> ++++++ lksctp-tools-1.0.12.tar.gz -> lksctp-tools-1.0.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/AUTHORS new/lksctp-tools-1.0.13/AUTHORS --- old/lksctp-tools-1.0.12/AUTHORS 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/AUTHORS 2013-01-23 15:27:55.000000000 +0100 @@ -1,36 +1,36 @@ - The initial developer and founder of the project: ------------------------------------------------- La Monte H.P. Yarroll <[email protected]> Current Maintainer: ------------------- -Sridhar Samudrala <[email protected]> +Vlad Yasevich <[email protected]> +Daniel Borkmann <[email protected]> Previous Maintainers: -------------------- +Sridhar Samudrala <[email protected]> Jon Grimm <[email protected]> Contributors: ------------- Karl Knutson <[email protected]> - Xingang Guo <[email protected]> - Daisy Chang <[email protected]> - Inaky Perez-Gonzalez <[email protected]> - Hui Huang <[email protected]> - Dajiang Zhang <[email protected]> - Ryan Layer <[email protected]> - Francois-Xavier Kowalski <[email protected]> - -Vlad Yasevich <[email protected]> - -Frank Filz <[email protected]> +Frank Filz <[email protected]> +Ivan Skytte Jorgensen <[email protected]> +Neil Horman <[email protected]> +Michael Biebl <[email protected]> +Wei Yongjun <[email protected]> +Sam Miller <[email protected]> +Andrei Pelinescu-Onciul <[email protected]> +Michele Baldessari <[email protected]> +Michael Tuexen <[email protected]> +Fan Du <[email protected]> Are you missing? drop us a line! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/ChangeLog new/lksctp-tools-1.0.13/ChangeLog --- old/lksctp-tools-1.0.12/ChangeLog 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/ChangeLog 2013-01-23 15:27:55.000000000 +0100 @@ -1,9 +1,15 @@ -Version 1.0.12 of the Developers' Release of the SCTP +Version 1.0.13 of the Developers' Release of the SCTP Linux Kernel Implementation is available from http://www.kernel.org +lksctp-1.0.13: Wed Jan 23 12:13 EDT 2013 +T:BUILD Use silent rules +T:BUILD Fix build warnings all over the place +T:APP Fix memory leak in sctp_xconnect +T:TEST Fix deprecated values in test cases + lksctp-1.0.12: Tue Jan 08 10:45 EDT 2013 T:API Add needed definitions for DTLS/SCTP. T:API Fix data corruption in sctp_send @@ -14,6 +20,7 @@ T:API Obsolete interefaces have been removed T:API Suport for SCTP_SACK_IMMEDIATELY options T:API Support for non-blocking sctp-connectx + lksctp-2.6.28-1.0.11: Wed Oct 21 16:53:41 EDT 2009 T:BUILD fix parallel build warning T:BUILD fix make distcheck for lksctp-tools @@ -37,6 +44,7 @@ T:API Let sctp_recvmsg() honor passed in MSG_ flags K: See kernel change log for details. We'll track only tools changes here from now on. + lksctp-2.6.26-1.0.9: Sun Jul 13 14:51:29 PDT 2008 T:Patch Make frame tests work with 2.6.26 kernel. T:Patch Implement and export SCTP-AUTH API extensions based on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/configure.in new/lksctp-tools-1.0.13/configure.in --- old/lksctp-tools-1.0.12/configure.in 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/configure.in 2013-01-23 15:27:55.000000000 +0100 @@ -15,10 +15,11 @@ AC_INIT([src/apps/sctp_darn.c]) AC_CONFIG_AUX_DIR(bin) -AM_INIT_AUTOMAKE(lksctp-tools,1.0.12) +AM_INIT_AUTOMAKE(lksctp-tools,1.0.13) AC_CONFIG_SRCDIR([config.h.in]) AM_CONFIG_HEADER([config.h]) AC_REVISION($Revision: 1.1.1.2 $) +AM_SILENT_RULES([yes]) dnl Set defaults dnl CFLAGS="$CFLAGS -g -Wall" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/lksctp-tools.spec.in new/lksctp-tools-1.0.13/lksctp-tools.spec.in --- old/lksctp-tools-1.0.12/lksctp-tools.spec.in 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/lksctp-tools.spec.in 2013-01-23 15:27:55.000000000 +0100 @@ -124,7 +124,10 @@ %doc doc/*.txt %changelog -* Tue Jan 08 2012 Vlad Yasevich <[email protected]> 1.0.12-1 +* Wed Jan 23 2013 Daniel Borkmann <[email protected]> 1.0.13-1 +- 1.0.13 Release + +* Tue Jan 08 2013 Vlad Yasevich <[email protected]> 1.0.12-1 - 1.0.12 Release * Wed Oct 21 2009 Vlad Yasevich <[email protected]> 1.0.11-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/Makefile.am new/lksctp-tools-1.0.13/src/apps/Makefile.am --- old/lksctp-tools-1.0.12/src/apps/Makefile.am 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/Makefile.am 2013-01-23 15:27:55.000000000 +0100 @@ -6,7 +6,7 @@ # General compilation flags INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib -AM_CFLAGS = -g -Wall -Wstrict-prototypes -Wimplicit-function-declaration +AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration AM_LDFLAGS = LDADD = $(top_builddir)/src/testlib/libsctputil.la \ $(top_builddir)/src/lib/libsctp.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/bindx_test.c new/lksctp-tools-1.0.13/src/apps/bindx_test.c --- old/lksctp-tools-1.0.12/src/apps/bindx_test.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/bindx_test.c 2013-01-23 15:27:55.000000000 +0100 @@ -66,13 +66,13 @@ cnt = 2; /* argument iterator */ buf_ptr = addr_buf; while (cnt < argc) { - printf("bindx_test: INFO: Arg %d: %s", cnt, argv[cnt]); + printf("bindx_test: INFO: Arg %zu: %s", cnt, argv[cnt]); fflush(stderr); if (strchr(argv[cnt], ':')) { struct sockaddr_in6 *sa6; sa6 = (struct sockaddr_in6 *)buf_ptr; - printf(" IPv6 address number %d", addrs); + printf(" IPv6 address number %zu", addrs); sa6->sin6_family = AF_INET6; sa6->sin6_port = port; if (inet_pton(AF_INET6, argv[cnt], &sa6->sin6_addr)) { @@ -85,7 +85,7 @@ struct sockaddr_in *sa; sa = (struct sockaddr_in *)buf_ptr; - printf (" IPv4 address number %d", addrs); + printf (" IPv4 address number %zu", addrs); sa->sin_family = AF_INET; sa->sin_port = port; if (inet_pton (AF_INET, argv[cnt], &sa->sin_addr)) { @@ -100,7 +100,7 @@ cnt++; } - printf ("bindx_test: INFO: Got %d addrs\n", addrs); + printf ("bindx_test: INFO: Got %zu addrs\n", addrs); /* Create the socket */ sd = socket(PF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/nagle_rcv.c new/lksctp-tools-1.0.13/src/apps/nagle_rcv.c --- old/lksctp-tools-1.0.12/src/apps/nagle_rcv.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/nagle_rcv.c 2013-01-23 15:27:55.000000000 +0100 @@ -81,8 +81,7 @@ struct iovec iov; struct msghdr inmessage; char incmsg[CMSG_SPACE(sizeof(sctp_cmsg_data_t))]; - int error; - int pf_class, af_family; + int error, pf_class; char *big_buffer; char *local_host = NULL; int local_port = SCTP_TESTPORT_1; @@ -161,7 +160,6 @@ exit(1); } pf_class = PF_INET6; - af_family = AF_INET6; host.v6.sin6_family = AF_INET6; memcpy(&host.v6.sin_addr, hst->h_addr_list[0], hst->h_length); @@ -174,7 +172,6 @@ exit(1); } pf_class = PF_INET; - af_family = AF_INET; host.v4.sin_family = AF_INET; memcpy(&host.v4.sin_addr, hst->h_addr_list[0], hst->h_length); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/nagle_snd.c new/lksctp-tools-1.0.13/src/apps/nagle_snd.c --- old/lksctp-tools-1.0.12/src/apps/nagle_snd.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/nagle_snd.c 2013-01-23 15:27:55.000000000 +0100 @@ -93,8 +93,7 @@ struct sctp_sndrcvinfo *sinfo; struct iovec out_iov; char *message; - int error, bytes_sent; - int pf_class, af_family; + int error, pf_class; sctp_assoc_t associd; uint32_t ppid; uint32_t stream; @@ -218,8 +217,6 @@ target.v6.sin6_port = htons(remote_port); pf_class = PF_INET6; - af_family = AF_INET6; - #else hst = gethostbyname(local_host); if (hst == NULL || hst->h_length < 1) { @@ -241,8 +238,6 @@ target.v4.sin_port = htons(remote_port); pf_class = PF_INET; - af_family = AF_INET; - #endif /* TEST_V6 */ sk = test_socket(pf_class, SOCK_SEQPACKET, IPPROTO_SCTP); @@ -292,7 +287,7 @@ remote_port); /* Send the first message. This will create the association. */ - bytes_sent = test_sendmsg(sk, &outmessage, 0, size+1); + test_sendmsg(sk, &outmessage, 0, size+1); memset(&inmessage, 0, sizeof(inmessage)); big_buffer = test_malloc(REALLY_BIG); @@ -351,7 +346,8 @@ outmessage.msg_iov->iov_base = message; outmessage.msg_iov->iov_len = size + 1; - bytes_sent = test_sendmsg(sk, &outmessage, 0, size+1); + + test_sendmsg(sk, &outmessage, 0, size+1); } printf("\n\n\t\tComplete all the data sendings to receiver...\n\n\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/peel_client.c new/lksctp-tools-1.0.13/src/apps/peel_client.c --- old/lksctp-tools-1.0.12/src/apps/peel_client.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/peel_client.c 2013-01-23 15:27:55.000000000 +0100 @@ -429,17 +429,13 @@ /* receive some number of datagrams and * act on them. */ - struct sctp_sndrcvinfo *s_info; - int sz,i,disped; + int sz; struct msghdr msg; struct iovec iov[2]; unsigned char from[200]; char readBuffer[65535]; char controlVector[65535]; - disped = i = 0; - - s_info = NULL; iov[0].iov_base = readBuffer; iov[0].iov_len = sizeof(readBuffer); iov[1].iov_base = NULL; @@ -453,7 +449,7 @@ errno = 0; sz = recvmsg(fd,&msg,0); if(sz <= 0){ - printf("Read returns %d errno:%d control len is %d msgflg:%x\n", + printf("Read returns %d errno:%d control len is %zu msgflg:%x\n", sz,errno, msg.msg_controllen,msg.msg_flags); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/peel_server.c new/lksctp-tools-1.0.13/src/apps/peel_server.c --- old/lksctp-tools-1.0.12/src/apps/peel_server.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/peel_server.c 2013-01-23 15:27:55.000000000 +0100 @@ -413,17 +413,13 @@ /* receive some number of datagrams and * act on them. */ - struct sctp_sndrcvinfo *s_info; - int i,disped; - struct iovec iov[2]; unsigned char from[200]; - disped = i = 0; memset(&msg,0,sizeof(msg)); memset(controlVector,0,sizeof(controlVector)); memset(readBuffer,0,sizeof(readBuffer)); - s_info = NULL; + iov[0].iov_base = readBuffer; iov[0].iov_len = maxread; iov[1].iov_base = NULL; @@ -436,7 +432,7 @@ msg.msg_controllen = sizeof(controlVector); errno = 0; sz = recvmsg(fd,&msg,0); - printf("Read fd:%d returns %d errno:%d control len is %d msgflg:%x\n", + printf("Read fd:%d returns %d errno:%d control len is %zu msgflg:%x\n", fd, sz,errno, msg.msg_controllen, @@ -456,24 +452,26 @@ poll_fd(int fd) { int cameup; - int max,notdone; + int max; fd_set readfds,writefds,exceptfds; struct timeval tv; + memset(&tv,0,sizeof(tv)); FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds); cameup = 0; max = fd + 1; - notdone = 1; + printf("poll_fd\n"); FD_SET(fd,&readfds); + select(max,&readfds,&writefds,&exceptfds,NULL); - notdone = 0; if(FD_ISSET(fd,&readfds)){ printf("Read please\n"); cameup += my_sctpReadInput(fd,4100); } + return(cameup); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/sctp_darn.c new/lksctp-tools-1.0.13/src/apps/sctp_darn.c --- old/lksctp-tools-1.0.12/src/apps/sctp_darn.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/sctp_darn.c 2013-01-23 15:27:55.000000000 +0100 @@ -54,7 +54,7 @@ //#define _GNU_SOURCE #include <getopt.h> #include <netdb.h> - +#include <inttypes.h> #include <ctype.h> #include <sys/types.h> #include <sys/socket.h> @@ -1378,7 +1378,7 @@ if (msg->msg_controllen != controllen) { fprintf(stderr, - "Got control structure of length %d, not %d\n", + "Got control structure of length %zu, not %d\n", msg->msg_controllen, controllen); exit(1); } @@ -1960,14 +1960,13 @@ struct sctp_setpeerprim setpeerprim; struct sockaddr_in *in_addr; struct sockaddr_in6 *in6_addr; - int peer_prim_len, ret; + int ret; char *p = cp; if (!set) { goto err; } - peer_prim_len = sizeof(struct sctp_setpeerprim); /* Set the buffer for address parsing. */ while ('\n' != *p) p++; @@ -2259,21 +2258,21 @@ return error; } - printf("Retransmitted Chunks: %llu\n", stats.sas_rtxchunks); - printf("Gap Acknowledgements Received: %llu\n", stats.sas_gapcnt); - printf("TSN received > next expected: %llu\n", stats.sas_outofseqtsns); - printf("SACKs sent: %llu\n", stats.sas_osacks); - printf("SACKs received: %llu\n", stats.sas_isacks); - printf("Control chunks sent : %llu\n", stats.sas_octrlchunks); - printf("Control chunks received : %llu\n", stats.sas_ictrlchunks); - printf("Ordered data chunks sent: %llu\n", stats.sas_oodchunks); - printf("Ordered data chunks received: %llu\n", stats.sas_iodchunks); - printf("Unordered data chunks sent: %llu\n", stats.sas_ouodchunks); - printf("Unordered data chunks received: %llu\n", stats.sas_iuodchunks); - printf("Dups received (ordered+unordered): %llu\n", stats.sas_idupchunks); - printf("Packets sent: %llu\n", stats.sas_opackets); - printf("Packets received: %llu\n", stats.sas_ipackets); - printf("Maximum Observed RTO this period: %llu - Transport: ", stats.sas_maxrto); + printf("Retransmitted Chunks: %" PRIu64 "\n", (uint64_t) stats.sas_rtxchunks); + printf("Gap Acknowledgements Received: %" PRIu64 "\n", (uint64_t) stats.sas_gapcnt); + printf("TSN received > next expected: %" PRIu64 "\n", (uint64_t) stats.sas_outofseqtsns); + printf("SACKs sent: %" PRIu64 "\n", (uint64_t) stats.sas_osacks); + printf("SACKs received: %" PRIu64 "\n", (uint64_t) stats.sas_isacks); + printf("Control chunks sent: %" PRIu64 "\n", (uint64_t) stats.sas_octrlchunks); + printf("Control chunks received: %" PRIu64 "\n", (uint64_t) stats.sas_ictrlchunks); + printf("Ordered data chunks sent: %" PRIu64 "\n", (uint64_t) stats.sas_oodchunks); + printf("Ordered data chunks received: %" PRIu64 "\n", (uint64_t) stats.sas_iodchunks); + printf("Unordered data chunks sent: %" PRIu64 "\n", (uint64_t) stats.sas_ouodchunks); + printf("Unordered data chunks received: %" PRIu64 "\n", (uint64_t) stats.sas_iuodchunks); + printf("Dups received (ordered+unordered): %" PRIu64 "\n", (uint64_t) stats.sas_idupchunks); + printf("Packets sent: %" PRIu64 "\n", (uint64_t) stats.sas_opackets); + printf("Packets received: %" PRIu64 "\n", (uint64_t) stats.sas_ipackets); + printf("Maximum Observed RTO this period: %" PRIu64 " - Transport: ", (uint64_t) stats.sas_maxrto); print_sockaddr((struct sockaddr *)&stats.sas_obs_rto_ipaddr); printf("\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/sctp_test.c new/lksctp-tools-1.0.13/src/apps/sctp_test.c --- old/lksctp-tools-1.0.12/src/apps/sctp_test.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/sctp_test.c 2013-01-23 15:27:55.000000000 +0100 @@ -341,9 +341,8 @@ if (!(MSG_NOTIFICATION & msg->msg_flags)) { int index = 0; - DEBUG_PRINT(DEBUG_MIN, "Data %d bytes.", msg_len); - - DEBUG_PRINT(DEBUG_MAX, " First %d bytes: ", + DEBUG_PRINT(DEBUG_MIN, "Data %zu bytes.", msg_len); + DEBUG_PRINT(DEBUG_MAX, " First %zu bytes: ", (msg_len < BODYSIZE)?msg_len:BODYSIZE); /* Make sure that everything is printable and that we * are NUL terminated... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/apps/sctp_xconnect.c new/lksctp-tools-1.0.13/src/apps/sctp_xconnect.c --- old/lksctp-tools-1.0.12/src/apps/sctp_xconnect.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/apps/sctp_xconnect.c 2013-01-23 15:27:55.000000000 +0100 @@ -73,6 +73,7 @@ sockaddr_storage_t client_loop, server_loop; struct hostent *hst; +char big_buffer[REALLY_BIG]; void usage(char *argv0); void parse_arguments(int argc, char*argv[]); @@ -380,13 +381,8 @@ int assoc_num =0; struct msghdr inmessage; struct iovec iov; - char *big_buffer; char incmsg[CMSG_SPACE(sizeof(sctp_cmsg_data_t))]; - if ((big_buffer = malloc(REALLY_BIG)) == NULL) { - printf("malloc failure: %s\n", strerror(errno)); - DUMP_CORE; - } printf("Running in Server Mode...\n"); @@ -530,15 +526,9 @@ int i, stream, error; struct msghdr inmessage; struct iovec iov; - char *big_buffer; char incmsg[CMSG_SPACE(sizeof (sctp_cmsg_data_t))]; sockaddr_storage_t msgname; - if ((big_buffer = malloc(REALLY_BIG)) == NULL) { - printf("malloc failure: %s\n", strerror(errno)); - DUMP_CORE; - } - /* Setup inmessage to be able to receive in incomming message */ memset(&inmessage, 0, sizeof (inmessage)); iov.iov_base = big_buffer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/Makefile.am new/lksctp-tools-1.0.13/src/func_tests/Makefile.am --- old/lksctp-tools-1.0.12/src/func_tests/Makefile.am 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/Makefile.am 2013-01-23 15:27:55.000000000 +0100 @@ -6,7 +6,7 @@ # General compilation flags INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib -AM_CFLAGS = -g -Wall -Wstrict-prototypes -Wimplicit-function-declaration +AM_CFLAGS = -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes -Wimplicit-function-declaration AM_LDFLAGS = -lpthread LDADD = $(top_builddir)/src/testlib/libsctputil.la \ $(top_builddir)/src/lib/libsctp.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_addrs.c new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_addrs.c --- old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_addrs.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_addrs.c 2013-01-23 15:27:55.000000000 +0100 @@ -79,18 +79,16 @@ { int error; socklen_t len; - int sk,lstn_sk,clnt_sk,acpt_sk,pf_class,sk1; + int lstn_sk,clnt_sk,acpt_sk,pf_class,sk1; struct msghdr outmessage; struct msghdr inmessage; char *message = "hello, world!\n"; - struct iovec iov; struct iovec iov_rcv; struct sctp_sndrcvinfo *sinfo; int msg_count; char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))]; struct cmsghdr *cmsg; struct iovec out_iov; - char * buffer_snd; char * buffer_rcv; char incmsg[CMSG_SPACE(sizeof(sctp_cmsg_data_t))]; struct sockaddr *laddrs, *paddrs; @@ -106,8 +104,6 @@ pf_class = PF_INET; - sk = test_socket(pf_class, SOCK_STREAM, IPPROTO_SCTP); - /*Creating a regular socket*/ clnt_sk = test_socket(pf_class, SOCK_STREAM, IPPROTO_SCTP); @@ -147,8 +143,6 @@ msg_count = strlen(message) + 1; memset(&outmessage, 0, sizeof(outmessage)); - buffer_snd = malloc(REALLY_BIG); - outmessage.msg_name = &lstn_addr; outmessage.msg_namelen = sizeof(lstn_addr); outmessage.msg_iov = &out_iov; @@ -165,11 +159,9 @@ sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg); memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo)); - iov.iov_base = buffer_snd; - iov.iov_len = REALLY_BIG; outmessage.msg_iov->iov_base = message; - outmessage.msg_iov->iov_len = msg_count; + test_sendmsg(clnt_sk, &outmessage, MSG_NOSIGNAL, msg_count); test_recvmsg(acpt_sk, &inmessage, MSG_NOSIGNAL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_nonblock.c new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_nonblock.c --- old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_nonblock.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_nonblock.c 2013-01-23 15:27:55.000000000 +0100 @@ -69,14 +69,11 @@ struct msghdr outmessage; struct msghdr inmessage; char *message = "hello, world!\n"; - struct iovec iov; struct iovec iov_rcv; struct sctp_sndrcvinfo *sinfo; - int count; char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))]; struct cmsghdr *cmsg; struct iovec out_iov; - char * buffer_snd; char * buffer_rcv; char incmsg[CMSG_SPACE(sizeof(sctp_cmsg_data_t))]; @@ -158,8 +155,6 @@ tst_resm(TPASS, "accept() after a non-blocking connect - SUCCESS"); memset(&outmessage, 0, sizeof(outmessage)); - buffer_snd = malloc(REALLY_BIG); - outmessage.msg_name = &svr_addr; outmessage.msg_namelen = sizeof(svr_addr); outmessage.msg_iov = &out_iov; @@ -176,10 +171,7 @@ sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg); memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo)); - iov.iov_base = buffer_snd; - iov.iov_len = REALLY_BIG; outmessage.msg_iov->iov_base = message; - outmessage.msg_iov->iov_len = strlen(message) + 1; memset(&inmessage, 0, sizeof(inmessage)); @@ -202,7 +194,7 @@ tst_resm(TPASS, "non-blocking recvmsg() - EAGAIN"); - count = test_sendmsg(acpt_sk, &outmessage, flag, msg_count); + test_sendmsg(acpt_sk, &outmessage, flag, msg_count); /* TEST5: recvmsg() should succeed now as data is available. */ error = test_recvmsg(sk, &inmessage, flag); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_recvfrom.c new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_recvfrom.c --- old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_recvfrom.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_recvfrom.c 2013-01-23 15:27:55.000000000 +0100 @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) { - int ret, msg_count; + int msg_count; socklen_t len; int sk,pf_class,lstn_sk,acpt_sk, flag; char *message = "hello, world!\n"; @@ -150,7 +150,7 @@ count = test_send(acpt_sk, message, msg_count, flag); - ret = test_shutdown(sk, SHUT_WR); + test_shutdown(sk, SHUT_WR); /*recvfrom () TEST5:reading on a socket that received SHUTDOWN*/ count = recvfrom(acpt_sk, message_rcv, msg_count, flag, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_recvmsg.c new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_recvmsg.c --- old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_recvmsg.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_recvmsg.c 2013-01-23 15:27:55.000000000 +0100 @@ -65,7 +65,6 @@ main(int argc, char *argv[]) { socklen_t len; - int ret; int sk,pf_class,lstn_sk,acpt_sk; int flag = 0; struct msghdr inmessage; @@ -165,7 +164,7 @@ count = test_send(acpt_sk, message1, strlen(message), 0); - ret = test_shutdown(sk, SHUT_WR); + test_shutdown(sk, SHUT_WR); flag = MSG_NOSIGNAL; /*recvmsg () TEST6:reading on a socket that received SHUTDOWN*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_sendmsg.c new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_sendmsg.c --- old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_sendmsg.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_sendmsg.c 2013-01-23 15:27:55.000000000 +0100 @@ -76,15 +76,12 @@ int sk,sk1,pf_class,lstn_sk,acpt_sk,acpt1_sk, flag; struct msghdr outmessage; char *message = "hello, world!\n"; - struct iovec iov; struct sctp_sndrcvinfo *sinfo; int count; char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))]; struct cmsghdr *cmsg; struct iovec out_iov; - char * buffer; struct msghdr inmessage; - char * buffer_snd; char * buffer_rcv; struct sockaddr_in conn_addr,lstn_addr,svr_addr; struct iovec iov_rcv; @@ -125,8 +122,6 @@ acpt_sk = test_accept(lstn_sk, (struct sockaddr *)&svr_addr, &len); memset(&outmessage, 0, sizeof(outmessage)); - buffer = malloc(REALLY_BIG); - outmessage.msg_name = &conn_addr; outmessage.msg_namelen = sizeof(conn_addr); outmessage.msg_iov = &out_iov; @@ -143,10 +138,7 @@ sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg); memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo)); - iov.iov_base = buffer; - iov.iov_len = REALLY_BIG; outmessage.msg_iov->iov_base = message; - outmessage.msg_iov->iov_len = strlen(message) + 1; flag = MSG_NOSIGNAL; @@ -279,8 +271,6 @@ acpt_sk = test_accept(lstn_sk, (struct sockaddr *)&svr_addr, &len); memset(&outmessage, 0, sizeof(outmessage)); - buffer_snd = malloc(REALLY_BIG); - outmessage.msg_name = &svr_addr; outmessage.msg_namelen = sizeof(svr_addr); outmessage.msg_iov = &out_iov; @@ -297,10 +287,7 @@ sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg); memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo)); - iov.iov_base = buffer_snd; - iov.iov_len = REALLY_BIG; outmessage.msg_iov->iov_base = message; - outmessage.msg_iov->iov_len = strlen(message) + 1; memset(&inmessage, 0, sizeof(inmessage)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_sockopt.c new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_sockopt.c --- old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_sockopt.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_sockopt.c 2013-01-23 15:27:55.000000000 +0100 @@ -301,7 +301,7 @@ /* Reducing the SO_RCVBUF value using setsockopt() */ /*Minimum value is 128 and hence I am using it*/ len = sizeof(int); - rcvbuf_val_set = 128; + rcvbuf_val_set = 2048; /* TEST16: Test case for setsockopt SO_RCVBUF */ error = setsockopt(sk2, SOL_SOCKET, SO_RCVBUF, &rcvbuf_val_set, len); if (error < 0) @@ -320,7 +320,7 @@ "got value differs Set Value=%d Get Value=%d", (2*rcvbuf_val_set), rcvbuf_val_get); - sndbuf_val_set=1024; + sndbuf_val_set = 2048; /* 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.12/src/func_tests/test_1_to_1_threads.c new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_threads.c --- old/lksctp-tools-1.0.12/src/func_tests/test_1_to_1_threads.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_1_to_1_threads.c 2013-01-23 15:27:55.000000000 +0100 @@ -90,14 +90,11 @@ t_send(int id) { struct msghdr outmessage; struct sctp_sndrcvinfo *sinfo; - char *buffer_snd; struct cmsghdr *cmsg; struct iovec out_iov; char outcmsg[CMSG_SPACE(sizeof(sctp_cmsg_data_t))]; memset(&outmessage, 0, sizeof(outmessage)); - buffer_snd = malloc(100); - outmessage.msg_name = &conn_addr; outmessage.msg_namelen = sizeof(conn_addr); outmessage.msg_iov = &out_iov; @@ -120,7 +117,10 @@ test_sendmsg(client_sk, &outmessage, 0, strlen(message)+1); } -void * relay (int id) { +void *relay(void *arg) +{ + int id = *(int *) arg; + if (id == 0) { t_send(id); } else if (id == THREADS -1) { @@ -130,9 +130,8 @@ t_send(id); } - return 0; + pthread_exit(NULL); } - int main(void) @@ -173,8 +172,7 @@ for ( i = 0; i < THREAD_SND_RCV_LOOPS; i++ ) { for (cnt = 1; cnt < THREADS; cnt++) { - status = pthread_create(&thread[cnt], &attr, - (void *)relay, (void*)cnt); + status = pthread_create(&thread[cnt], &attr, relay, &cnt); if (status) tst_brkm(TBROK, tst_exit, "pthread_create " "failed status:%d, errno:%d", status, @@ -194,5 +192,5 @@ tst_resm(TPASS, "send and receive data across multiple threads - " "SUCCESS"); - pthread_exit(NULL); + return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_autoclose.c new/lksctp-tools-1.0.13/src/func_tests/test_autoclose.c --- old/lksctp-tools-1.0.12/src/func_tests/test_autoclose.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_autoclose.c 2013-01-23 15:27:55.000000000 +0100 @@ -65,7 +65,7 @@ sockaddr_storage_t loop1, loop2; struct msghdr inmessage, outmessage; struct iovec iov, out_iov; - int error, bytes_sent; + int error; char *big_buffer; char *message = "hello, world!\n"; uint32_t autoclose; @@ -113,7 +113,8 @@ outmessage.msg_iovlen = 1; outmessage.msg_iov->iov_base = message; outmessage.msg_iov->iov_len = strlen(message) + 1; - bytes_sent = test_sendmsg(sk1, &outmessage, 0, strlen(message)+1); + + test_sendmsg(sk1, &outmessage, 0, strlen(message)+1); /* Initialize inmessage for all receives. */ big_buffer = test_malloc(REALLY_BIG); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_connect.c new/lksctp-tools-1.0.13/src/func_tests/test_connect.c --- old/lksctp-tools-1.0.12/src/func_tests/test_connect.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_connect.c 2013-01-23 15:27:55.000000000 +0100 @@ -58,12 +58,12 @@ main(int argc, char *argv[]) { int svr_sk, clt_sk1, clt_sk2, peeloff_sk; - sctp_assoc_t svr_associd1, svr_associd2, clt_associd1, clt_associd2; + sctp_assoc_t svr_associd1; sockaddr_storage_t svr_loop, clt_loop1, clt_loop2, clt_loop3; + struct sctp_assoc_change *sac; struct iovec iov; struct msghdr inmessage; int error; - struct sctp_assoc_change *sac; char *big_buffer; int flags; @@ -145,15 +145,17 @@ error = test_recvmsg(clt_sk1, &inmessage, MSG_WAITALL); test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), - SCTP_ASSOC_CHANGE, SCTP_COMM_UP); + SCTP_ASSOC_CHANGE, SCTP_COMM_UP); +#if 0 sac = (struct sctp_assoc_change *)iov.iov_base; clt_associd1 = sac->sac_assoc_id; +#endif /* Get COMM_UP on svr_sk */ error = test_recvmsg(svr_sk, &inmessage, MSG_WAITALL); test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), - SCTP_ASSOC_CHANGE, SCTP_COMM_UP); + SCTP_ASSOC_CHANGE, SCTP_COMM_UP); sac = (struct sctp_assoc_change *)iov.iov_base; svr_associd1 = sac->sac_assoc_id; @@ -167,17 +169,21 @@ error = test_recvmsg(clt_sk2, &inmessage, MSG_WAITALL); test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), - SCTP_ASSOC_CHANGE, SCTP_COMM_UP); + SCTP_ASSOC_CHANGE, SCTP_COMM_UP); +#if 0 sac = (struct sctp_assoc_change *)iov.iov_base; clt_associd2 = sac->sac_assoc_id; +#endif /* Get COMM_UP on svr_sk */ error = test_recvmsg(svr_sk, &inmessage, MSG_WAITALL); test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), - SCTP_ASSOC_CHANGE, SCTP_COMM_UP); + SCTP_ASSOC_CHANGE, SCTP_COMM_UP); +#if 0 sac = (struct sctp_assoc_change *)iov.iov_base; svr_associd2 = sac->sac_assoc_id; +#endif tst_resm(TPASS, "blocking connect"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_fragments.c new/lksctp-tools-1.0.13/src/func_tests/test_fragments.c --- old/lksctp-tools-1.0.12/src/func_tests/test_fragments.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_fragments.c 2013-01-23 15:27:55.000000000 +0100 @@ -86,11 +86,9 @@ struct sctp_sndrcvinfo *sinfo; struct iovec out_iov; int error, bytes_sent; - int pf_class, af_family; + int pf_class; uint32_t ppid; uint32_t stream; - sctp_assoc_t associd1, associd2; - struct sctp_assoc_change *sac; char *big_buffer; int msg_len, msg_cnt, i; void *msg_buf; @@ -105,7 +103,6 @@ /* Set some basic values which depend on the address family. */ #if TEST_V6 pf_class = PF_INET6; - af_family = AF_INET6; loop1.v6.sin6_family = AF_INET6; loop1.v6.sin6_addr = in6addr_loopback; @@ -116,7 +113,6 @@ loop2.v6.sin6_port = htons(SCTP_TESTPORT_2); #else pf_class = PF_INET; - af_family = AF_INET; loop1.v4.sin_family = AF_INET; loop1.v4.sin_addr.s_addr = SCTP_IP_LOOPBACK; @@ -182,19 +178,21 @@ error = test_recvmsg(sk2, &inmessage, MSG_WAITALL); test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), - SCTP_ASSOC_CHANGE, SCTP_COMM_UP); + SCTP_ASSOC_CHANGE, SCTP_COMM_UP); +#if 0 sac = (struct sctp_assoc_change *)iov.iov_base; associd2 = sac->sac_assoc_id; - +#endif /* Get the communication up message on sk1. */ inmessage.msg_controllen = sizeof(incmsg); error = test_recvmsg(sk1, &inmessage, MSG_WAITALL); test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), SCTP_ASSOC_CHANGE, SCTP_COMM_UP); +#if 0 sac = (struct sctp_assoc_change *)iov.iov_base; associd1 = sac->sac_assoc_id; - +#endif /* Get the first message which was sent. */ inmessage.msg_controllen = sizeof(incmsg); error = test_recvmsg(sk2, &inmessage, MSG_WAITALL); @@ -224,7 +222,7 @@ /* Try to send a messsage that exceeds association fragmentation point * and verify that it fails. */ - msg_len = 30000; + msg_len = 100000; msg_buf = test_build_msg(msg_len); outmessage.msg_iov->iov_base = msg_buf; outmessage.msg_iov->iov_len = msg_len; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_inaddr_any.c new/lksctp-tools-1.0.13/src/func_tests/test_inaddr_any.c --- old/lksctp-tools-1.0.12/src/func_tests/test_inaddr_any.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_inaddr_any.c 2013-01-23 15:27:55.000000000 +0100 @@ -79,7 +79,7 @@ char *telephone = "Watson, come here! I need you!\n"; char *telephone_resp = "I already brought your coffee...\n"; int error; - int pf_class, af_family; + int pf_class; uint32_t ppid; uint32_t stream; socklen_t namelen; @@ -92,7 +92,6 @@ /* Set some basic values which depend on the address family. */ #if TEST_V6 pf_class = PF_INET6; - af_family = AF_INET6; loop.v6.sin6_family = AF_INET6; loop.v6.sin6_addr = (struct in6_addr)SCTP_IN6ADDR_LOOPBACK_INIT; @@ -103,7 +102,6 @@ anyaddr.v6.sin6_port = 0; #else pf_class = PF_INET; - af_family = AF_INET; loop.v4.sin_family = AF_INET; loop.v4.sin_addr.s_addr = SCTP_IP_LOOPBACK; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_peeloff.c new/lksctp-tools-1.0.13/src/func_tests/test_peeloff.c --- old/lksctp-tools-1.0.12/src/func_tests/test_peeloff.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_peeloff.c 2013-01-23 15:27:55.000000000 +0100 @@ -62,7 +62,7 @@ main(int argc, char *argv[]) { int svr_sk, clt_sk[MAX_CLIENTS], peeloff_sk[MAX_CLIENTS]; - sctp_assoc_t svr_associd[MAX_CLIENTS], clt_associd[MAX_CLIENTS]; + sctp_assoc_t svr_associd[MAX_CLIENTS]; sockaddr_storage_t svr_loop, clt_loop[MAX_CLIENTS]; struct iovec iov; struct msghdr inmessage; @@ -167,9 +167,11 @@ error = test_recvmsg(clt_sk[i], &inmessage, MSG_WAITALL); test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), - SCTP_ASSOC_CHANGE, SCTP_COMM_UP); + SCTP_ASSOC_CHANGE, SCTP_COMM_UP); +#if 0 sac = (struct sctp_assoc_change *)iov.iov_base; clt_associd[i] = sac->sac_assoc_id; +#endif } /* Get the communication up message and the data message on the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_sctp_sendrecvmsg.c new/lksctp-tools-1.0.13/src/func_tests/test_sctp_sendrecvmsg.c --- old/lksctp-tools-1.0.12/src/func_tests/test_sctp_sendrecvmsg.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_sctp_sendrecvmsg.c 2013-01-23 15:27:55.000000000 +0100 @@ -77,7 +77,7 @@ sockaddr_storage_t loop2; sockaddr_storage_t msgname; int error; - int pf_class, af_family; + int pf_class; uint32_t ppid; uint32_t stream; struct sctp_event_subscribe subscribe; @@ -88,7 +88,7 @@ struct sctp_send_failed *ssf; struct sctp_sndrcvinfo sinfo; struct sctp_sndrcvinfo snd_sinfo; - sctp_assoc_t associd1, associd2; + sctp_assoc_t associd1; socklen_t len, oldlen; struct sctp_status gstatus; @@ -100,7 +100,6 @@ /* Set some basic values which depend on the address family. */ #if TEST_V6 pf_class = PF_INET6; - af_family = AF_INET6; loop1.v6.sin6_family = AF_INET6; loop1.v6.sin6_addr = in6addr_loopback; @@ -111,7 +110,6 @@ loop2.v6.sin6_port = htons(SCTP_TESTPORT_2); #else pf_class = PF_INET; - af_family = AF_INET; loop1.v4.sin_family = AF_INET; loop1.v4.sin_addr.s_addr = SCTP_IP_LOOPBACK; @@ -179,8 +177,10 @@ msgname_len = sizeof(msgname); error = test_sctp_recvmsg(sk2, big_buffer, buflen, (struct sockaddr *)&msgname, &msgname_len, - &sinfo, &msg_flags); + &sinfo, &msg_flags); +#if 0 associd2 = ((struct sctp_assoc_change *)big_buffer)->sac_assoc_id; +#endif test_check_buf_notification(big_buffer, error, msg_flags, sizeof(struct sctp_assoc_change), SCTP_ASSOC_CHANGE, SCTP_COMM_UP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_sockopt.c new/lksctp-tools-1.0.13/src/func_tests/test_sockopt.c --- old/lksctp-tools-1.0.12/src/func_tests/test_sockopt.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_sockopt.c 2013-01-23 15:27:55.000000000 +0100 @@ -78,7 +78,7 @@ struct iovec out_iov; char *message = "hello, world!\n"; int error; - int pf_class, af_family; + int pf_class; uint32_t ppid; uint32_t stream; sctp_assoc_t udp_svr_associd, udp_clt_associd; @@ -109,7 +109,6 @@ /* Set some basic values which depend on the address family. */ #if TEST_V6 pf_class = PF_INET6; - af_family = AF_INET6; udp_svr_loop.v6.sin6_family = AF_INET6; udp_svr_loop.v6.sin6_addr = in6addr_loopback; @@ -128,7 +127,6 @@ tcp_clt_loop.v6.sin6_port = htons(SCTP_TESTPORT_1+3); #else pf_class = PF_INET; - af_family = AF_INET; udp_svr_loop.v4.sin_family = AF_INET; udp_svr_loop.v4.sin_addr.s_addr = SCTP_IP_LOOPBACK; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/func_tests/test_timetolive.c new/lksctp-tools-1.0.13/src/func_tests/test_timetolive.c --- old/lksctp-tools-1.0.12/src/func_tests/test_timetolive.c 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/func_tests/test_timetolive.c 2013-01-23 15:27:55.000000000 +0100 @@ -101,10 +101,10 @@ struct sctp_sndrcvinfo *sinfo; struct iovec out_iov; int error; - int pf_class, af_family; + int pf_class; uint32_t ppid; uint32_t stream; - sctp_assoc_t associd1, associd2; + sctp_assoc_t associd1; struct sctp_assoc_change *sac; struct sctp_event_subscribe subscribe; char *big_buffer; @@ -122,7 +122,6 @@ /* Set some basic values which depend on the address family. */ #if TEST_V6 pf_class = PF_INET6; - af_family = AF_INET6; loop1.v6.sin6_family = AF_INET6; loop1.v6.sin6_addr = in6addr_loopback; @@ -133,7 +132,6 @@ loop2.v6.sin6_port = htons(SCTP_TESTPORT_2); #else pf_class = PF_INET; - af_family = AF_INET; loop1.v4.sin_family = AF_INET; loop1.v4.sin_addr.s_addr = SCTP_IP_LOOPBACK; @@ -228,8 +226,10 @@ test_check_msg_notification(&inmessage, error, sizeof(struct sctp_assoc_change), SCTP_ASSOC_CHANGE, SCTP_COMM_UP); +#if 0 sac = (struct sctp_assoc_change *)iov.iov_base; associd2 = sac->sac_assoc_id; +#endif /* Get the communication up message on sk1. */ inmessage.msg_controllen = sizeof(incmsg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/lib/Makefile.am new/lksctp-tools-1.0.13/src/lib/Makefile.am --- old/lksctp-tools-1.0.12/src/lib/Makefile.am 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/lib/Makefile.am 2013-01-23 15:27:55.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:12:0 -Wl,--version-script=$(srcdir)/Versions.map +libsctp_la_LDFLAGS = -version-info 1:13:0 -Wl,--version-script=$(srcdir)/Versions.map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/testlib/Makefile.am new/lksctp-tools-1.0.13/src/testlib/Makefile.am --- old/lksctp-tools-1.0.12/src/testlib/Makefile.am 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/testlib/Makefile.am 2013-01-23 15:27:55.000000000 +0100 @@ -9,4 +9,4 @@ noinst_LTLIBRARIES = libsctputil.la libsctputil_la_SOURCES = sctputil.c sctputil.h -libsctputil_la_LDFLAGS = -version-info 1:12:0 +libsctputil_la_LDFLAGS = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lksctp-tools-1.0.12/src/withsctp/Makefile.am new/lksctp-tools-1.0.13/src/withsctp/Makefile.am --- old/lksctp-tools-1.0.12/src/withsctp/Makefile.am 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/withsctp/Makefile.am 2013-01-23 15:27:55.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:12:0 -ldl +libwithsctp_la_LDFLAGS = -version-info 1:13: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.12/src/withsctp/withsctp.in new/lksctp-tools-1.0.13/src/withsctp/withsctp.in --- old/lksctp-tools-1.0.12/src/withsctp/withsctp.in 2013-01-08 16:58:57.000000000 +0100 +++ new/lksctp-tools-1.0.13/src/withsctp/withsctp.in 2013-01-23 15:27:55.000000000 +0100 @@ -2,7 +2,7 @@ # -*- sh -*- LIBDIR=@libdir@/@PACKAGE@ BINDIR=@bindir@ -export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.12 +export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.13 if ! ${BINDIR}/checksctp 2> /dev/null then ${BINDIR}/checksctp; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
