#ifdef HAVE_CONFIG_H
#include "config.h"
#else
-#ifdef WIN32
-#include "config.win32.h"
-#endif
#endif
#ifdef __cplusplus
Usage: %s [-s|-c host] [options]\n\
Try `%s --help' for more information.\n";
-#ifdef WIN32
-const char usage_long1[] = "\
-Usage: iperf [-s|-c host] [options]\n\
- iperf [-h|--help] [-v|--version]\n\
-\n\
-Client/Server:\n\
- -f, --format [kmKM] format to report: Kbits, Mbits, KBytes, MBytes\n\
- -i, --interval # seconds between periodic bandwidth reports\n\
- -l, --len #[KM] length of buffer to read or write (default 8 KB)\n\
- -m, --print_mss print TCP maximum segment size (MTU - TCP/IP header)\n\
- -o, --output <filename> output the report or error message to this specified file\n\
- -p, --port # server port to listen on/connect to\n\
- -u, --udp use UDP rather than TCP\n\
- -w, --window #[KM] TCP window size (socket buffer size)\n\
- -B, --bind <host> bind to <host>, an interface or multicast address\n\
- -C, --compatibility for use with older versions does not sent extra msgs\n\
- -M, --mss # set TCP maximum segment size (MTU - 40 bytes)\n\
- -N, --nodelay set TCP no delay, disabling Nagle's Algorithm\n\
- -V, --IPv6Version Set the domain to IPv6\n\
-\n\
-Server specific:\n\
- -s, --server run in server mode\n\
- -U, --single_udp run in single threaded UDP mode\n\
- -D, --daemon run the server as a daemon\n\
- -R, --remove remove service in win32\n";
-
-const char usage_long2[] = "\
-\n\
-Client specific:\n\
- -b, --bandwidth #[KM] for UDP, bandwidth to send at in bits/sec\n\
- (default 1 Mbit/sec, implies -u)\n\
- -c, --client <host> run in client mode, connecting to <host>\n\
- -d, --dualtest Do a bidirectional test simultaneously\n\
- -n, --num #[KM] number of bytes to transmit (instead of -t)\n\
- -r, --tradeoff Do a bidirectional test individually\n\
- -t, --time # time in seconds to transmit for (default 10 secs)\n\
- -F, --fileinput <name> input the data to be transmitted from a file\n\
- -I, --stdin input the data to be transmitted from stdin\n\
- -L, --listenport # port to recieve bidirectional tests back on\n\
- -P, --parallel # number of parallel client threads to run\n\
- -T, --ttl # time-to-live, for multicast (default 1)\n\
-\n\
-Miscellaneous:\n\
- -h, --help print this message and quit\n\
- -v, --version print version information and quit\n\
-\n\
-[KM] Indicates options that support a K or M suffix for kilo- or mega-\n\
-\n\
-The TCP window size option can be set by the environment variable\n\
-TCP_WINDOW_SIZE. Most other options can be set by an environment variable\n\
-IPERF_<long option name>, such as IPERF_BANDWIDTH.\n\
-\n\
-Report bugs to <dast@nlanr.net>\n";
-
-#else
const char usage_long[] = "\
Usage: iperf [-s|-c host] [options]\n\
iperf [-h|--help] [-v|--version]\n\
-l, --len #[KM] length of buffer to read or write (default 8 KB)\n\
-m, --print_mss print TCP maximum segment size (MTU - TCP/IP header)\n\
-p, --port # server port to listen on/connect to\n\
- -u, --udp use UDP rather than TCP\n\
+ -u, --udp use UDP as transport protocol\n\
+ -d, --dccp use DCCP as transport protocol\n\
-w, --window #[KM] TCP window size (socket buffer size)\n\
+ -A, --algorithm set TCP congestion control algorithm\n\
-B, --bind <host> bind to <host>, an interface or multicast address\n\
-C, --compatibility for use with older versions does not sent extra msgs\n\
-M, --mss # set TCP maximum segment size (MTU - 40 bytes)\n\
-D, --daemon run the server as a daemon\n\
\n\
Client specific:\n\
- -b, --bandwidth #[KM] for UDP, bandwidth to send at in bits/sec\n\
+ -b, --bandwidth #[KM] for UDP/DCCP, bandwidth to send at in bits/sec\n\
(default 1 Mbit/sec, implies -u)\n\
-c, --client <host> run in client mode, connecting to <host>\n\
- -d, --dualtest Do a bidirectional test simultaneously\n\
- -n, --num #[KM] number of bytes to transmit (instead of -t)\n\
+ -2, --dualtest Do a bidirectional test simultaneously\n\
-r, --tradeoff Do a bidirectional test individually\n\
-t, --time # time in seconds to transmit for (default 10 secs)\n\
+ -n, --num #[KM] number of bytes to transmit (instead of -t)\n\
-F, --fileinput <name> input the data to be transmitted from a file\n\
-I, --stdin input the data to be transmitted from stdin\n\
- -L, --listenport # port to recieve bidirectional tests back on\n\
+ -L, --listenport # port to receive bidirectional tests back on\n\
-P, --parallel # number of parallel client threads to run\n\
-T, --ttl # time-to-live, for multicast (default 1)\n\
\n\
TCP_WINDOW_SIZE. Most other options can be set by an environment variable\n\
IPERF_<long option name>, such as IPERF_BANDWIDTH.\n\
\n\
-Report bugs to <dast@nlanr.net>\n";
-#endif
+Report bugs to <gerrit@erg.abdn.ac.uk>";
// include a description of the threading in the version
#if defined( HAVE_POSIX_THREAD )
#define IPERF_THREADS "pthreads"
-#elif defined( HAVE_WIN32_THREAD )
- #define IPERF_THREADS "win32 threads"
#else
#define IPERF_THREADS "single threaded"
#endif
const char version[] =
-"iperf version " IPERF_VERSION " (" IPERF_VERSION_DATE ") " IPERF_THREADS "\n";
+"iperf version " IPERF_VERSION " (" IPERF_VERSION_DATE ") " IPERF_THREADS;
/* -------------------------------------------------------------------
* settings
"Setting multicast TTL to %d\n";
const char join_multicast[] =
-"Joining multicast group %s\n";
+"Joining multicast group %s on %s\n";
const char client_datagram_size[] =
"Sending %d byte datagrams\n";
const char tcp_window_size[] =
"TCP window size";
-const char udp_buffer_size[] =
-"UDP buffer size";
+const char dgram_buffer_size[] =
+"datagram buffer size";
const char window_default[] =
"(default)";
Datagrams\n";
const char report_bw_jitter_loss_format[] =
-"[%3d] %4.1f-%4.1f sec %ss %ss/sec %5.3f ms %4d/%5d (%.2g%%)\n";
+"[%3d] %4.1f-%4.1f sec %ss %ss/sec %6.3f ms %4d/%5d (%.2g%%)\n";
const char report_sum_bw_jitter_loss_format[] =
-"[SUM] %4.1f-%4.1f sec %ss %ss/sec %5.3f ms %4d/%5d (%.2g%%)\n";
+"[SUM] %4.1f-%4.1f sec %ss %ss/sec %6.3f ms %4d/%5d (%.2g%%)\n";
const char report_outoforder[] =
"[%3d] %4.1f-%4.1f sec %d datagrams received out-of-order\n";
"[%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";
+"[%3d] MSS and MTU size unknown (socket option not supported by OS?)\n";
const char report_mss[] =
"[%3d] MSS size %d bytes (MTU %d bytes, %s)\n";
"%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_jitter_loss_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_jitter_loss_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_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";
+"WARNING: the 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";
projects / iperf / blobdiff