Skip to content

Commit 342d4ec

Browse files
committed
Merge remote-tracking branch 'esnet/master' into mc
2 parents aec9434 + f64da9b commit 342d4ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1406
-684
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"iperf, Copyright (c) 2014-2017, The Regents of the University of California,
1+
"iperf, Copyright (c) 2014-2018, The Regents of the University of California,
22
through Lawrence Berkeley National Laboratory (subject to receipt of any
33
required approvals from the U.S. Dept. of Energy). All rights reserved."
44

Makefile.in

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -135,7 +135,7 @@ am__recursive_targets = \
135135
$(RECURSIVE_CLEAN_TARGETS) \
136136
$(am__extra_recursive_targets)
137137
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
138-
cscope distdir dist dist-all distcheck
138+
cscope distdir distdir-am dist dist-all distcheck
139139
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
140140
# Read a list of newline-separated strings from the standard input,
141141
# and print each of them once, without duplicates. Input order is
@@ -352,8 +352,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
352352
echo ' $(SHELL) ./config.status'; \
353353
$(SHELL) ./config.status;; \
354354
*) \
355-
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
356-
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
355+
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
356+
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
357357
esac;
358358

359359
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -482,7 +482,10 @@ distclean-tags:
482482
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
483483
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
484484

485-
distdir: $(DISTFILES)
485+
distdir: $(BUILT_SOURCES)
486+
$(MAKE) $(AM_MAKEFLAGS) distdir-am
487+
488+
distdir-am: $(DISTFILES)
486489
$(am__remove_distdir)
487490
test -d "$(distdir)" || mkdir "$(distdir)"
488491
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ OpenBSD, NetBSD, Android, Solaris, and other Linux distributions.
2626
iperf3 is principally developed by ESnet / Lawrence Berkeley National
2727
Laboratory. It is released under a three-clause BSD license.
2828

29-
For more information see: http://software.es.net/iperf
29+
For more information see: https://software.es.net/iperf
3030

3131
Source code and issue tracker: https://github.com/esnet/iperf
3232

@@ -35,7 +35,7 @@ Obtaining iperf3
3535

3636
Downloads of iperf3 are available at:
3737

38-
http://downloads.es.net/pub/iperf/
38+
https://downloads.es.net/pub/iperf/
3939

4040
To check out the most recent code, clone the git repository at:
4141

@@ -146,7 +146,7 @@ Known Issues
146146

147147
A set of known issues is maintained on the iperf3 Web pages:
148148

149-
http://software.es.net/iperf/dev.html#known-issues
149+
https://software.es.net/iperf/dev.html#known-issues
150150

151151
Links
152152
-----
@@ -163,7 +163,7 @@ responsibility for the content of these pages.
163163
Copyright
164164
---------
165165

166-
iperf, Copyright (c) 2014-2017, The Regents of the University of
166+
iperf, Copyright (c) 2014-2018, The Regents of the University of
167167
California, through Lawrence Berkeley National Laboratory (subject
168168
to receipt of any required approvals from the U.S. Dept. of
169169
Energy). All rights reserved.

RELEASE_NOTES

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,84 @@
1-
== iperf 3.4 ==
1+
== iperf 3.6 2018-06-25 ==
2+
3+
* Notable user-visible changes
4+
5+
* A new --extra-data option can be used to fill in a user-defined
6+
string field that appears in JSON output. (#600 / #729)
7+
8+
* A new --repeating-payload option makes iperf3 use a payload pattern
9+
similar to that used by iperf2, which could help in recreating
10+
results that might be affected by payload entropy (for example,
11+
compression). (#726)
12+
13+
* -B now works properly with SCTP tests. (#678 / #715)
14+
15+
* A compile fix for Solaris 10 was added. (#711)
16+
17+
* Some minor bug fixes for JSON output. In particular, warnings for
18+
debug and/or verbose modes with --json output (#737) and a fix for
19+
JSON output on CentOS 6 (#727 / #744).
20+
21+
* software.es.net and downloads.es.net now support HTTPS, so URLs in
22+
documentation that refer to those two hosts now use https://
23+
instead of http:// URLs. (#759)
24+
25+
* Notable developer-visible changes
26+
27+
* Functions related to authenticated iperf3 connections have been
28+
exposed via libiperf. (#712 / #713)
29+
30+
* The ToS byte is now exposed in the libiperf API. (#719)
31+
32+
== iperf 3.5 2018-03-02 ==
33+
34+
* Notable user-visible changes
35+
36+
* iperf3 no longer counts data received after the end of a test in
37+
the bytecounts. This fixes a bug that could, under some
38+
conditions, artificially inflate the transfer size and measured
39+
bitrate. This bug was most noticeable on reverse direction
40+
transfers on short tests over high-latency or buffer-bloated
41+
paths. Many thanks to @FuzzyStatic for providing access to a test
42+
environment for diagnosing this issue (#692).
43+
44+
== iperf 3.4 2018-02-14 ==
245

346
* Notable user-visible changes
447

548
* The -A (set processor affinity) command-line flag is now supported
649
on Windows (#665).
750

8-
* iperf3 now builds on macOS systems older than 10.7 (#607).
9-
1051
* iperf3 now builds on systems lacking a daemon(3) library call
1152
(#369).
1253

54+
* A bug in time skew checking under authentication was fixed (#674).
55+
56+
* IPv6 flow labels now work correctly with multiple parallel streams
57+
(#694).
58+
59+
* The client no longer closes its control connection before sending
60+
end-of-test statistics to the server (#677). This fixes a
61+
regression introduced in iperf-3.2.
62+
63+
* Sending output to stdout now makes errors go to stderr, as per
64+
UNIX convention (#695).
65+
66+
* A server side crash in verbose output with a client running
67+
multiple parallel connections has been fixed (#686).
68+
69+
* The --cport option can now be specified without the --bind option.
70+
Using the --cport option on Linux can eliminate a problem with
71+
ephemeral port number allocation that can make multi-stream iperf3
72+
tests perform very poorly on LAGG links. Also, the --cport option
73+
now works on SCTP tests (#697).
74+
1375
* Notable developer-visible changes
1476

15-
* Some unused code and header inclusions were eliminated (#667).
16-
Also some code was cleaned up to eliminate (or at least reduce)
17-
compiler warnings (#664).
77+
* iperf3 now builds on (some) macOS systems older than 10.7 (#607).
78+
79+
* Some unused code and header inclusions were eliminated (#667,
80+
#668). Also some code was cleaned up to eliminate (or at least
81+
reduce) compiler warnings (#664, #671).
1882

1983
== iperf 3.3 2017-10-31 ==
2084

0 commit comments

Comments
 (0)