1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
Description: spelling errors in binary (lintian)
fix spelling errors / typos
Author: Roberto Lumbreras
Index: iperf-2.2.0+dfsg/src/Client.cpp
===================================================================
--- iperf-2.2.0+dfsg.orig/src/Client.cpp 2024-05-27 17:19:13.547858514 +0200
+++ iperf-2.2.0+dfsg/src/Client.cpp 2024-05-27 17:19:13.547858514 +0200
@@ -1157,7 +1157,7 @@
reportstruct->sentTime = reportstruct->packetTime;
reportstruct->packetLen = writen(mySocket, mSettings->mBuf, writelen, &reportstruct->writecnt);
if (reportstruct->packetLen <= 0) {
- WARN_errno((reportstruct->packetLen < 0), "event writen()");
+ WARN_errno((reportstruct->packetLen < 0), "event written()");
if (reportstruct->packetLen == 0) {
peerclose = true;
}
@@ -1261,7 +1261,7 @@
}
write_offset += n;
if ((write_offset < writelen) && InProgress()) {
- WARN_errno(1, "tcp bounceback writen incomplete");
+ WARN_errno(1, "tcp bounceback written incomplete");
PostNullEvent(false,false);
goto RETRY_WRITE;
}
Index: iperf-2.2.0+dfsg/src/socket_io.c
===================================================================
--- iperf-2.2.0+dfsg.orig/src/socket_io.c 2024-05-27 17:19:13.547858514 +0200
+++ iperf-2.2.0+dfsg/src/socket_io.c 2024-05-27 17:19:13.547858514 +0200
@@ -211,7 +211,7 @@
// check for a fatal error vs an error that should retry
if ((errno != EINTR) && (errno != EAGAIN) && (errno != EWOULDBLOCK)) {
nwritten = inLen - nleft;
- fprintf(stdout, "FAIL: writen errno = %d (bytes=%d)\n", errno, nwritten);
+ fprintf(stdout, "FAIL: written errno = %d (bytes=%d)\n", errno, nwritten);
// sInterupted = 1;
goto DONE;
}
Index: iperf-2.2.0+dfsg/src/Server.cpp
===================================================================
--- iperf-2.2.0+dfsg.orig/src/Server.cpp 2024-04-07 05:47:17.000000000 +0200
+++ iperf-2.2.0+dfsg/src/Server.cpp 2024-05-27 17:23:21.590811724 +0200
@@ -400,7 +400,7 @@
if (n < 0) {
if (FATALTCPWRITERR(errno)) {
reportstruct->err_readwrite=WriteErrFatal;
- FAIL_errno(1, "tcp bounceback writen", mSettings);
+ FAIL_errno(1, "tcp bounceback written", mSettings);
peerclose = true;
break;
} else {
@@ -410,7 +410,7 @@
}
write_offset += n;
if (write_offset < writelen) {
- WARN_errno(1, "tcp bounceback writen incomplete");
+ WARN_errno(1, "tcp bounceback written incomplete");
PostNullEvent();
continue;
}
@@ -782,7 +782,7 @@
}
}
} else if (ctrunc_warn_enable && mSettings->mTransferIDStr) {
- fprintf(stderr, "%sWARN: recvmsg MSG_CTRUNC occured\n", mSettings->mTransferIDStr);
+ fprintf(stderr, "%sWARN: recvmsg MSG_CTRUNC occurred\n", mSettings->mTransferIDStr);
ctrunc_warn_enable = false;
}
}
Index: iperf-2.2.0+dfsg/man/iperf.1
===================================================================
--- iperf-2.2.0+dfsg.orig/man/iperf.1 2024-05-27 17:19:11.407867525 +0200
+++ iperf-2.2.0+dfsg/man/iperf.1 2024-05-27 17:25:35.362245740 +0200
@@ -153,7 +153,7 @@
Set the socket option of TCP_WINDOW_CLAMP, units is bytes.
.TP
.BR " \-\-test\-exchange\-timeout " \fI<value>\fR
-Set the maximum wait time for a test excahnge in seconds. Defaults to 60 seconds if not set. A value of zero will disable the timeout.
+Set the maximum wait time for a test exchange in seconds. Defaults to 60 seconds if not set. A value of zero will disable the timeout.
.TP
.BR \-t ", " \-\-time " \fIn\fR"
time in seconds to listen for new traffic connections and/or receive traffic (defaults to infinite)
@@ -184,13 +184,13 @@
Enable IPv6 reception by setting the domain and socket to AF_INET6 (Can receive on both IPv4 and IPv6)
.TP
.BR " \-\-tcp\-cca "
-Set the congestion control algorithm to be used for TCP connections \- will overide any client side settings (same as \-\-tcp\-congestion)
+Set the congestion control algorithm to be used for TCP connections \- will override any client side settings (same as \-\-tcp\-congestion)
.TP
.BR " \-\-working\-load "
Enable support for TCP working loads on UDP traffic streams
.TP
.BR " \-\-working\-load\-cca "
-Set the congestion control algorithm to be used for TCP working loads \- will overide any client side settings
+Set the congestion control algorithm to be used for TCP working loads \- will override any client side settings
.SH "CLIENT SPECIFIC OPTIONS"
.TP
.BR \-b ", " \-\-bandwidth " \fIn\fR[kmgKMG][,\fIn\fR[kmgKMG]] | \fIn\fR\fR[kmgKMG]pps"
@@ -1000,7 +1000,7 @@
.P
.B Unsynchronized clock detections with \-\-bounceback and \-\-trip\-times (as of March 19, 2023):
Iperf 2 can detect when the clocks have synchronization errors larger than the bounceback RTT. This is done via the client's send timestamp (clock A),
-the server's recieve timestamp (clock B) and the client's final receive timestamp (clock A.) The check, done on each bounceback, is
+the server's receive timestamp (clock B) and the client's final receive timestamp (clock A.) The check, done on each bounceback, is
write(A) < read(B) < read(A). This is supported in bounceback tests with
a slight adjustment: clock write(A) < clock read(B) < clock read(A) \- (clock write(B) \- clock read(B)). All the
timestamps are sampled on the initial write or read (not the completion of.)
|
