Commit Graph

583 Commits

Author SHA1 Message Date
Jef Poskanzer
243c974f23 Note -i's default in the man page. 2013-11-08 16:13:40 -08:00
Jef Poskanzer
565366424b Changed default for -i from 0 to 1. 2013-11-08 16:12:26 -08:00
Jef Poskanzer
082cbb0ee6 The ctrl_sck does not need to be in the select write_set, and indeed
having it there may cause the select to return immediately every
time. Which is bad, m'kay?

Also, changed the coding idiom used to keep track of the maximum fd
in the fd sets, to be clearer.
2013-11-08 15:59:17 -08:00
Jef Poskanzer
e35f2035d5 Added a cast to avoid a compiler warning. 2013-11-07 08:20:04 -08:00
Jef Poskanzer
d2b9eb1a87 Another potentially protocol-breaking but necessary change.
The error numbers sent for SERVER_ERROR state were declared
as ints, and therefore could be 32 or 64 bits depending on
architecture.  I changed them to be explicitly 32 bits.

This should be the last of these, I've checked out at every network
read/write call and they look ok.

And bumped the version to 3.0-RC5.
2013-11-07 08:14:45 -08:00
Jef Poskanzer
8115b2a26e Grammar correction in error message. 2013-11-06 15:24:47 -08:00
Jef Poskanzer
4e2ef5070b More sizeof changes.
A couple more sizeof issues found and fixed.  One of them is
actually another protocol change, but due to a fortuitous accident
it should remain compatible with older versions.

Detailed explanation: When a client attempts to connect to a server that
is already busy, the server is supposed to return ACCESS_DENIED as a
state value.  It was doing so, but was writing it as an int, even though
state values are supposed to be signed chars.  The client read the value
correctly as a signed char, getting one byte and throwing away the rest.
So why did this ever work?  Because ACCESS_DENIED is the value -1, and
any byte of an int -1 equals a signed char -1.  If ACCESS_DENIED had been
any other value, this would have been an opvious bug and would have long
since been fixed.  As is, it stuck around working by accident until now.
2013-11-06 11:05:46 -08:00
Jef Poskanzer
2944aaa05b State is signed char.
test->state is an explicitly signed char, so the two routines that
manipulate it must use explicitly signed chars too.

