pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/iperf3 The release notes for iperf 3.1.6 describe ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/981e231ea1d8
branches: trunk
changeset: 359147:981e231ea1d8
user: adam <adam%pkgsrc.org@localhost>
date: Tue Feb 28 19:40:07 2017 +0000
description:
The release notes for iperf 3.1.6 describe changes, including bug
fixes and new functionality, made since iperf 3.1.5.
* User-visible changes
* Specifying --fq-rate or --no-fq-socket-pacing on a system where
these options are not supported now generate an error instead of a
warning. This change makes diagnosing issues related to pacing
more apparent.
* Fixed a bug where two recently-added diagnostic messages spammed
the JSON output on UDP tests.
diffstat:
net/iperf3/Makefile | 7 +-
net/iperf3/distinfo | 18 +--
net/iperf3/patches/patch-src_Makefile.in | 26 ++++++
net/iperf3/patches/patch-src_cjson.c | 15 ---
net/iperf3/patches/patch-src_iperf.h | 16 ---
net/iperf3/patches/patch-src_iperf__api.h | 14 ---
net/iperf3/patches/patch-src_iperf__locale.c | 18 ----
net/iperf3/patches/patch-src_iperf__server__api.c | 14 ---
net/iperf3/patches/patch-src_tcp__info.c | 93 -----------------------
net/iperf3/patches/patch-src_units.c | 15 ---
10 files changed, 36 insertions(+), 200 deletions(-)
diffs (289 lines):
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/Makefile
--- a/net/iperf3/Makefile Tue Feb 28 17:15:34 2017 +0000
+++ b/net/iperf3/Makefile Tue Feb 28 19:40:07 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/06/07 14:05:08 wiedi Exp $
+# $NetBSD: Makefile,v 1.4 2017/02/28 19:40:07 adam Exp $
-DISTNAME= iperf-3.0.11
+DISTNAME= iperf-3.1.6
PKGNAME= ${DISTNAME:S/iperf/iperf3/}
-PKGREVISION= 1
CATEGORIES= net benchmarks
MASTER_SITES= http://downloads.es.net/pub/iperf/
@@ -14,6 +13,8 @@
USE_LANGUAGES= c
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+# sctp_bindx() is in headers, but unusable
+CONFIGURE_ENV.NetBSD+= ac_cv_header_netinet_sctp_h=no
LDFLAGS.SunOS+= -lsocket -lnsl
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/distinfo
--- a/net/iperf3/distinfo Tue Feb 28 17:15:34 2017 +0000
+++ b/net/iperf3/distinfo Tue Feb 28 19:40:07 2017 +0000
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 00:35:05 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/02/28 19:40:07 adam Exp $
-SHA1 (iperf-3.0.11.tar.gz) = 35e31cc320e4f2264bf51f6ad1e7e0d81341135a
-RMD160 (iperf-3.0.11.tar.gz) = eb371c0879fad6f2068a279704d637123bbd9162
-SHA512 (iperf-3.0.11.tar.gz) = 91c4c8ef4630a86b69998b636f1a385dc1731dea1dc80b2160e64ace8ce7e72b2998a04a7e111fe48dbd12623f8de3987dc5a939d3435433b4a12113b23b07a4
-Size (iperf-3.0.11.tar.gz) = 424267 bytes
-SHA1 (patch-src_cjson.c) = b195f308ea6d7652a5fc65f1031e5642da2e611b
-SHA1 (patch-src_iperf.h) = 8997d314ca46f5af9cc162d28455b98a049e5851
-SHA1 (patch-src_iperf__api.h) = e84175a031c5dcde5ade975a3a63c5fad898bf97
-SHA1 (patch-src_iperf__locale.c) = eeb61cb4c8ed2ece42f346405219ec07b752df1e
-SHA1 (patch-src_iperf__server__api.c) = 124d2a57ad8d6694a4eea57366e9d88cc4b4a578
-SHA1 (patch-src_tcp__info.c) = 6f0dd37cefc69cfa41712972016ecb996830ef0a
-SHA1 (patch-src_units.c) = 95e1e22af16b4996f6ec0e39fc14d137425003a4
+SHA1 (iperf-3.1.6.tar.gz) = 55937ecf1bfeeb8121ff600c81395d73a2de6205
+RMD160 (iperf-3.1.6.tar.gz) = 9aa05a5e2fa47daaebc2fa64a2c402913fa0ea5a
+SHA512 (iperf-3.1.6.tar.gz) = f3081b9620f32f2dac3d3a2b99d5f58cfaf67fbcb8a660c0d1cfe3ce99e6836e1567b8582b68a6980f9348770bcf77cd938646c2a118ae936175e3f670285a2a
+Size (iperf-3.1.6.tar.gz) = 551000 bytes
+SHA1 (patch-src_Makefile.in) = 2b445e515a4e4a25e8338e0774f80465b9a19f0f
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/iperf3/patches/patch-src_Makefile.in Tue Feb 28 19:40:07 2017 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2017/02/28 19:40:07 adam Exp $
+
+Do not build test programs.
+
+--- src/Makefile.in.orig 2017-02-02 18:54:30.000000000 +0000
++++ src/Makefile.in
+@@ -146,7 +145,7 @@ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++PROGRAMS = $(bin_PROGRAMS)
+ am_iperf3_OBJECTS = iperf3-main.$(OBJEXT)
+ iperf3_OBJECTS = $(am_iperf3_OBJECTS)
+ iperf3_DEPENDENCIES = libiperf.la
+@@ -226,9 +225,7 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
+-SOURCES = $(libiperf_la_SOURCES) $(iperf3_SOURCES) \
+- $(iperf3_profile_SOURCES) $(t_timer_SOURCES) \
+- $(t_units_SOURCES) $(t_uuid_SOURCES)
++SOURCES = $(libiperf_la_SOURCES) $(iperf3_SOURCES)
+ DIST_SOURCES = $(libiperf_la_SOURCES) $(iperf3_SOURCES) \
+ $(iperf3_profile_SOURCES) $(t_timer_SOURCES) \
+ $(t_units_SOURCES) $(t_uuid_SOURCES)
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_cjson.c
--- a/net/iperf3/patches/patch-src_cjson.c Tue Feb 28 17:15:34 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_cjson.c,v 1.1 2015/02/02 12:25:20 he Exp $
-
-Avoid compiler warning for using signed chars with tolower().
-
---- src/cjson.c.orig 2015-01-09 17:44:11.000000000 +0000
-+++ src/cjson.c
-@@ -56,7 +56,7 @@ static int cJSON_strcasecmp( const char
- return ( s1 == s2 ) ? 0 : 1;
- if ( ! s2 )
- return 1;
-- for ( ; tolower(*s1) == tolower(*s2); ++s1, ++s2)
-+ for ( ; tolower((u_char)*s1) == tolower((u_char)*s2); ++s1, ++s2)
- if( *s1 == 0 )
- return 0;
- return tolower(*(const unsigned char *)s1) - tolower(*(const unsigned char *)s2);
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_iperf.h
--- a/net/iperf3/patches/patch-src_iperf.h Tue Feb 28 17:15:34 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_iperf.h,v 1.1 2015/02/07 17:11:23 he Exp $
-
-Add NetBSD support for tcp_info.
-
---- src/iperf.h.orig 2015-02-07 00:30:32.000000000 +0000
-+++ src/iperf.h
-@@ -55,7 +55,8 @@ struct iperf_interval_results
- int cnt_error;
-
- int omitted;
--#if defined(linux) || defined(__FreeBSD__)
-+#if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)) && \
-+ defined(TCP_INFO)
- struct tcp_info tcpInfo; /* getsockopt(TCP_INFO) for Linux and FreeBSD */
- #else
- /* Just placeholders, never accessed. */
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_iperf__api.h
--- a/net/iperf3/patches/patch-src_iperf__api.h Tue Feb 28 17:15:34 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_iperf__api.h,v 1.1 2015/02/02 12:25:20 he Exp $
-
-Include <sys/time.h> for struct timeval definition.
-
---- src/iperf_api.h.orig 2015-01-09 17:44:11.000000000 +0000
-+++ src/iperf_api.h
-@@ -27,6 +27,7 @@
- #ifndef __IPERF_API_H
- #define __IPERF_API_H
-
-+#include <sys/time.h>
- #include <setjmp.h>
-
- struct iperf_test;
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_iperf__locale.c
--- a/net/iperf3/patches/patch-src_iperf__locale.c Tue Feb 28 17:15:34 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_iperf__locale.c,v 1.1 2015/02/07 17:11:23 he Exp $
-
-Add NetBSD support for tcp_info.
-
---- src/iperf_locale.c.orig 2015-01-09 17:44:11.000000000 +0000
-+++ src/iperf_locale.c
-@@ -355,7 +355,10 @@ const char report_tcpInfo[] =
- const char report_tcpInfo[] =
- "event=TCP_Info CWND=%u RCV_WIND=%u SND_SSTHRESH=%u RTT=%u\n";
- #endif
--
-+#if defined(__NetBSD__)
-+const char report_tcpInfo[] =
-+"event=TCP_Info CWND=%u RCV_WIND=%u SND_SSTHRESH=%u RTT=%u\n";
-+#endif
-
- #ifdef HAVE_QUAD_SUPPORT
- #ifdef HAVE_PRINTF_QD
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_iperf__server__api.c
--- a/net/iperf3/patches/patch-src_iperf__server__api.c Tue Feb 28 17:15:34 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_iperf__server__api.c,v 1.1 2015/02/02 12:25:20 he Exp $
-
-Unused variable.
-
---- src/iperf_server_api.c.orig 2015-01-09 17:44:11.000000000 +0000
-+++ src/iperf_server_api.c
-@@ -128,7 +128,6 @@ iperf_accept(struct iperf_test *test)
- {
- int s;
- signed char rbuf = ACCESS_DENIED;
-- char cookie[COOKIE_SIZE];
- socklen_t len;
- struct sockaddr_storage addr;
-
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_tcp__info.c
--- a/net/iperf3/patches/patch-src_tcp__info.c Tue Feb 28 17:15:34 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-$NetBSD: patch-src_tcp__info.c,v 1.1 2015/02/07 17:11:23 he Exp $
-
-Add NetBSD support, conditional on TCP_INFO.
-
---- src/tcp_info.c.orig 2015-01-09 17:44:11.000000000 +0000
-+++ src/tcp_info.c
-@@ -62,7 +62,8 @@
- int
- has_tcpinfo(void)
- {
--#if defined(linux) || defined(__FreeBSD__)
-+#if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)) \
-+ && defined(TCP_INFO)
- return 1;
- #else
- return 0;
-@@ -82,8 +83,9 @@ has_tcpinfo_retransmits(void)
- return 1;
- #else
- #if defined(__FreeBSD__) && __FreeBSD_version >= 600000
-- /* return 1; */
-- return 0; /* FreeBSD retransmit reporting doesn't actually work yet */
-+ return 1; /* Should work now */
-+#elif defined(__NetBSD__) && defined(TCP_INFO)
-+ return 1;
- #else
- return 0;
- #endif
-@@ -94,15 +96,17 @@ has_tcpinfo_retransmits(void)
- void
- save_tcpinfo(struct iperf_stream *sp, struct iperf_interval_results *irp)
- {
--#if defined(linux) || defined(__FreeBSD__)
-+#if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)) \
-+ && defined(TCP_INFO)
- socklen_t tcp_info_length = sizeof(struct tcp_info);
-
- if (getsockopt(sp->socket, IPPROTO_TCP, TCP_INFO, (void *)&irp->tcpInfo, &tcp_info_length) < 0)
- iperf_err(sp->test, "getsockopt - %s", strerror(errno));
-
- if (sp->test->debug) {
-- printf("tcpi_snd_cwnd %u tcpi_snd_mss %u\n",
-- irp->tcpInfo.tcpi_snd_cwnd, irp->tcpInfo.tcpi_snd_mss);
-+ printf("tcpi_snd_cwnd %u tcpi_snd_mss %u tcpi_snd_rexmitpack %u\n",
-+ irp->tcpInfo.tcpi_snd_cwnd, irp->tcpInfo.tcpi_snd_mss,
-+ irp->tcpInfo.tcpi_snd_rexmitpack);
- }
-
- #endif
-@@ -114,13 +118,13 @@ get_total_retransmits(struct iperf_inter
- {
- #if defined(linux) && defined(TCP_MD5SIG)
- return irp->tcpInfo.tcpi_total_retrans;
--#else
--#if defined(__FreeBSD__) && __FreeBSD_version >= 600000
-- return irp->tcpInfo.__tcpi_retransmits;
-+#elif defined(__FreeBSD__) && __FreeBSD_version >= 600000
-+ return irp->tcpInfo.tcpi_snd_rexmitpack;
-+#elif defined(__NetBSD__) && defined(TCP_INFO)
-+ return irp->tcpInfo.tcpi_snd_rexmitpack;
- #else
- return -1;
- #endif
--#endif
- }
-
- /*************************************************************/
-@@ -132,13 +136,13 @@ get_snd_cwnd(struct iperf_interval_resul
- {
- #if defined(linux) && defined(TCP_MD5SIG)
- return irp->tcpInfo.tcpi_snd_cwnd * irp->tcpInfo.tcpi_snd_mss;
--#else
--#if defined(__FreeBSD__) && __FreeBSD_version >= 600000
-+#elif defined(__FreeBSD__) && __FreeBSD_version >= 600000
-+ return irp->tcpInfo.tcpi_snd_cwnd * irp->tcpInfo.tcpi_snd_mss;
-+#elif defined(__NetBSD__) && defined(TCP_INFO)
- return irp->tcpInfo.tcpi_snd_cwnd * irp->tcpInfo.tcpi_snd_mss;
- #else
- return -1;
- #endif
--#endif
- }
-
- #ifdef notdef
-@@ -187,4 +191,8 @@ build_tcpinfo_message(struct iperf_inter
- sprintf(message, report_tcpInfo, r->tcpInfo.tcpi_snd_cwnd,
- r->tcpInfo.tcpi_rcv_space, r->tcpInfo.tcpi_snd_ssthresh, r->tcpInfo.tcpi_rtt);
- #endif
-+#if defined(__NetBSD__) && defined(TCP_INFO)
-+ sprintf(message, report_tcpInfo, r->tcpInfo.tcpi_snd_cwnd,
-+ r->tcpInfo.tcpi_rcv_space, r->tcpInfo.tcpi_snd_ssthresh, r->tcpInfo.tcpi_rtt);
-+#endif
- }
diff -r e92de85d962a -r 981e231ea1d8 net/iperf3/patches/patch-src_units.c
--- a/net/iperf3/patches/patch-src_units.c Tue Feb 28 17:15:34 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_units.c,v 1.1 2015/02/02 12:25:20 he Exp $
-
-Avoid warning for using toupper() with signed chars.
-
---- src/units.c.orig 2015-01-09 17:44:11.000000000 +0000
-+++ src/units.c
-@@ -259,7 +259,7 @@ extern "C"
- {
- inNum *= 8;
- }
-- switch (toupper(inFormat))
-+ switch (toupper((u_char)inFormat))
- {
- case 'B':
- conv = UNIT_CONV;
Home |
Main Index |
Thread Index |
Old Index