Hello community,
here is the log from the commit of package iperf for openSUSE:Factory checked in at 2015-01-10 23:05:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iperf (Old)
and /work/SRC/openSUSE:Factory/.iperf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iperf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/iperf/iperf.changes 2014-12-30 00:49:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.iperf.new/iperf.changes 2015-01-10 23:05:15.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Jan 8 12:57:18 UTC 2015 - seife+obs@b1-systems.com
+
+- iperf 3.0.10, user-visible changes:
+ * UDP tests now honor the -w option for setting the socket buffer
+ sizes (issue #219).
+
+
+-------------------------------------------------------------------
Old:
----
iperf-3.0.9.tar.gz
New:
----
iperf-3.0.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iperf.spec ++++++
--- /var/tmp/diff_new_pack.i9qw8w/_old 2015-01-10 23:05:16.000000000 +0100
+++ /var/tmp/diff_new_pack.i9qw8w/_new 2015-01-10 23:05:16.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package iperf
#
-# Copyright (c) 2014 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
@@ -18,7 +18,7 @@
%define soname 0
Name: iperf
-Version: 3.0.9
+Version: 3.0.10
Release: 0
Summary: A tool to measure network performance
License: BSD-3-Clause
++++++ iperf-3.0.9.tar.gz -> iperf-3.0.10.tar.gz ++++++
++++ 21209 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/RELEASE_NOTES new/iperf-3.0.10/RELEASE_NOTES
--- old/iperf-3.0.9/RELEASE_NOTES 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/RELEASE_NOTES 2014-12-16 20:39:58.000000000 +0100
@@ -1,3 +1,20 @@
+== iperf 3.0.10 2014-12-16 ==
+
+* User-visible changes
+
+ * Fixed the build on MacOS X Yosemite (issue #213).
+
+ * UDP tests now honor the -w option for setting the socket buffer
+ sizes (issue #219).
+
+* Developer-visible changes
+
+ * Added an RPM spec file plus functionality to fill in the version
+ number.
+
+ * Fixed potential filename collision with a system header (issue
+ #203).
+
== iperf 3.0.9 2014-10-14 ==
* User-visible changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/configure.ac new/iperf-3.0.10/configure.ac
--- old/iperf-3.0.9/configure.ac 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/configure.ac 2014-12-16 20:39:58.000000000 +0100
@@ -24,7 +24,7 @@
# file for complete information.
# Initialize the autoconf system for the specified tool, version and mailing list
-AC_INIT(iperf, 3.0.9, https://github.com/esnet/iperf, iperf, http://software.es.net/iperf/)
+AC_INIT(iperf, 3.0.10, https://github.com/esnet/iperf, iperf, http://software.es.net/iperf/)
# Specify where the auxiliary files created by configure should go. The config
# directory is picked so that they don't clutter up more useful directories.
@@ -77,4 +77,4 @@
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
-AC_OUTPUT([Makefile src/Makefile src/version.h examples/Makefile])
+AC_OUTPUT([Makefile src/Makefile src/version.h examples/Makefile iperf3.spec])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/iperf3.spec.in new/iperf-3.0.10/iperf3.spec.in
--- old/iperf-3.0.9/iperf3.spec.in 1970-01-01 01:00:00.000000000 +0100
+++ new/iperf-3.0.10/iperf3.spec.in 2014-12-16 20:39:58.000000000 +0100
@@ -0,0 +1,105 @@
+Name: iperf3
+Version: @VERSION@
+Release: 1%{?dist}
+Summary: Measurement tool for TCP/UDP bandwidth performance
+
+Group: Applications/Internet
+License: BSD
+URL: http://github.com/esnet/iperf
+Source0: http://stats.es.net/software/iperf-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+%if 0%{?el5}
+BuildRequires: e2fsprogs-devel
+%else
+BuildRequires: libuuid-devel
+%endif
+
+%description
+Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of
+various parameters and UDP characteristics. Iperf reports bandwidth, delay
+jitter, data-gram loss.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q -n iperf-%{version}
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall -C src INSTALL_DIR="%{buildroot}%{_bindir}"
+mkdir -p %{buildroot}%{_mandir}/man1
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS INSTALL
+%{_mandir}/man1/iperf3.1.gz
+%{_mandir}/man3/libiperf.3.gz
+%{_bindir}/iperf3
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/iperf_api.h
+%{_libdir}/libiperf.a
+%{_libdir}/libiperf.la
+%{_libdir}/*.so
+%{_libdir}/*.so.*
+
+%changelog
+* Fri Aug 29 2014 Aaron Brown 3.0.7-1
+- Update to 3.0.7
+
+* Tue Jul 29 2014 Aaron Brown 3.0.6-1
+- Update to 3.0.6
+
+* Mon Jun 16 2014 Aaron Brown 3.0.5-1
+- Update to 3.0.5
+
+* Wed Apr 2 2014 Susant Sahani 3.0.3-2
+- Moved static library to devel section only .
+
+* Sun Mar 30 2014 Susant Sahani 3.0.3-1
+- Update to 3.0.3 and added devel rpm support
+
+* Tue Mar 11 2014 Susant Sahani 3.0.2-1
+- Update to 3.0.2
+
+* Tue Jan 14 2014 Susant Sahani 3.0.1-1
+- Update to 3.0.1
+
+* Fri Oct 25 2013 Steven Roberts 3.0-1
+- Update to 3.0
+
+* Sat May 04 2013 Kevin Fenzi 3.0-0.4.b5
+- Update to 3.0b5
+
+* Thu Feb 14 2013 Fedora Release Engineering - 3.0-0.3.b4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering - 3.0-0.2.b4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering - 3.0-0.1.b4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Apr 06 2011 G.Balaji 3.0b4-2
+- Changed the Spec name, removed static libs generation and devel
+- package.
+
+* Sat Mar 26 2011 G.Balaji 3.0b4-1
+- Initial Version
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/Makefile.am new/iperf-3.0.10/src/Makefile.am
--- old/iperf-3.0.9/src/Makefile.am 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/Makefile.am 2014-12-16 20:39:58.000000000 +0100
@@ -14,6 +14,8 @@
iperf_api.h \
iperf_error.c \
iperf_client_api.c \
+ iperf_locale.c \
+ iperf_locale.h \
iperf_server_api.c \
iperf_tcp.c \
iperf_tcp.h \
@@ -21,8 +23,6 @@
iperf_udp.h \
iperf_util.c \
iperf_util.h \
- locale.c \
- locale.h \
net.c \
net.h \
queue.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/config.h.in new/iperf-3.0.10/src/config.h.in
--- old/iperf-3.0.9/src/config.h.in 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/config.h.in 2014-12-16 20:39:58.000000000 +0100
@@ -30,8 +30,7 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/iperf3.1 new/iperf-3.0.10/src/iperf3.1
--- old/iperf-3.0.9/src/iperf3.1 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/iperf3.1 2014-12-16 20:39:58.000000000 +0100
@@ -103,7 +103,7 @@
run in reverse mode (server sends, client receives)
.TP
.BR -w ", " --window " \fIn\fR[KM]"
-TCP window size / socket buffer size (this gets sent to the server and used on that side too)
+window size / socket buffer size (this gets sent to the server and used on that side too)
.TP
.BR -B ", " --bind " \fIn\fR[KM]"
bind to a specific interface or multicast address
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/iperf_api.c new/iperf-3.0.10/src/iperf_api.c
--- old/iperf-3.0.9/src/iperf_api.c 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/iperf_api.c 2014-12-16 20:39:58.000000000 +0100
@@ -63,7 +63,7 @@
#include "units.h"
#include "tcp_window_size.h"
#include "iperf_util.h"
-#include "locale.h"
+#include "iperf_locale.h"
/* Forwards. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/iperf_client_api.c new/iperf-3.0.10/src/iperf_client_api.c
--- old/iperf-3.0.9/src/iperf_client_api.c 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/iperf_client_api.c 2014-12-16 20:39:58.000000000 +0100
@@ -39,7 +39,7 @@
#include "iperf.h"
#include "iperf_api.h"
#include "iperf_util.h"
-#include "locale.h"
+#include "iperf_locale.h"
#include "net.h"
#include "timer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/iperf_locale.c new/iperf-3.0.10/src/iperf_locale.c
--- old/iperf-3.0.9/src/iperf_locale.c 1970-01-01 01:00:00.000000000 +0100
+++ new/iperf-3.0.10/src/iperf_locale.c 2014-12-16 20:39:58.000000000 +0100
@@ -0,0 +1,453 @@
+/*---------------------------------------------------------------
+ * iperf, Copyright (c) 2014, The Regents of the University of
+ * California, through Lawrence Berkeley National Laboratory (subject
+ * to receipt of any required approvals from the U.S. Dept. of
+ * Energy). All rights reserved.
+ *
+ * If you have questions about your rights to use or distribute this
+ * software, please contact Berkeley Lab's Technology Transfer
+ * Department at TTD@lbl.gov.
+ *
+ * NOTICE. This software is owned by the U.S. Department of Energy.
+ * As such, the U.S. Government has been granted for itself and others
+ * acting on its behalf a paid-up, nonexclusive, irrevocable,
+ * worldwide license in the Software to reproduce, prepare derivative
+ * works, and perform publicly and display publicly. Beginning five
+ * (5) years after the date permission to assert copyright is obtained
+ * from the U.S. Department of Energy, and subject to any subsequent
+ * five (5) year renewals, the U.S. Government is granted for itself
+ * and others acting on its behalf a paid-up, nonexclusive,
+ * irrevocable, worldwide license in the Software to reproduce,
+ * prepare derivative works, distribute copies to the public, perform
+ * publicly and display publicly, and to permit others to do so.
+ *
+ * This code is distributed under a BSD style license, see the LICENSE
+ * file for complete information.
+ *
+ * Based on code that is:
+ *
+ * Copyright (c) 1999,2000,2001,2002,2003
+ * The Board of Trustees of the University of Illinois
+ * All Rights Reserved.
+ *---------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software (Iperf) and associated
+ * documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ *
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and
+ * the following disclaimers.
+ *
+ *
+ * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimers in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ *
+ * Neither the names of the University of Illinois, NCSA,
+ * nor the names of its contributors may be used to endorse
+ * or promote products derived from this Software without
+ * specific prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * ________________________________________________________________
+ * National Laboratory for Applied Network Research
+ * National Center for Supercomputing Applications
+ * University of Illinois at Urbana-Champaign
+ * http://www.ncsa.uiuc.edu
+ * ________________________________________________________________
+ *
+ * Locale.c
+ * by Ajay Tirumala
+ * & Mark Gates
+ * -------------------------------------------------------------------
+ * Strings and other stuff that is locale specific.
+ * ------------------------------------------------------------------- */
+#include "config.h"
+
+#include "version.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/* -------------------------------------------------------------------
+ * usage
+ * ------------------------------------------------------------------- */
+
+const char usage_shortstr[] = "Usage: iperf [-s|-c host] [options]\n"
+ "Try `iperf --help' for more information.\n";
+
+const char usage_longstr[] = "Usage: iperf [-s|-c host] [options]\n"
+ " iperf [-h|--help] [-v|--version]\n\n"
+ "Server or Client:\n"
+ " -p, --port # server port to listen on/connect to\n"
+ " -f, --format [kmgKMG] format to report: Kbits, Mbits, KBytes, MBytes\n"
+ " -i, --interval # seconds between periodic bandwidth reports\n"
+ " -F, --file name xmit/recv the specified file\n"
+ " -A, --affinity n/n,m set CPU affinity\n"
+ " -B, --bind <host> bind to a specific interface\n"
+ " -V, --verbose more detailed output\n"
+ " -J, --json output in JSON format\n"
+ " -d, --debug emit debugging output\n"
+ " -v, --version show version information and quit\n"
+ " -h, --help show this message and quit\n"
+ "Server specific:\n"
+ " -s, --server run in server mode\n"
+ " -D, --daemon run the server as a daemon\n"
+ "Client specific:\n"
+ " -c, --client <host> run in client mode, connecting to <host>\n"
+ " -u, --udp use UDP rather than TCP\n"
+ " -b, --bandwidth #[KMG][/#] target bandwidth in bits/sec (0 for unlimited)\n"
+ " (default %d Mbit/sec for UDP, unlimited for TCP)\n"
+ " (optional slash and packet count for burst mode)\n"
+ " -t, --time # time in seconds to transmit for (default %d secs)\n"
+ " -n, --bytes #[KMG] number of bytes to transmit (instead of -t)\n"
+ " -k, --blockcount #[KMG] number of blocks (packets) to transmit (instead of -t or -n)\n"
+ " -l, --len #[KMG] length of buffer to read or write\n"
+ " (default %d KB for TCP, %d KB for UDP)\n"
+ " -P, --parallel # number of parallel client streams to run\n"
+ " -R, --reverse run in reverse mode (server sends, client receives)\n"
+ " -w, --window #[KMG] set window size / socket buffer size\n"
+#if defined(linux)
+ " -C, --linux-congestion <algo> set TCP congestion control algorithm (Linux only)\n"
+#endif
+ " -M, --set-mss # set TCP maximum segment size (MTU - 40 bytes)\n"
+ " -N, --nodelay set TCP no delay, disabling Nagle's Algorithm\n"
+ " -4, --version4 only use IPv4\n"
+ " -6, --version6 only use IPv6\n"
+ " -S, --tos N set the IP 'type of service'\n"
+#if defined(linux)
+ " -L, --flowlabel N set the IPv6 flow label (only supported on Linux)\n"
+#endif
+ " -Z, --zerocopy use a 'zero copy' method of sending data\n"
+ " -O, --omit N omit the first n seconds\n"
+ " -T, --title str prefix every output line with this string\n"
+ " --get-server-output get results from server\n"
+
+#ifdef NOT_YET_SUPPORTED /* still working on these */
+#endif
+
+ "\n"
+ "[KMG] indicates options that support a K/M/G suffix for kilo-, mega-, or giga-\n"
+ "\n"
+#ifdef PACKAGE_URL
+ "iperf3 homepage at: " PACKAGE_URL "\n"
+#endif /* PACKAGE_URL */
+#ifdef PACKAGE_BUGREPORT
+ "Report bugs to: " PACKAGE_BUGREPORT "\n";
+#endif /* PACKAGE_BUGREPORT */
+
+
+#ifdef OBSOLETE /* from old iperf: no longer supported. Add some of these back someday */
+ "-d, --dualtest Do a bidirectional test simultaneously\n"
+ "-L, --listenport # port to recieve bidirectional tests back on\n"
+ "-I, --stdin input the data to be transmitted from stdin\n"
+ "-F, --fileinput <name> input the data to be transmitted from a file\n"
+ "-r, --tradeoff Do a bidirectional test individually\n"
+ "-T, --ttl # time-to-live, for multicast (default 1)\n"
+ "-x, --reportexclude [CDMSV] exclude C(connection) D(data) M(multicast) S(settings) V(server) reports\n"
+ "-y, --reportstyle C report as a Comma-Separated Values\n"
+#endif
+
+const char version[] = PACKAGE_STRING;
+
+/* -------------------------------------------------------------------
+ * settings
+ * ------------------------------------------------------------------- */
+
+const char seperator_line[] =
+"------------------------------------------------------------\n";
+
+const char server_port[] =
+"Server listening on %s port %d\n";
+
+const char client_port[] =
+"Client connecting to %s, %s port %d\n";
+
+const char bind_address[] =
+"Binding to local address %s\n";
+
+const char multicast_ttl[] =
+"Setting multicast TTL to %d\n";
+
+const char join_multicast[] =
+"Joining multicast group %s\n";
+
+const char client_datagram_size[] =
+"Sending %d byte datagrams\n";
+
+const char server_datagram_size[] =
+"Receiving %d byte datagrams\n";
+
+const char tcp_window_size[] =
+"TCP window size";
+
+const char udp_buffer_size[] =
+"UDP buffer size";
+
+const char window_default[] =
+"(default)";
+
+const char wait_server_threads[] =
+"Waiting for server threads to complete. Interrupt again to force quit.\n";
+
+const char test_start_time[] =
+"Starting Test: protocol: %s, %d streams, %d byte blocks, omitting %d seconds, %d second test\n";
+
+const char test_start_bytes[] =
+"Starting Test: protocol: %s, %d streams, %d byte blocks, omitting %d seconds, %llu bytes to send\n";
+
+const char test_start_blocks[] =
+"Starting Test: protocol: %s, %d streams, %d byte blocks, omitting %d seconds, %d blocks to send\n";
+
+
+/* -------------------------------------------------------------------
+ * reports
+ * ------------------------------------------------------------------- */
+
+const char report_time[] =
+"Time: %s\n";
+
+const char report_connecting[] =
+"Connecting to host %s, port %d\n";
+
+const char report_reverse[] =
+"Reverse mode, remote host %s is sending\n";
+
+const char report_accepted[] =
+"Accepted connection from %s, port %d\n";
+
+const char report_cookie[] =
+" Cookie: %s\n";
+
+const char report_connected[] =
+"[%3d] local %s port %d connected to %s port %d\n";
+
+const char report_window[] =
+"TCP window size: %s\n";
+
+const char report_autotune[] =
+"Using TCP Autotuning\n";
+
+const char report_omit_done[] =
+"Finished omit period, starting real test\n";
+
+const char report_diskfile[] =
+" Sent %s / %s (%d%%) of %s\n";
+
+const char report_done[] =
+"iperf Done.\n";
+
+const char report_read_lengths[] =
+"[%3d] Read lengths occurring in more than 5%% of reads:\n";
+
+const char report_read_length_times[] =
+"[%3d] %5d bytes read %5d times (%.3g%%)\n";
+
+const char report_bw_header[] =
+"[ ID] Interval Transfer Bandwidth\n";
+
+const char report_bw_retrans_header[] =
+"[ ID] Interval Transfer Bandwidth Retr\n";
+
+const char report_bw_retrans_cwnd_header[] =
+"[ ID] Interval Transfer Bandwidth Retr Cwnd\n";
+
+const char report_bw_udp_header[] =
+"[ ID] Interval Transfer Bandwidth Jitter Lost/Total Datagrams\n";
+
+const char report_bw_udp_sender_header[] =
+"[ ID] Interval Transfer Bandwidth Total Datagrams\n";
+
+const char report_bw_format[] =
+"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %s\n";
+
+const char report_bw_retrans_format[] =
+"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %3u %s\n";
+
+const char report_bw_retrans_cwnd_format[] =
+"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %3u %ss %s\n";
+
+const char report_bw_udp_format[] =
+"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %d/%d (%.2g%%) %s\n";
+
+const char report_bw_udp_sender_format[] =
+"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %d %s\n";
+
+const char report_summary[] =
+"Test Complete. Summary Results:\n";
+
+const char report_sum_bw_format[] =
+"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %s\n";
+
+const char report_sum_bw_retrans_format[] =
+"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %3d %s\n";
+
+const char report_sum_bw_udp_format[] =
+"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %d/%d (%.2g%%) %s\n";
+
+const char report_sum_bw_udp_sender_format[] =
+"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %d %s\n";
+
+const char report_omitted[] = "(omitted)";
+
+const char report_bw_separator[] =
+"- - - - - - - - - - - - - - - - - - - - - - - - -\n";
+
+const char report_outoforder[] =
+"[%3d] %4.1f-%4.1f sec %d datagrams received out-of-order\n";
+
+const char report_sum_outoforder[] =
+"[SUM] %4.1f-%4.1f sec %d datagrams received out-of-order\n";
+
+const char report_peer[] =
+"[%3d] local %s port %u connected with %s port %u\n";
+
+const char report_mss_unsupported[] =
+"[%3d] MSS and MTU size unknown (TCP_MAXSEG not supported by OS?)\n";
+
+const char report_mss[] =
+"[%3d] MSS size %d bytes (MTU %d bytes, %s)\n";
+
+const char report_datagrams[] =
+"[%3d] Sent %d datagrams\n";
+
+const char report_sum_datagrams[] =
+"[SUM] Sent %d datagrams\n";
+
+const char server_reporting[] =
+"[%3d] Server Report:\n";
+
+const char reportCSV_peer[] =
+"%s,%u,%s,%u";
+
+const char report_cpu[] =
+"CPU Utilization: %s/%s %.1f%% (%.1f%%u/%.1f%%s), %s/%s %.1f%% (%.1f%%u/%.1f%%s)\n";
+
+const char report_local[] = "local";
+const char report_remote[] = "remote";
+const char report_sender[] = "sender";
+const char report_receiver[] = "receiver";
+
+#if defined(linux)
+const char report_tcpInfo[] =
+"event=TCP_Info CWND=%u SND_SSTHRESH=%u RCV_SSTHRESH=%u UNACKED=%u SACK=%u LOST=%u RETRANS=%u FACK=%u RTT=%u REORDERING=%u\n";
+#endif
+#if defined(__FreeBSD__)
+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
+const char reportCSV_bw_format[] =
+"%s,%s,%d,%.1f-%.1f,%qd,%qd\n";
+
+const char reportCSV_bw_udp_format[] =
+"%s,%s,%d,%.1f-%.1f,%qd,%qd,%.3f,%d,%d,%.3f,%d\n";
+#else // HAVE_PRINTF_QD
+const char reportCSV_bw_format[] =
+"%s,%s,%d,%.1f-%.1f,%lld,%lld\n";
+
+const char reportCSV_bw_udp_format[] =
+"%s,%s,%d,%.1f-%.1f,%lld,%lld,%.3f,%d,%d,%.3f,%d\n";
+#endif // HAVE_PRINTF_QD
+#else // HAVE_QUAD_SUPPORT
+#ifdef WIN32
+const char reportCSV_bw_format[] =
+"%s,%s,%d,%.1f-%.1f,%I64d,%I64d\n";
+
+const char reportCSV_bw_udp_format[] =
+"%s,%s,%d,%.1f-%.1f,%I64d,%I64d,%.3f,%d,%d,%.3f,%d\n";
+#else
+const char reportCSV_bw_format[] =
+"%s,%s,%d,%.1f-%.1f,%d,%d\n";
+
+const char reportCSV_bw_udp_format[] =
+"%s,%s,%d,%.1f-%.1f,%d,%d,%.3f,%d,%d,%.3f,%d\n";
+#endif //WIN32
+#endif //HAVE_QUAD_SUPPORT
+/* -------------------------------------------------------------------
+ * warnings
+ * ------------------------------------------------------------------- */
+
+const char warn_window_requested[] =
+" (WARNING: requested %s)";
+
+const char warn_window_small[] =
+"WARNING: TCP window size set to %d bytes. A small window size\n\
+will give poor performance. See the Iperf documentation.\n";
+
+const char warn_delay_large[] =
+"WARNING: delay too large, reducing from %.1f to 1.0 seconds.\n";
+
+const char warn_no_pathmtu[] =
+"WARNING: Path MTU Discovery may not be enabled.\n";
+
+const char warn_no_ack[]=
+"[%3d] WARNING: did not receive ack of last datagram after %d tries.\n";
+
+const char warn_ack_failed[]=
+"[%3d] WARNING: ack of last datagram failed after %d tries.\n";
+
+const char warn_fileopen_failed[]=
+"WARNING: Unable to open file stream for transfer\n\
+Using default data stream. \n";
+
+const char unable_to_change_win[]=
+"WARNING: Unable to change the window size\n";
+
+const char opt_estimate[]=
+"Optimal Estimate\n";
+
+const char report_interval_small[] =
+"WARNING: interval too small, increasing from %3.2f to 0.5 seconds.\n";
+
+const char warn_invalid_server_option[] =
+"WARNING: option -%c is not valid for server mode\n";
+
+const char warn_invalid_client_option[] =
+"WARNING: option -%c is not valid for client mode\n";
+
+const char warn_invalid_compatibility_option[] =
+"WARNING: option -%c is not valid in compatibility mode\n";
+
+const char warn_implied_udp[] =
+"WARNING: option -%c implies udp testing\n";
+
+const char warn_implied_compatibility[] =
+"WARNING: option -%c has implied compatibility mode\n";
+
+const char warn_buffer_too_small[] =
+"WARNING: the UDP buffer was increased to %d for proper operation\n";
+
+const char warn_invalid_single_threaded[] =
+"WARNING: option -%c is not valid in single threaded versions\n";
+
+const char warn_invalid_report_style[] =
+"WARNING: unknown reporting style \"%s\", switching to default\n";
+
+const char warn_invalid_report[] =
+"WARNING: unknown reporting type \"%c\", ignored\n valid options are:\n\t exclude: C(connection) D(data) M(multicast) S(settings) V(server) report\n\n";
+
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/iperf_locale.h new/iperf-3.0.10/src/iperf_locale.h
--- old/iperf-3.0.9/src/iperf_locale.h 1970-01-01 01:00:00.000000000 +0100
+++ new/iperf-3.0.10/src/iperf_locale.h 2014-12-16 20:39:58.000000000 +0100
@@ -0,0 +1,121 @@
+/*
+ * iperf, Copyright (c) 2014, The Regents of the University of
+ * California, through Lawrence Berkeley National Laboratory (subject
+ * to receipt of any required approvals from the U.S. Dept. of
+ * Energy). All rights reserved.
+ *
+ * If you have questions about your rights to use or distribute this
+ * software, please contact Berkeley Lab's Technology Transfer
+ * Department at TTD@lbl.gov.
+ *
+ * NOTICE. This software is owned by the U.S. Department of Energy.
+ * As such, the U.S. Government has been granted for itself and others
+ * acting on its behalf a paid-up, nonexclusive, irrevocable,
+ * worldwide license in the Software to reproduce, prepare derivative
+ * works, and perform publicly and display publicly. Beginning five
+ * (5) years after the date permission to assert copyright is obtained
+ * from the U.S. Department of Energy, and subject to any subsequent
+ * five (5) year renewals, the U.S. Government is granted for itself
+ * and others acting on its behalf a paid-up, nonexclusive,
+ * irrevocable, worldwide license in the Software to reproduce,
+ * prepare derivative works, distribute copies to the public, perform
+ * publicly and display publicly, and to permit others to do so.
+ *
+ * This code is distributed under a BSD style license, see the LICENSE
+ * file for complete information.
+ */
+#ifndef IPERF_LOCALE_H
+#define IPERF_LOCALE_H
+
+extern const char usage_shortstr[];
+extern const char usage_longstr[];
+extern const char version[];
+
+extern const char seperator_line[];
+
+extern const char server_port[] ;
+extern const char client_port[] ;
+extern const char bind_address[] ;
+extern const char multicast_ttl[] ;
+extern const char join_multicast[] ;
+extern const char client_datagram_size[] ;
+extern const char server_datagram_size[] ;
+extern const char tcp_window_size[] ;
+extern const char udp_buffer_size[] ;
+extern const char window_default[] ;
+extern const char wait_server_threads[] ;
+extern const char test_start_time[];
+extern const char test_start_bytes[];
+extern const char test_start_blocks[];
+
+extern const char report_time[] ;
+extern const char report_connecting[] ;
+extern const char report_reverse[] ;
+extern const char report_accepted[] ;
+extern const char report_cookie[] ;
+extern const char report_connected[] ;
+extern const char report_window[] ;
+extern const char report_autotune[] ;
+extern const char report_omit_done[] ;
+extern const char report_diskfile[] ;
+extern const char report_done[] ;
+extern const char report_read_lengths[] ;
+extern const char report_read_length_times[] ;
+extern const char report_bw_header[] ;
+extern const char report_bw_retrans_header[] ;
+extern const char report_bw_retrans_cwnd_header[] ;
+extern const char report_bw_udp_header[] ;
+extern const char report_bw_udp_sender_header[] ;
+extern const char report_bw_format[] ;
+extern const char report_bw_retrans_format[] ;
+extern const char report_bw_retrans_cwnd_format[] ;
+extern const char report_bw_udp_format[] ;
+extern const char report_bw_udp_sender_format[] ;
+extern const char report_summary[] ;
+extern const char report_sum_bw_format[] ;
+extern const char report_sum_bw_retrans_format[] ;
+extern const char report_sum_bw_udp_format[] ;
+extern const char report_sum_bw_udp_sender_format[] ;
+extern const char report_omitted[] ;
+extern const char report_bw_separator[] ;
+extern const char report_outoforder[] ;
+extern const char report_sum_outoforder[] ;
+extern const char report_peer[] ;
+extern const char report_mss_unsupported[] ;
+extern const char report_mss[] ;
+extern const char report_datagrams[] ;
+extern const char report_sum_datagrams[] ;
+extern const char server_reporting[] ;
+extern const char reportCSV_peer[] ;
+
+extern const char report_cpu[] ;
+extern const char report_local[] ;
+extern const char report_remote[] ;
+extern const char report_sender[] ;
+extern const char report_receiver[] ;
+
+extern const char report_tcpInfo[] ;
+extern const char report_tcpInfo[] ;
+
+
+extern const char warn_window_requested[] ;
+extern const char warn_window_small[] ;
+extern const char warn_delay_large[] ;
+extern const char warn_no_pathmtu[] ;
+extern const char warn_no_ack[];
+extern const char warn_ack_failed[];
+extern const char warn_fileopen_failed[];
+extern const char unable_to_change_win[];
+extern const char opt_estimate[];
+extern const char report_interval_small[] ;
+extern const char warn_invalid_server_option[] ;
+extern const char warn_invalid_client_option[] ;
+extern const char warn_invalid_compatibility_option[] ;
+extern const char warn_implied_udp[] ;
+extern const char warn_implied_compatibility[] ;
+extern const char warn_buffer_too_small[] ;
+extern const char warn_invalid_single_threaded[] ;
+extern const char warn_invalid_report_style[] ;
+extern const char warn_invalid_report[] ;
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/iperf_server_api.c new/iperf-3.0.10/src/iperf_server_api.c
--- old/iperf-3.0.9/src/iperf_server_api.c 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/iperf_server_api.c 2014-12-16 20:39:58.000000000 +0100
@@ -58,7 +58,7 @@
#include "units.h"
#include "tcp_window_size.h"
#include "iperf_util.h"
-#include "locale.h"
+#include "iperf_locale.h"
int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/iperf_udp.c new/iperf-3.0.10/src/iperf_udp.c
--- old/iperf-3.0.9/src/iperf_udp.c 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/iperf_udp.c 2014-12-16 20:39:58.000000000 +0100
@@ -144,9 +144,19 @@
/**************************************************************************/
-/* iperf_udp_accept
+/*
+ * The following functions all have to do with managing UDP data sockets.
+ * UDP of course is connectionless, so there isn't really a concept of
+ * setting up a connection, although connect(2) can (and is) used to
+ * bind the remote end of sockets. We need to simulate some of the
+ * connection management that is built-in to TCP so that each side of the
+ * connection knows about each other before the real data transfers begin.
+ */
+
+/*
+ * iperf_udp_accept
*
- * accepts a new UDP connection
+ * Accepts a new UDP "connection"
*/
int
iperf_udp_accept(struct iperf_test *test)
@@ -156,8 +166,17 @@
socklen_t len;
int sz, s;
+ /*
+ * Get the current outstanding socket. This socket will be used to handle
+ * data transfers and a new "listening" socket will be created.
+ */
s = test->prot_listener;
+ /*
+ * Grab the UDP packet sent by the client. From that we can extract the
+ * client's address, and then use that information to bind the remote side
+ * of the socket to the client.
+ */
len = sizeof(sa_peer);
if ((sz = recvfrom(test->prot_listener, &buf, sizeof(buf), 0, (struct sockaddr *) &sa_peer, &len)) < 0) {
i_errno = IESTREAMACCEPT;
@@ -169,6 +188,25 @@
return -1;
}
+ /*
+ * Set socket buffer size if requested. Do this for both sending and
+ * receiving so that we can cover both normal and --reverse operation.
+ */
+ int opt;
+ if ((opt = test->settings->socket_bufsize)) {
+ if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt)) < 0) {
+ i_errno = IESETBUF;
+ return -1;
+ }
+ if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &opt, sizeof(opt)) < 0) {
+ i_errno = IESETBUF;
+ return -1;
+ }
+ }
+
+ /*
+ * Create a new "listening" socket to replace the one we were using before.
+ */
test->prot_listener = netannounce(test->settings->domain, Pudp, test->bind_address, test->server_port);
if (test->prot_listener < 0) {
i_errno = IESTREAMLISTEN;
@@ -179,7 +217,7 @@
test->max_fd = (test->max_fd < test->prot_listener) ? test->prot_listener : test->max_fd;
/* Let the client know we're ready "accept" another UDP "stream" */
- buf = 987654321;
+ buf = 987654321; /* any content will work here */
if (write(s, &buf, sizeof(buf)) < 0) {
i_errno = IESTREAMWRITE;
return -1;
@@ -189,9 +227,12 @@
}
-/* iperf_udp_listen
+/*
+ * iperf_udp_listen
*
- * start up a listener for UDP stream connections
+ * Start up a listener for UDP stream connections. Unlike for TCP,
+ * there is no listen(2) for UDP. This socket will however accept
+ * a UDP datagram from a client (indicating the client's presence).
*/
int
iperf_udp_listen(struct iperf_test *test)
@@ -203,34 +244,59 @@
return -1;
}
+ /*
+ * The caller will put this value into test->prot_listener.
+ */
return s;
}
-/* iperf_udp_connect
+/*
+ * iperf_udp_connect
*
- * connect to a TCP stream listener
+ * "Connect" to a UDP stream listener.
*/
int
iperf_udp_connect(struct iperf_test *test)
{
int s, buf, sz;
+ /* Create and bind our local socket. */
if ((s = netdial(test->settings->domain, Pudp, test->bind_address, test->server_hostname, test->server_port)) < 0) {
i_errno = IESTREAMCONNECT;
return -1;
}
- /* Write to the UDP stream to let the server know we're here. */
- buf = 123456789;
+ /*
+ * Set socket buffer size if requested. Do this for both sending and
+ * receiving so that we can cover both normal and --reverse operation.
+ */
+ int opt;
+ if ((opt = test->settings->socket_bufsize)) {
+ if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt)) < 0) {
+ i_errno = IESETBUF;
+ return -1;
+ }
+ if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &opt, sizeof(opt)) < 0) {
+ i_errno = IESETBUF;
+ return -1;
+ }
+ }
+
+ /*
+ * Write a datagram to the UDP stream to let the server know we're here.
+ * The server learns our address by obtaining its peer's address.
+ */
+ buf = 123456789; /* this can be pretty much anything */
if (write(s, &buf, sizeof(buf)) < 0) {
// XXX: Should this be changed to IESTREAMCONNECT?
i_errno = IESTREAMWRITE;
return -1;
}
- /* Wait until the server confirms the client UDP write */
- // XXX: Should this read be TCP instead?
+ /*
+ * Wait until the server replies back to us.
+ */
if ((sz = recv(s, &buf, sizeof(buf), 0)) < 0) {
i_errno = IESTREAMREAD;
return -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/locale.c new/iperf-3.0.10/src/locale.c
--- old/iperf-3.0.9/src/locale.c 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/locale.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,453 +0,0 @@
-/*---------------------------------------------------------------
- * iperf, Copyright (c) 2014, The Regents of the University of
- * California, through Lawrence Berkeley National Laboratory (subject
- * to receipt of any required approvals from the U.S. Dept. of
- * Energy). All rights reserved.
- *
- * If you have questions about your rights to use or distribute this
- * software, please contact Berkeley Lab's Technology Transfer
- * Department at TTD@lbl.gov.
- *
- * NOTICE. This software is owned by the U.S. Department of Energy.
- * As such, the U.S. Government has been granted for itself and others
- * acting on its behalf a paid-up, nonexclusive, irrevocable,
- * worldwide license in the Software to reproduce, prepare derivative
- * works, and perform publicly and display publicly. Beginning five
- * (5) years after the date permission to assert copyright is obtained
- * from the U.S. Department of Energy, and subject to any subsequent
- * five (5) year renewals, the U.S. Government is granted for itself
- * and others acting on its behalf a paid-up, nonexclusive,
- * irrevocable, worldwide license in the Software to reproduce,
- * prepare derivative works, distribute copies to the public, perform
- * publicly and display publicly, and to permit others to do so.
- *
- * This code is distributed under a BSD style license, see the LICENSE
- * file for complete information.
- *
- * Based on code that is:
- *
- * Copyright (c) 1999,2000,2001,2002,2003
- * The Board of Trustees of the University of Illinois
- * All Rights Reserved.
- *---------------------------------------------------------------
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software (Iperf) and associated
- * documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- *
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and
- * the following disclaimers.
- *
- *
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimers in the documentation and/or other materials
- * provided with the distribution.
- *
- *
- * Neither the names of the University of Illinois, NCSA,
- * nor the names of its contributors may be used to endorse
- * or promote products derived from this Software without
- * specific prior written permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * ________________________________________________________________
- * National Laboratory for Applied Network Research
- * National Center for Supercomputing Applications
- * University of Illinois at Urbana-Champaign
- * http://www.ncsa.uiuc.edu
- * ________________________________________________________________
- *
- * Locale.c
- * by Ajay Tirumala
- * & Mark Gates
- * -------------------------------------------------------------------
- * Strings and other stuff that is locale specific.
- * ------------------------------------------------------------------- */
-#include "config.h"
-
-#include "version.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-/* -------------------------------------------------------------------
- * usage
- * ------------------------------------------------------------------- */
-
-const char usage_shortstr[] = "Usage: iperf [-s|-c host] [options]\n"
- "Try `iperf --help' for more information.\n";
-
-const char usage_longstr[] = "Usage: iperf [-s|-c host] [options]\n"
- " iperf [-h|--help] [-v|--version]\n\n"
- "Server or Client:\n"
- " -p, --port # server port to listen on/connect to\n"
- " -f, --format [kmgKMG] format to report: Kbits, Mbits, KBytes, MBytes\n"
- " -i, --interval # seconds between periodic bandwidth reports\n"
- " -F, --file name xmit/recv the specified file\n"
- " -A, --affinity n/n,m set CPU affinity\n"
- " -B, --bind <host> bind to a specific interface\n"
- " -V, --verbose more detailed output\n"
- " -J, --json output in JSON format\n"
- " -d, --debug emit debugging output\n"
- " -v, --version show version information and quit\n"
- " -h, --help show this message and quit\n"
- "Server specific:\n"
- " -s, --server run in server mode\n"
- " -D, --daemon run the server as a daemon\n"
- "Client specific:\n"
- " -c, --client <host> run in client mode, connecting to <host>\n"
- " -u, --udp use UDP rather than TCP\n"
- " -b, --bandwidth #[KMG][/#] target bandwidth in bits/sec (0 for unlimited)\n"
- " (default %d Mbit/sec for UDP, unlimited for TCP)\n"
- " (optional slash and packet count for burst mode)\n"
- " -t, --time # time in seconds to transmit for (default %d secs)\n"
- " -n, --bytes #[KMG] number of bytes to transmit (instead of -t)\n"
- " -k, --blockcount #[KMG] number of blocks (packets) to transmit (instead of -t or -n)\n"
- " -l, --len #[KMG] length of buffer to read or write\n"
- " (default %d KB for TCP, %d KB for UDP)\n"
- " -P, --parallel # number of parallel client streams to run\n"
- " -R, --reverse run in reverse mode (server sends, client receives)\n"
- " -w, --window #[KMG] TCP window size (socket buffer size)\n"
-#if defined(linux)
- " -C, --linux-congestion <algo> set TCP congestion control algorithm (Linux only)\n"
-#endif
- " -M, --set-mss # set TCP maximum segment size (MTU - 40 bytes)\n"
- " -N, --nodelay set TCP no delay, disabling Nagle's Algorithm\n"
- " -4, --version4 only use IPv4\n"
- " -6, --version6 only use IPv6\n"
- " -S, --tos N set the IP 'type of service'\n"
-#if defined(linux)
- " -L, --flowlabel N set the IPv6 flow label (only supported on Linux)\n"
-#endif
- " -Z, --zerocopy use a 'zero copy' method of sending data\n"
- " -O, --omit N omit the first n seconds\n"
- " -T, --title str prefix every output line with this string\n"
- " --get-server-output get results from server\n"
-
-#ifdef NOT_YET_SUPPORTED /* still working on these */
-#endif
-
- "\n"
- "[KMG] indicates options that support a K/M/G suffix for kilo-, mega-, or giga-\n"
- "\n"
-#ifdef PACKAGE_URL
- "iperf3 homepage at: " PACKAGE_URL "\n"
-#endif /* PACKAGE_URL */
-#ifdef PACKAGE_BUGREPORT
- "Report bugs to: " PACKAGE_BUGREPORT "\n";
-#endif /* PACKAGE_BUGREPORT */
-
-
-#ifdef OBSOLETE /* from old iperf: no longer supported. Add some of these back someday */
- "-d, --dualtest Do a bidirectional test simultaneously\n"
- "-L, --listenport # port to recieve bidirectional tests back on\n"
- "-I, --stdin input the data to be transmitted from stdin\n"
- "-F, --fileinput <name> input the data to be transmitted from a file\n"
- "-r, --tradeoff Do a bidirectional test individually\n"
- "-T, --ttl # time-to-live, for multicast (default 1)\n"
- "-x, --reportexclude [CDMSV] exclude C(connection) D(data) M(multicast) S(settings) V(server) reports\n"
- "-y, --reportstyle C report as a Comma-Separated Values\n"
-#endif
-
-const char version[] = PACKAGE_STRING;
-
-/* -------------------------------------------------------------------
- * settings
- * ------------------------------------------------------------------- */
-
-const char seperator_line[] =
-"------------------------------------------------------------\n";
-
-const char server_port[] =
-"Server listening on %s port %d\n";
-
-const char client_port[] =
-"Client connecting to %s, %s port %d\n";
-
-const char bind_address[] =
-"Binding to local address %s\n";
-
-const char multicast_ttl[] =
-"Setting multicast TTL to %d\n";
-
-const char join_multicast[] =
-"Joining multicast group %s\n";
-
-const char client_datagram_size[] =
-"Sending %d byte datagrams\n";
-
-const char server_datagram_size[] =
-"Receiving %d byte datagrams\n";
-
-const char tcp_window_size[] =
-"TCP window size";
-
-const char udp_buffer_size[] =
-"UDP buffer size";
-
-const char window_default[] =
-"(default)";
-
-const char wait_server_threads[] =
-"Waiting for server threads to complete. Interrupt again to force quit.\n";
-
-const char test_start_time[] =
-"Starting Test: protocol: %s, %d streams, %d byte blocks, omitting %d seconds, %d second test\n";
-
-const char test_start_bytes[] =
-"Starting Test: protocol: %s, %d streams, %d byte blocks, omitting %d seconds, %llu bytes to send\n";
-
-const char test_start_blocks[] =
-"Starting Test: protocol: %s, %d streams, %d byte blocks, omitting %d seconds, %d blocks to send\n";
-
-
-/* -------------------------------------------------------------------
- * reports
- * ------------------------------------------------------------------- */
-
-const char report_time[] =
-"Time: %s\n";
-
-const char report_connecting[] =
-"Connecting to host %s, port %d\n";
-
-const char report_reverse[] =
-"Reverse mode, remote host %s is sending\n";
-
-const char report_accepted[] =
-"Accepted connection from %s, port %d\n";
-
-const char report_cookie[] =
-" Cookie: %s\n";
-
-const char report_connected[] =
-"[%3d] local %s port %d connected to %s port %d\n";
-
-const char report_window[] =
-"TCP window size: %s\n";
-
-const char report_autotune[] =
-"Using TCP Autotuning\n";
-
-const char report_omit_done[] =
-"Finished omit period, starting real test\n";
-
-const char report_diskfile[] =
-" Sent %s / %s (%d%%) of %s\n";
-
-const char report_done[] =
-"iperf Done.\n";
-
-const char report_read_lengths[] =
-"[%3d] Read lengths occurring in more than 5%% of reads:\n";
-
-const char report_read_length_times[] =
-"[%3d] %5d bytes read %5d times (%.3g%%)\n";
-
-const char report_bw_header[] =
-"[ ID] Interval Transfer Bandwidth\n";
-
-const char report_bw_retrans_header[] =
-"[ ID] Interval Transfer Bandwidth Retr\n";
-
-const char report_bw_retrans_cwnd_header[] =
-"[ ID] Interval Transfer Bandwidth Retr Cwnd\n";
-
-const char report_bw_udp_header[] =
-"[ ID] Interval Transfer Bandwidth Jitter Lost/Total Datagrams\n";
-
-const char report_bw_udp_sender_header[] =
-"[ ID] Interval Transfer Bandwidth Total Datagrams\n";
-
-const char report_bw_format[] =
-"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %s\n";
-
-const char report_bw_retrans_format[] =
-"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %3u %s\n";
-
-const char report_bw_retrans_cwnd_format[] =
-"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %3u %ss %s\n";
-
-const char report_bw_udp_format[] =
-"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %d/%d (%.2g%%) %s\n";
-
-const char report_bw_udp_sender_format[] =
-"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %d %s\n";
-
-const char report_summary[] =
-"Test Complete. Summary Results:\n";
-
-const char report_sum_bw_format[] =
-"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %s\n";
-
-const char report_sum_bw_retrans_format[] =
-"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %3d %s\n";
-
-const char report_sum_bw_udp_format[] =
-"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %d/%d (%.2g%%) %s\n";
-
-const char report_sum_bw_udp_sender_format[] =
-"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %d %s\n";
-
-const char report_omitted[] = "(omitted)";
-
-const char report_bw_separator[] =
-"- - - - - - - - - - - - - - - - - - - - - - - - -\n";
-
-const char report_outoforder[] =
-"[%3d] %4.1f-%4.1f sec %d datagrams received out-of-order\n";
-
-const char report_sum_outoforder[] =
-"[SUM] %4.1f-%4.1f sec %d datagrams received out-of-order\n";
-
-const char report_peer[] =
-"[%3d] local %s port %u connected with %s port %u\n";
-
-const char report_mss_unsupported[] =
-"[%3d] MSS and MTU size unknown (TCP_MAXSEG not supported by OS?)\n";
-
-const char report_mss[] =
-"[%3d] MSS size %d bytes (MTU %d bytes, %s)\n";
-
-const char report_datagrams[] =
-"[%3d] Sent %d datagrams\n";
-
-const char report_sum_datagrams[] =
-"[SUM] Sent %d datagrams\n";
-
-const char server_reporting[] =
-"[%3d] Server Report:\n";
-
-const char reportCSV_peer[] =
-"%s,%u,%s,%u";
-
-const char report_cpu[] =
-"CPU Utilization: %s/%s %.1f%% (%.1f%%u/%.1f%%s), %s/%s %.1f%% (%.1f%%u/%.1f%%s)\n";
-
-const char report_local[] = "local";
-const char report_remote[] = "remote";
-const char report_sender[] = "sender";
-const char report_receiver[] = "receiver";
-
-#if defined(linux)
-const char report_tcpInfo[] =
-"event=TCP_Info CWND=%u SND_SSTHRESH=%u RCV_SSTHRESH=%u UNACKED=%u SACK=%u LOST=%u RETRANS=%u FACK=%u RTT=%u REORDERING=%u\n";
-#endif
-#if defined(__FreeBSD__)
-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
-const char reportCSV_bw_format[] =
-"%s,%s,%d,%.1f-%.1f,%qd,%qd\n";
-
-const char reportCSV_bw_udp_format[] =
-"%s,%s,%d,%.1f-%.1f,%qd,%qd,%.3f,%d,%d,%.3f,%d\n";
-#else // HAVE_PRINTF_QD
-const char reportCSV_bw_format[] =
-"%s,%s,%d,%.1f-%.1f,%lld,%lld\n";
-
-const char reportCSV_bw_udp_format[] =
-"%s,%s,%d,%.1f-%.1f,%lld,%lld,%.3f,%d,%d,%.3f,%d\n";
-#endif // HAVE_PRINTF_QD
-#else // HAVE_QUAD_SUPPORT
-#ifdef WIN32
-const char reportCSV_bw_format[] =
-"%s,%s,%d,%.1f-%.1f,%I64d,%I64d\n";
-
-const char reportCSV_bw_udp_format[] =
-"%s,%s,%d,%.1f-%.1f,%I64d,%I64d,%.3f,%d,%d,%.3f,%d\n";
-#else
-const char reportCSV_bw_format[] =
-"%s,%s,%d,%.1f-%.1f,%d,%d\n";
-
-const char reportCSV_bw_udp_format[] =
-"%s,%s,%d,%.1f-%.1f,%d,%d,%.3f,%d,%d,%.3f,%d\n";
-#endif //WIN32
-#endif //HAVE_QUAD_SUPPORT
-/* -------------------------------------------------------------------
- * warnings
- * ------------------------------------------------------------------- */
-
-const char warn_window_requested[] =
-" (WARNING: requested %s)";
-
-const char warn_window_small[] =
-"WARNING: TCP window size set to %d bytes. A small window size\n\
-will give poor performance. See the Iperf documentation.\n";
-
-const char warn_delay_large[] =
-"WARNING: delay too large, reducing from %.1f to 1.0 seconds.\n";
-
-const char warn_no_pathmtu[] =
-"WARNING: Path MTU Discovery may not be enabled.\n";
-
-const char warn_no_ack[]=
-"[%3d] WARNING: did not receive ack of last datagram after %d tries.\n";
-
-const char warn_ack_failed[]=
-"[%3d] WARNING: ack of last datagram failed after %d tries.\n";
-
-const char warn_fileopen_failed[]=
-"WARNING: Unable to open file stream for transfer\n\
-Using default data stream. \n";
-
-const char unable_to_change_win[]=
-"WARNING: Unable to change the window size\n";
-
-const char opt_estimate[]=
-"Optimal Estimate\n";
-
-const char report_interval_small[] =
-"WARNING: interval too small, increasing from %3.2f to 0.5 seconds.\n";
-
-const char warn_invalid_server_option[] =
-"WARNING: option -%c is not valid for server mode\n";
-
-const char warn_invalid_client_option[] =
-"WARNING: option -%c is not valid for client mode\n";
-
-const char warn_invalid_compatibility_option[] =
-"WARNING: option -%c is not valid in compatibility mode\n";
-
-const char warn_implied_udp[] =
-"WARNING: option -%c implies udp testing\n";
-
-const char warn_implied_compatibility[] =
-"WARNING: option -%c has implied compatibility mode\n";
-
-const char warn_buffer_too_small[] =
-"WARNING: the UDP buffer was increased to %d for proper operation\n";
-
-const char warn_invalid_single_threaded[] =
-"WARNING: option -%c is not valid in single threaded versions\n";
-
-const char warn_invalid_report_style[] =
-"WARNING: unknown reporting style \"%s\", switching to default\n";
-
-const char warn_invalid_report[] =
-"WARNING: unknown reporting type \"%c\", ignored\n valid options are:\n\t exclude: C(connection) D(data) M(multicast) S(settings) V(server) report\n\n";
-
-#ifdef __cplusplus
-} /* end extern "C" */
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/locale.h new/iperf-3.0.10/src/locale.h
--- old/iperf-3.0.9/src/locale.h 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/locale.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,121 +0,0 @@
-/*
- * iperf, Copyright (c) 2014, The Regents of the University of
- * California, through Lawrence Berkeley National Laboratory (subject
- * to receipt of any required approvals from the U.S. Dept. of
- * Energy). All rights reserved.
- *
- * If you have questions about your rights to use or distribute this
- * software, please contact Berkeley Lab's Technology Transfer
- * Department at TTD@lbl.gov.
- *
- * NOTICE. This software is owned by the U.S. Department of Energy.
- * As such, the U.S. Government has been granted for itself and others
- * acting on its behalf a paid-up, nonexclusive, irrevocable,
- * worldwide license in the Software to reproduce, prepare derivative
- * works, and perform publicly and display publicly. Beginning five
- * (5) years after the date permission to assert copyright is obtained
- * from the U.S. Department of Energy, and subject to any subsequent
- * five (5) year renewals, the U.S. Government is granted for itself
- * and others acting on its behalf a paid-up, nonexclusive,
- * irrevocable, worldwide license in the Software to reproduce,
- * prepare derivative works, distribute copies to the public, perform
- * publicly and display publicly, and to permit others to do so.
- *
- * This code is distributed under a BSD style license, see the LICENSE
- * file for complete information.
- */
-#ifndef IPERF_LOCALE_H
-#define IPERF_LOCALE_H
-
-extern const char usage_shortstr[];
-extern const char usage_longstr[];
-extern const char version[];
-
-extern const char seperator_line[];
-
-extern const char server_port[] ;
-extern const char client_port[] ;
-extern const char bind_address[] ;
-extern const char multicast_ttl[] ;
-extern const char join_multicast[] ;
-extern const char client_datagram_size[] ;
-extern const char server_datagram_size[] ;
-extern const char tcp_window_size[] ;
-extern const char udp_buffer_size[] ;
-extern const char window_default[] ;
-extern const char wait_server_threads[] ;
-extern const char test_start_time[];
-extern const char test_start_bytes[];
-extern const char test_start_blocks[];
-
-extern const char report_time[] ;
-extern const char report_connecting[] ;
-extern const char report_reverse[] ;
-extern const char report_accepted[] ;
-extern const char report_cookie[] ;
-extern const char report_connected[] ;
-extern const char report_window[] ;
-extern const char report_autotune[] ;
-extern const char report_omit_done[] ;
-extern const char report_diskfile[] ;
-extern const char report_done[] ;
-extern const char report_read_lengths[] ;
-extern const char report_read_length_times[] ;
-extern const char report_bw_header[] ;
-extern const char report_bw_retrans_header[] ;
-extern const char report_bw_retrans_cwnd_header[] ;
-extern const char report_bw_udp_header[] ;
-extern const char report_bw_udp_sender_header[] ;
-extern const char report_bw_format[] ;
-extern const char report_bw_retrans_format[] ;
-extern const char report_bw_retrans_cwnd_format[] ;
-extern const char report_bw_udp_format[] ;
-extern const char report_bw_udp_sender_format[] ;
-extern const char report_summary[] ;
-extern const char report_sum_bw_format[] ;
-extern const char report_sum_bw_retrans_format[] ;
-extern const char report_sum_bw_udp_format[] ;
-extern const char report_sum_bw_udp_sender_format[] ;
-extern const char report_omitted[] ;
-extern const char report_bw_separator[] ;
-extern const char report_outoforder[] ;
-extern const char report_sum_outoforder[] ;
-extern const char report_peer[] ;
-extern const char report_mss_unsupported[] ;
-extern const char report_mss[] ;
-extern const char report_datagrams[] ;
-extern const char report_sum_datagrams[] ;
-extern const char server_reporting[] ;
-extern const char reportCSV_peer[] ;
-
-extern const char report_cpu[] ;
-extern const char report_local[] ;
-extern const char report_remote[] ;
-extern const char report_sender[] ;
-extern const char report_receiver[] ;
-
-extern const char report_tcpInfo[] ;
-extern const char report_tcpInfo[] ;
-
-
-extern const char warn_window_requested[] ;
-extern const char warn_window_small[] ;
-extern const char warn_delay_large[] ;
-extern const char warn_no_pathmtu[] ;
-extern const char warn_no_ack[];
-extern const char warn_ack_failed[];
-extern const char warn_fileopen_failed[];
-extern const char unable_to_change_win[];
-extern const char opt_estimate[];
-extern const char report_interval_small[] ;
-extern const char warn_invalid_server_option[] ;
-extern const char warn_invalid_client_option[] ;
-extern const char warn_invalid_compatibility_option[] ;
-extern const char warn_implied_udp[] ;
-extern const char warn_implied_compatibility[] ;
-extern const char warn_buffer_too_small[] ;
-extern const char warn_invalid_single_threaded[] ;
-extern const char warn_invalid_report_style[] ;
-extern const char warn_invalid_report[] ;
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/main.c new/iperf-3.0.10/src/main.c
--- old/iperf-3.0.9/src/main.c 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/main.c 2014-12-16 20:39:58.000000000 +0100
@@ -44,7 +44,7 @@
#include "iperf.h"
#include "iperf_api.h"
#include "units.h"
-#include "locale.h"
+#include "iperf_locale.h"
#include "net.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/net.h new/iperf-3.0.10/src/net.h
--- old/iperf-3.0.9/src/net.h 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/net.h 2014-12-16 20:39:58.000000000 +0100
@@ -41,9 +41,7 @@
#define NET_SOFTERROR -1
#define NET_HARDERROR -2
-unsigned long long htonll(unsigned long long);
-unsigned long long ntohll(unsigned long long);
-
+#ifndef htonll
/* XXX: Need a better check for byte order */
#if BYTE_ORDER == BIG_ENDIAN
#define HTONLL(n) (n)
@@ -72,3 +70,4 @@
#define ntohll(n) NTOHLL(n)
#endif
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iperf-3.0.9/src/tcp_info.c new/iperf-3.0.10/src/tcp_info.c
--- old/iperf-3.0.9/src/tcp_info.c 2014-10-14 23:13:07.000000000 +0200
+++ new/iperf-3.0.10/src/tcp_info.c 2014-12-16 20:39:58.000000000 +0100
@@ -56,7 +56,7 @@
#include "iperf.h"
#include "iperf_api.h"
-#include "locale.h"
+#include "iperf_locale.h"
/*************************************************************/
int
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org