aboutsummaryrefslogtreecommitdiff
path: root/src/iperf_locale.c
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-08-18 16:36:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-18 16:36:41 +0000
commitf9fe5812c015d59650902bdd00fe54cb63e5023c (patch)
tree721420473c607e66455dc8270e13734482d32de5 /src/iperf_locale.c
parent995907c4615b76e542e5662ab1c27f6d2d0e461d (diff)
parent6505f976c2ed431621aad97eae297255bcb5f662 (diff)
downloadiperf3-f9fe5812c015d59650902bdd00fe54cb63e5023c.tar.gz
Upgrade iperf3 to 3.9 am: c5cac7b0eb am: 6505f976c2
Original change: https://android-review.googlesource.com/c/platform/external/iperf3/+/1402114 Change-Id: I68d1d99c82fd70645146dacbaf45a78a88f92e21
Diffstat (limited to 'src/iperf_locale.c')
-rw-r--r--src/iperf_locale.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/iperf_locale.c b/src/iperf_locale.c
index 2dd5a5b..d5a5354 100644
--- a/src/iperf_locale.c
+++ b/src/iperf_locale.c
@@ -109,6 +109,9 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
" -J, --json output in JSON format\n"
" --logfile f send output to a log file\n"
" --forceflush force flushing output at every interval\n"
+ " --timestamps <format> emit a timestamp at the start of each output line\n"
+ " (using optional format string as per strftime(3))\n"
+
" -d, --debug emit debugging output\n"
" -v, --version show version information and quit\n"
" -h, --help show this message and quit\n"
@@ -117,6 +120,9 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
" -D, --daemon run the server as a daemon\n"
" -I, --pidfile file write PID file\n"
" -1, --one-off handle one client connection then exit\n"
+ " --server-bitrate-limit #[KMG][/#] server's total bit rate limit (default 0 = no limit)\n"
+ " (optional slash and number of secs interval for averaging\n"
+ " total data rate. Default is 5 seconds)\n"
#if defined(HAVE_SSL)
" --rsa-private-key-path path to the RSA private key used to decrypt\n"
" authentication credentials\n"
@@ -125,11 +131,11 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
#endif //HAVE_SSL
"Client specific:\n"
" -c, --client <host> run in client mode, connecting to <host>\n"
-#if defined(HAVE_SCTP)
+#if defined(HAVE_SCTP_H)
" --sctp use SCTP rather than TCP\n"
" -X, --xbind <name> bind SCTP association to links\n"
" --nstreams # number of SCTP streams\n"
-#endif /* HAVE_SCTP */
+#endif /* HAVE_SCTP_H */
" -u, --udp use UDP rather than TCP\n"
" --connect-timeout # timeout for control connection setup (ms)\n"
" -b, --bitrate #[KMG][/#] target bitrate in bits/sec (0 for unlimited)\n"