X-Git-Url: http://sjero.net/git/?p=iperf;a=blobdiff_plain;f=src%2FLocale.c;fp=src%2FLocale.c;h=b2e8d1f8093a1f75366af8587e88c8e84c6a18f4;hp=d7e71f87439ff260aa8c6af795b0eae8fec6cc13;hb=90fc1e2c0c74319759b21d4a177c32691b88fdf3;hpb=fad82d47d76abc8f4ac6767e58b89859ad35a2ca diff --git a/src/Locale.c b/src/Locale.c index d7e71f8..b2e8d1f 100644 --- a/src/Locale.c +++ b/src/Locale.c @@ -78,7 +78,8 @@ Client/Server:\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\ -B, --bind bind to , an interface or multicast address\n\ -C, --compatibility for use with older versions does not sent extra msgs\n\ @@ -92,16 +93,16 @@ Server specific:\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 run in client mode, connecting to \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 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\ @@ -115,7 +116,7 @@ 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_, such as IPERF_BANDWIDTH.\n\ \n\ -Report bugs to \n"; +Report bugs to "; // include a description of the threading in the version #if defined( HAVE_POSIX_THREAD ) @@ -125,7 +126,7 @@ Report bugs to \n"; #endif const char version[] = -"iperf version " IPERF_VERSION " (" IPERF_VERSION_DATE ") " IPERF_THREADS "\n"; +"iperf version " IPERF_VERSION " (" IPERF_VERSION_DATE ") " IPERF_THREADS; /* ------------------------------------------------------------------- * settings @@ -158,8 +159,8 @@ const char server_datagram_size[] = 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)"; @@ -191,10 +192,10 @@ const char report_bw_jitter_loss_header[] = 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"; @@ -206,7 +207,7 @@ 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"; +"[%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"; @@ -251,10 +252,6 @@ const char reportCSV_bw_jitter_loss_format[] = 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"; @@ -289,14 +286,11 @@ const char warn_invalid_client_option[] = 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";