Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions RELNOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ iperf-3.18 2024-12-13

* Clang compilation failure on Android were fixed (PR#1687).

* `iperf_time_add()` was optimizated to improve performance
* `iperf_time_add()` was optimized to improve performance
(PR#1742).

* Debug messages were added when the state changes (PR#1734).
Expand Down Expand Up @@ -777,7 +777,7 @@ iperf 3.2 2017-06-26
accepted for backwards compatibility (#583).

* Application-level bandwidth pacing (--bitrate option) is now
checked every millisecond by default, instead of of every tenth of
checked every millisecond by default, instead of every tenth of
a second, to provide smoother traffic behavior when using
application pacing (#460). The pacing can be tuned via the use of
the --pacing-timer option (#563).
Expand Down Expand Up @@ -1133,7 +1133,7 @@ iperf 3.0.8 2014-09-30

* User-visible changes

* Updated license and copyright verbage to confirm to LBNL Tech
* Updated license and copyright verbiage to confirm to LBNL Tech
Transfer requirements. No substantive changes; license remains
the 3-clause BSD license.

Expand Down
2 changes: 1 addition & 1 deletion src/cjson.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ typedef struct cJSON
/* The type of the item, as above. */
int type;

/* The item's string, if type==cJSON_String and type == cJSON_Raw */
/* The item's string, if type==cJSON_String and type == cJSON_Raw */
char *valuestring;
/* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
int64_t valueint;
Expand Down
14 changes: 7 additions & 7 deletions src/iperf_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
test->settings->cntl_ka_keepidle = atoi(optarg);
}
}
// Seems that at least in Windows WSL2, TCP keepalive retries full inteval must be
// Seems that at least in Windows WSL2, TCP keepalive retries full interval must be
// smaller than the idle interval. Otherwise, the keepalive message is sent only once.
if (test->settings->cntl_ka_keepidle &&
test->settings->cntl_ka_keepidle <= (test->settings->cntl_ka_count * test->settings->cntl_ka_interval)) {
Expand Down Expand Up @@ -2050,7 +2050,7 @@ iperf_check_throttle(struct iperf_stream *sp, struct iperf_time *nowP)
// If estimated time to next send is large enough, sleep instead of just CPU looping until green light is set
if (missing_rate < 0) {
delta_bits = bits_sent - (seconds * sp->test->settings->rate);
// Calclate time until next data send is required
// Calculate time until next data send is required
time_to_green_light = (SEC_TO_NS * delta_bits / sp->test->settings->rate);
// Whether should wait before next send
if (time_to_green_light >= 0) {
Expand All @@ -2073,7 +2073,7 @@ iperf_check_throttle(struct iperf_stream *sp, struct iperf_time *nowP)

#else /* HAVE_NANOSLEEP */
nanosleep_time.tv_sec = 0;
// Sleep until average baud rate reaches the target value or intrupt / error
// Sleep until average baud rate reaches the target value or interrupt / error
do {
// nansleep() time should be less than 1 sec
nanosleep_time.tv_nsec = (time_to_green_light >= SEC_TO_NS) ? SEC_TO_NS - 1 : time_to_green_light;
Expand Down Expand Up @@ -2101,7 +2101,7 @@ iperf_check_total_rate(struct iperf_test *test, iperf_size_t last_interval_bytes
if (test->done || test->settings->bitrate_limit == 0) // Continue only if check should be done
return;

/* Add last inetrval's transferred bytes to the array */
/* Add last interval's transferred bytes to the array */
if (++test->bitrate_limit_last_interval_index >= test->settings->bitrate_limit_stats_per_interval)
test->bitrate_limit_last_interval_index = 0;
test->bitrate_limit_intervals_traffic_bytes[test->bitrate_limit_last_interval_index] = last_interval_bytes_transferred;
Expand Down Expand Up @@ -2824,7 +2824,7 @@ get_results(struct iperf_test *test)
i_errno = IERECVRESULTS;
r = -1;
} else if ( (j_omitted_errors == NULL && j_omitted_packets != NULL) || (j_omitted_errors != NULL && j_omitted_packets == NULL) ) {
/* For backward compatibility allow to not receive "omitted" statistcs */
/* For backward compatibility allow to not receive "omitted" statistics */
i_errno = IERECVRESULTS;
r = -1;
} else {
Expand Down Expand Up @@ -3058,7 +3058,7 @@ add_to_interval_list(struct iperf_stream_result * rp, struct iperf_interval_resu
{
struct iperf_interval_results *irp;

/* Only the last interval result is needed, so removing last old entry to reduce memory consupmtion */
/* Only the last interval result is needed, so removing last old entry to reduce memory consumption */
if (!TAILQ_EMPTY(&rp->interval_results) &&
(irp = TAILQ_LAST(&rp->interval_results, irlisthead)) != NULL
) {
Expand Down Expand Up @@ -5525,7 +5525,7 @@ iperf_set_control_keepalive(struct iperf_test *test)
}
}

// Seems that at least in Windows WSL2, TCP keepalive retries full inteval must be
// Seems that at least in Windows WSL2, TCP keepalive retries full interval must be
// smaller than the idle interval. Otherwise, the keepalive message is sent only once.
if (test->settings->cntl_ka_keepidle) {
if (test->settings->cntl_ka_keepidle <= (kainterval * kacount)) {
Expand Down
4 changes: 2 additions & 2 deletions src/iperf_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void add_to_interval_list(struct iperf_stream_result * rp, struct iperf_int

/**
* connect_msg -- displays connection message
* denoting senfer/receiver details
* denoting sender/receiver details
*
*/
void connect_msg(struct iperf_stream * sp);
Expand Down Expand Up @@ -509,7 +509,7 @@ enum {
IEINITSTREAM = 201, // Unable to initialize stream (check herror/perror)
IESTREAMLISTEN = 202, // Unable to start stream listener (check perror)
IESTREAMCONNECT = 203, // Unable to connect stream (check herror/perror)
IESTREAMACCEPT = 204, // Unable to accepte stream connection (check perror)
IESTREAMACCEPT = 204, // Unable to accept stream connection (check perror)
IESTREAMWRITE = 205, // Unable to write to stream socket (check perror)
IESTREAMREAD = 206, // Unable to read from stream (check perror)
IESTREAMCLOSE = 207, // Stream has closed unexpectedly
Expand Down
4 changes: 2 additions & 2 deletions src/iperf_locale.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
" -m, --mptcp use MPTCP rather than plain TCP\n"
#endif
" -d, --debug[=#] emit debugging output\n"
" (optional optional \"=\" and debug level: 1-4. Default is 4 - all messages)\n"
" (optional \"=\" and debug level: 1-4. Default is 4 - all messages)\n"
" -v, --version show version information and quit\n"
" -h, --help show this message and quit\n"
"Server specific:\n"
Expand Down Expand Up @@ -173,7 +173,7 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
" (default %d Mbit/sec for UDP, unlimited for TCP)\n"
" (optional slash and packet count for burst mode)\n"
" --pacing-timer #[KMG] set the Server timing for pacing, in microseconds (default %d)\n"
" (deprecated - for servers using older versions ackward compatibility)\n"
" (deprecated - for servers using older versions backward compatibility)\n"
#if defined(HAVE_SO_MAX_PACING_RATE)
" --fq-rate #[KMG] enable fair-queuing based socket pacing in\n"
" bits/sec (Linux only)\n"
Expand Down
6 changes: 3 additions & 3 deletions src/iperf_sctp.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ iperf_sctp_listen(struct iperf_test *test)
/*
* If binding to the wildcard address with no explicit address
* family specified, then force us to get an AF_INET6 socket.
* More details in the comments in netanounce().
* More details in the comments in netannounce().
*/
if (test->settings->domain == AF_UNSPEC && !test->bind_address) {
hints.ai_family = AF_INET6;
Expand Down Expand Up @@ -735,9 +735,9 @@ iperf_sctp_bindx(struct iperf_test *test, int s, int is_server)
/* iperf_sctp_get_rtt
*
* Get SCTP stream RTT.
* Assuming that iperf3 supports only one-toone SCTP associassion, and not one-to-many associassion.
* Assuming that iperf3 supports only one-to-one SCTP association, and not one-to-many association.
*
* Main resouses used are RFC-6458, man pages for SCTP,
* Main resources used are RFC-6458, man pages for SCTP,
* https://docs.oracle.com/cd/E19253-01/817-4415/sockets-199/index.html.
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/iperf_sctp.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int iperf_sctp_recv(struct iperf_stream *);

/**
* iperf_sctp_send -- sends the client data for sctp
* and the Param/result message exchanges
* and the Param/result message exchanges
* returns: bytes sent
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/iperf_tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ iperf_tcp_listen(struct iperf_test *test)
/*
* If binding to the wildcard address with no explicit address
* family specified, then force us to get an AF_INET6 socket.
* More details in the comments in netanounce().
* More details in the comments in netannounce().
*/
if (test->settings->domain == AF_UNSPEC && !test->bind_address) {
hints.ai_family = AF_INET6;
Expand Down
2 changes: 1 addition & 1 deletion src/iperf_tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int iperf_tcp_recv(struct iperf_stream *);

/**
* iperf_tcp_send -- sends the client data for TCP
* and the Param/result message exchanges
* and the Param/result message exchanges
* returns: bytes sent
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/iperf_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ getline(char **buf, size_t *bufsiz, FILE *fp)

#endif

/* Translate numeric State to text - for debugging pupposes */
/* Translate numeric State to text - for debugging purposes */
char *
state_to_text(signed char state)
{
Expand Down
2 changes: 1 addition & 1 deletion src/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen,
return (ret);
}

/* netdial and netannouce code comes from libtask: http://swtch.com/libtask/
/* netdial and netannounce code comes from libtask: http://swtch.com/libtask/
* Copyright: http://swtch.com/libtask/COPYRIGHT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/tcp_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#
* FreeBSD has a limited implementation that only includes the following:
* tcpi_snd_ssthresh, tcpi_snd_cwnd, tcpi_rcv_space, tcpi_rtt
* Based on information on http://wiki.freebsd.org/8.0TODO, I dont think this will be
* Based on information on http://wiki.freebsd.org/8.0TODO, I don't think this will be
* fixed before v8.1 at the earliest.
*
* OSX has no support.
Expand Down
4 changes: 2 additions & 2 deletions src/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ extern void tmr_run( struct iperf_time* nowP ) /* __attribute__((hot)) */;
/* Reset the clock on a timer, to current time plus the original timeout. */
extern void tmr_reset( struct iperf_time* nowP, Timer* timer );

/* Deschedule a timer. Note that non-periodic timers are automatically
** descheduled when they run, so you don't have to call this on them.
/* Unschedule a timer. Note that non-periodic timers are automatically
** unscheduled when they run, so you don't have to call this on them.
*/
extern void tmr_cancel( Timer* timer );

Expand Down