One could argue that the two negative state values should have been
positive like the rest, but changing them now would be a protocol change.
2013-11-06 10:33:26 -08:00
Jef Poskanzer
3651fa29e2 Bump version.
On further reflection, last night's seemingly trivial change to
the JSON sending/receiving routines is actually a protocol change,
on some machines, and therefore merits a version number change.
2013-11-06 09:42:54 -08:00
Jef Poskanzer
ddb503b5a3 The JSON length field should be explicitly 32 bits, not just "int",
for better interoperation.
2013-11-05 21:50:29 -08:00
Jef Poskanzer
9393606f5b Changed -O default from 1 to 0. 2013-11-03 14:22:37 -08:00
Jef Poskanzer
578a1961cf Bump version to 3.0-RC3. 2013-11-01 14:01:20 -07:00
Jef Poskanzer
38917b1f3f Run -i interval timers on the server as well as the client. 2013-11-01 13:59:33 -07:00
Jef Poskanzer
9019e92411 Bump version to RC2. 2013-10-29 15:05:05 -07:00
Jef Poskanzer
afe6222a89 Move termination signal handing from main into iperf_run_client
and iperf_run_server, so that API users get it too.  Also, call
iperf_errexit with an appropriate message, which in -J mode dumps
out any accumulated JSON data.
2013-10-29 15:03:17 -07:00
Jef Poskanzer
7639c1a631 Bump version to RC1. 2013-10-28 17:14:25 -07:00
Jef Poskanzer
69376ec7ed Fix retransmit accounting so it works right with the --omit flag. 2013-10-28 17:13:30 -07:00
Jef Poskanzer
8a7e01eb8f Implement -A flag to set CPU affinity. 2013-10-25 17:00:52 -07:00
Jef Poskanzer
a953f5aa2c Re-do of how --omit works. 2013-10-24 14:08:04 -07:00
Jef Poskanzer
ea5d93b241 Always send omit client->server, otherwise omit==0 doesn't work. 2013-10-22 13:55:56 -07:00
Jef Poskanzer
965d8d7688 Added a summary line to the final report for the -F option. 2013-10-21 16:15:27 -07:00
Jef Poskanzer
e32a7bcd77 Added the -F / --file flag, to use a specified file instead
of random data for sending, and to save the data in the file
on receiving.
2013-10-19 07:43:38 -07:00
Jef Poskanzer
36662029e5 Added a timestamp in verbose and JSON output. 2013-09-14 08:59:50 -07:00
Jef Poskanzer
66ee0e2084 Got rid of the -d/--debug flag, it was not being used for anything. 2013-09-14 08:36:11 -07:00
Jef Poskanzer
cc2376c1e3 Bump version & date. 2013-09-14 08:33:17 -07:00
Jef Poskanzer
9e5f6f57f4 Add note in man page about the -w flag getting transmitted to the server. 2013-09-14 08:31:06 -07:00
Jef Poskanzer
f8bd11af23 Ran across a little error in some code that is currently
commented out. Worth fixing anyway.
2013-09-12 11:01:48 -07:00
Jef Poskanzer
65b2261d4c Slight enhancement to the logic for switching to SIGALRM timing mode. 2013-08-29 17:43:20 -07:00
Jef Poskanzer
8bdc8fffcf Fix bug in reverse mode. 2013-08-29 11:38:20 -07:00
Jef Poskanzer
78a711169e Crash fix from Aaron Brown. 2013-08-19 12:29:35 -07:00
Jef Poskanzer
5c01581b32 Detect that the system doesn't support IPv6 and try falling back to IPv4. 2013-08-19 10:02:01 -07:00
Jef Poskanzer
019434022c test->state needs to be explicitly signed char to accomodate a couple
of error states which are negative.  On most systems this doesn't
matter because char is signed, but on ARM CPUs char is unsigned.
2013-08-16 13:19:42 -07:00
Jef Poskanzer
cb6347fba9 Fix for issue 79, bad results when using the API. 2013-08-10 09:12:07 -07:00
Jef Poskanzer
d611f13e18 Fix incorrect default bandwidth limit when using the API instead
of the command line.
2013-07-12 19:56:49 -07:00
Andy Lake
861c06d862 Add queue.h to Makefile so will be included in package generated by 'make dist' 2013-07-11 14:07:41 -04:00
Jef Poskanzer
ba51358f7c Added API routines to get/set the verbose flag. 2013-07-10 15:12:51 -07:00
Jef Poskanzer
5789260432 Changed the -I / --ignore flag to -O / --omit, so that we can use the
same flag in bwctl.
2013-07-05 13:52:19 -07:00
Jef Poskanzer
26e392e175 Oops, left out the --version4 long opt. 2013-07-04 18:06:29 -07:00
Jef Poskanzer
c969359995 Added -I flag to ignore an initial period of data transfer,
defaulting to one second.
2013-07-03 12:01:57 -07:00
Jef Poskanzer
434e786fd0 More descriptive variable names for the throttling code. 2013-06-25 15:05:37 -07:00
Jef Poskanzer
647d3b95a8 New implementation of the -b bandwidth limit flag, that applies to
TCP as well as UDP.
2013-06-24 07:14:14 -07:00
Jef Poskanzer
cf06ba653a Server now exits after five consecutive errors. 2013-06-07 15:28:05 -07:00
Jef Poskanzer
3433c4d2c1 Better ifdefs for sendfile on OS/X. 2013-06-07 08:41:38 -07:00
Jef Poskanzer
c39c4f503f Added an ifdef for Mac OS/X version, to better protect the sendfile code. 2013-06-07 08:16:24 -07:00
Jef Poskanzer
5ec1d758f1 Raise maximum TCP buffer size to 512 MB. 2013-06-04 16:38:49 -07:00
Jef Poskanzer
481853ae5a Convert IPv4-mapped IPv6 address strings into regular old IPv4 format. 2013-06-04 00:11:41 -07:00
Jef Poskanzer
c687db9da2 Storing the known-to-not-work Flow Label code, just to save it.
The user-visible parts are commented out or return a "not implemented
yet" error message.  The other parts are harmless.

We'll come back to this once we figure out how exactly one sets
the Flow Label.
2013-06-03 13:12:43 -07:00
Jef Poskanzer
912bf5784f Add message emphasizing when we're doing reverse mode. 2013-05-31 10:36:12 -07:00
Jef Poskanzer
69bdbfd36d Handle retransmits correctly in reverse mode. 2013-05-29 15:18:18 -07:00
Jef Poskanzer
2c042fd469 Simplify multiple client/server forward/reverse checks into
a single sender boolean.
2013-05-29 12:32:42 -07:00