2009-11-02 22:43:19 +00:00
|
|
|
/*
|
2020-05-11 12:21:26 -07:00
|
|
|
* iperf, Copyright (c) 2014-2020, The Regents of the University of
|
2014-09-29 14:00:46 -07:00
|
|
|
* California, through Lawrence Berkeley National Laboratory (subject
|
|
|
|
* to receipt of any required approvals from the U.S. Dept. of
|
|
|
|
* Energy). All rights reserved.
|
2011-04-20 20:33:09 +00:00
|
|
|
*
|
2014-09-29 14:00:46 -07:00
|
|
|
* If you have questions about your rights to use or distribute this
|
|
|
|
* software, please contact Berkeley Lab's Technology Transfer
|
|
|
|
* Department at TTD@lbl.gov.
|
|
|
|
*
|
|
|
|
* NOTICE. This software is owned by the U.S. Department of Energy.
|
|
|
|
* As such, the U.S. Government has been granted for itself and others
|
|
|
|
* acting on its behalf a paid-up, nonexclusive, irrevocable,
|
|
|
|
* worldwide license in the Software to reproduce, prepare derivative
|
|
|
|
* works, and perform publicly and display publicly. Beginning five
|
|
|
|
* (5) years after the date permission to assert copyright is obtained
|
|
|
|
* from the U.S. Department of Energy, and subject to any subsequent
|
|
|
|
* five (5) year renewals, the U.S. Government is granted for itself
|
|
|
|
* and others acting on its behalf a paid-up, nonexclusive,
|
|
|
|
* irrevocable, worldwide license in the Software to reproduce,
|
|
|
|
* prepare derivative works, distribute copies to the public, perform
|
|
|
|
* publicly and display publicly, and to permit others to do so.
|
|
|
|
*
|
|
|
|
* This code is distributed under a BSD style license, see the LICENSE
|
|
|
|
* file for complete information.
|
2009-11-02 22:43:19 +00:00
|
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <assert.h>
|
2019-11-16 23:25:37 +08:00
|
|
|
#include <arpa/inet.h>
|
2009-11-02 22:43:19 +00:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <netinet/in.h>
|
2014-05-19 10:15:36 -07:00
|
|
|
#ifdef HAVE_STDINT_H
|
2009-11-02 22:43:19 +00:00
|
|
|
#include <stdint.h>
|
2014-05-19 10:15:36 -07:00
|
|
|
#endif
|
2009-11-02 22:43:19 +00:00
|
|
|
#include <sys/time.h>
|
2010-07-22 23:26:38 +00:00
|
|
|
#include <sys/select.h>
|
2009-11-02 22:43:19 +00:00
|
|
|
|
|
|
|
#include "iperf.h"
|
|
|
|
#include "iperf_api.h"
|
2012-12-05 12:34:58 -08:00
|
|
|
#include "iperf_util.h"
|
2009-11-02 22:43:19 +00:00
|
|
|
#include "iperf_udp.h"
|
|
|
|
#include "timer.h"
|
|
|
|
#include "net.h"
|
2017-05-03 14:03:22 -07:00
|
|
|
#include "cjson.h"
|
2014-08-28 08:59:32 -07:00
|
|
|
#include "portable_endian.h"
|
2009-11-02 22:43:19 +00:00
|
|
|
|
2017-11-08 17:29:26 +00:00
|
|
|
#if defined(HAVE_INTTYPES_H)
|
|
|
|
# include <inttypes.h>
|
|
|
|
#else
|
2020-07-10 15:29:47 -07:00
|
|
|
# ifndef PRIu64
|
|
|
|
# if sizeof(long) == 8
|
|
|
|
# define PRIu64 "lu"
|
|
|
|
# else
|
|
|
|
# define PRIu64 "llu"
|
|
|
|
# endif
|
|
|
|
# endif
|
2017-11-08 17:29:26 +00:00
|
|
|
#endif
|
|
|
|
|
2010-07-22 18:57:08 +00:00
|
|
|
/* iperf_udp_recv
|
2009-11-02 22:43:19 +00:00
|
|
|
*
|
2010-07-22 18:57:08 +00:00
|
|
|
* receives the data for UDP
|
2009-11-02 22:43:19 +00:00
|
|
|
*/
|
|
|
|
int
|
2010-07-14 23:24:58 +00:00
|
|
|
iperf_udp_recv(struct iperf_stream *sp)
|
2009-11-02 22:43:19 +00:00
|
|
|
{
|
2014-08-28 08:59:32 -07:00
|
|
|
uint32_t sec, usec;
|
|
|
|
uint64_t pcount;
|
2013-02-22 15:54:05 -08:00
|
|
|
int r;
|
2009-11-02 22:43:19 +00:00
|
|
|
int size = sp->settings->blksize;
|
2020-05-12 16:26:55 -07:00
|
|
|
int first_packet = 0;
|
2009-11-02 22:43:19 +00:00
|
|
|
double transit = 0, d = 0;
|
2018-05-16 23:49:45 +02:00
|
|
|
struct iperf_time sent_time, arrival_time, temp_time;
|
2010-07-14 23:24:58 +00:00
|
|
|
|
2013-02-22 15:54:05 -08:00
|
|
|
r = Nread(sp->socket, sp->buffer, size, Pudp);
|
2009-11-02 22:43:19 +00:00
|
|
|
|
2014-10-13 04:28:58 -07:00
|
|
|
/*
|
|
|
|
* If we got an error in the read, or if we didn't read anything
|
|
|
|
* because the underlying read(2) got a EAGAIN, then skip packet
|
|
|
|
* processing.
|
|
|
|
*/
|
|
|
|
if (r <= 0)
|
2013-02-22 15:54:05 -08:00
|
|
|
return r;
|
2010-07-22 18:57:08 +00:00
|
|
|
|
2018-02-23 15:36:25 -08:00
|
|
|
/* Only count bytes received while we're in the correct state. */
|
|
|
|
if (sp->test->state == TEST_RUNNING) {
|
2020-05-12 16:26:55 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* For jitter computation below, it's important to know if this
|
|
|
|
* packet is the first packet received.
|
|
|
|
*/
|
|
|
|
if (sp->result->bytes_received == 0) {
|
|
|
|
first_packet = 1;
|
|
|
|
}
|
|
|
|
|
2018-02-23 15:36:25 -08:00
|
|
|
sp->result->bytes_received += r;
|
|
|
|
sp->result->bytes_received_this_interval += r;
|
|
|
|
|
2020-05-12 16:26:55 -07:00
|
|
|
/* Dig the various counters out of the incoming UDP packet */
|
2018-02-23 15:36:25 -08:00
|
|
|
if (sp->test->udp_counters_64bit) {
|
|
|
|
memcpy(&sec, sp->buffer, sizeof(sec));
|
|
|
|
memcpy(&usec, sp->buffer+4, sizeof(usec));
|
|
|
|
memcpy(&pcount, sp->buffer+8, sizeof(pcount));
|
|
|
|
sec = ntohl(sec);
|
|
|
|
usec = ntohl(usec);
|
|
|
|
pcount = be64toh(pcount);
|
2018-05-16 23:49:45 +02:00
|
|
|
sent_time.secs = sec;
|
|
|
|
sent_time.usecs = usec;
|
2018-02-23 15:36:25 -08:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
uint32_t pc;
|
|
|
|
memcpy(&sec, sp->buffer, sizeof(sec));
|
|
|
|
memcpy(&usec, sp->buffer+4, sizeof(usec));
|
|
|
|
memcpy(&pc, sp->buffer+8, sizeof(pc));
|
|
|
|
sec = ntohl(sec);
|
|
|
|
usec = ntohl(usec);
|
|
|
|
pcount = ntohl(pc);
|
2018-05-16 23:49:45 +02:00
|
|
|
sent_time.secs = sec;
|
|
|
|
sent_time.usecs = usec;
|
2018-02-23 15:36:25 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (sp->test->debug)
|
|
|
|
fprintf(stderr, "pcount %" PRIu64 " packet_count %d\n", pcount, sp->packet_count);
|
2017-06-02 09:35:19 -07:00
|
|
|
|
2018-02-23 15:36:25 -08:00
|
|
|
/*
|
|
|
|
* Try to handle out of order packets. The way we do this
|
|
|
|
* uses a constant amount of storage but might not be
|
|
|
|
* correct in all cases. In particular we seem to have the
|
|
|
|
* assumption that packets can't be duplicated in the network,
|
|
|
|
* because duplicate packets will possibly cause some problems here.
|
|
|
|
*
|
|
|
|
* First figure out if the sequence numbers are going forward.
|
|
|
|
* Note that pcount is the sequence number read from the packet,
|
|
|
|
* and sp->packet_count is the highest sequence number seen so
|
|
|
|
* far (so we're expecting to see the packet with sequence number
|
|
|
|
* sp->packet_count + 1 arrive next).
|
2017-06-02 09:35:19 -07:00
|
|
|
*/
|
2018-02-23 15:36:25 -08:00
|
|
|
if (pcount >= sp->packet_count + 1) {
|
|
|
|
|
|
|
|
/* Forward, but is there a gap in sequence numbers? */
|
|
|
|
if (pcount > sp->packet_count + 1) {
|
|
|
|
/* There's a gap so count that as a loss. */
|
|
|
|
sp->cnt_error += (pcount - 1) - sp->packet_count;
|
|
|
|
}
|
|
|
|
/* Update the highest sequence number seen so far. */
|
|
|
|
sp->packet_count = pcount;
|
|
|
|
} else {
|
|
|
|
|
2021-09-03 13:24:55 +00:00
|
|
|
/*
|
2018-02-23 15:36:25 -08:00
|
|
|
* Sequence number went backward (or was stationary?!?).
|
|
|
|
* This counts as an out-of-order packet.
|
|
|
|
*/
|
|
|
|
sp->outoforder_packets++;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have lost packets, then the fact that we are now
|
|
|
|
* seeing an out-of-order packet offsets a prior sequence
|
|
|
|
* number gap that was counted as a loss. So we can take
|
|
|
|
* away a loss.
|
|
|
|
*/
|
|
|
|
if (sp->cnt_error > 0)
|
|
|
|
sp->cnt_error--;
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2018-02-23 15:36:25 -08:00
|
|
|
/* Log the out-of-order packet */
|
2021-09-03 13:24:55 +00:00
|
|
|
if (sp->test->debug)
|
2020-05-11 12:21:26 -07:00
|
|
|
fprintf(stderr, "OUT OF ORDER - incoming packet sequence %" PRIu64 " but expected sequence %d on stream %d", pcount, sp->packet_count + 1, sp->socket);
|
2018-02-23 15:36:25 -08:00
|
|
|
}
|
2017-06-02 09:35:19 -07:00
|
|
|
|
|
|
|
/*
|
2018-02-23 15:36:25 -08:00
|
|
|
* jitter measurement
|
|
|
|
*
|
|
|
|
* This computation is based on RFC 1889 (specifically
|
|
|
|
* sections 6.3.1 and A.8).
|
|
|
|
*
|
|
|
|
* Note that synchronized clocks are not required since
|
|
|
|
* the source packet delta times are known. Also this
|
|
|
|
* computation does not require knowing the round-trip
|
|
|
|
* time.
|
2017-06-02 09:35:19 -07:00
|
|
|
*/
|
2018-05-16 23:49:45 +02:00
|
|
|
iperf_time_now(&arrival_time);
|
2018-02-23 15:36:25 -08:00
|
|
|
|
2018-05-16 23:49:45 +02:00
|
|
|
iperf_time_diff(&arrival_time, &sent_time, &temp_time);
|
|
|
|
transit = iperf_time_in_secs(&temp_time);
|
2020-05-12 16:26:55 -07:00
|
|
|
|
|
|
|
/* Hack to handle the first packet by initializing prev_transit. */
|
|
|
|
if (first_packet)
|
|
|
|
sp->prev_transit = transit;
|
|
|
|
|
2018-02-23 15:36:25 -08:00
|
|
|
d = transit - sp->prev_transit;
|
|
|
|
if (d < 0)
|
|
|
|
d = -d;
|
|
|
|
sp->prev_transit = transit;
|
|
|
|
sp->jitter += (d - sp->jitter) / 16.0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (sp->test->debug)
|
|
|
|
printf("Late receive, state = %d\n", sp->test->state);
|
2009-11-02 22:43:19 +00:00
|
|
|
}
|
|
|
|
|
2013-02-22 15:54:05 -08:00
|
|
|
return r;
|
2012-12-11 22:29:26 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-22 18:57:08 +00:00
|
|
|
/* iperf_udp_send
|
|
|
|
*
|
|
|
|
* sends the data for UDP
|
|
|
|
*/
|
2009-11-02 22:43:19 +00:00
|
|
|
int
|
2010-07-14 23:24:58 +00:00
|
|
|
iperf_udp_send(struct iperf_stream *sp)
|
2009-11-02 22:43:19 +00:00
|
|
|
{
|
2013-02-22 15:54:05 -08:00
|
|
|
int r;
|
2010-07-14 23:24:58 +00:00
|
|
|
int size = sp->settings->blksize;
|
2018-05-16 23:49:45 +02:00
|
|
|
struct iperf_time before;
|
2013-02-22 15:54:05 -08:00
|
|
|
|
2018-05-16 23:49:45 +02:00
|
|
|
iperf_time_now(&before);
|
2013-02-22 15:54:05 -08:00
|
|
|
|
|
|
|
++sp->packet_count;
|
|
|
|
|
2014-08-28 08:59:32 -07:00
|
|
|
if (sp->test->udp_counters_64bit) {
|
|
|
|
|
|
|
|
uint32_t sec, usec;
|
|
|
|
uint64_t pcount;
|
|
|
|
|
2018-05-16 23:49:45 +02:00
|
|
|
sec = htonl(before.secs);
|
|
|
|
usec = htonl(before.usecs);
|
2014-08-28 08:59:32 -07:00
|
|
|
pcount = htobe64(sp->packet_count);
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2014-08-28 08:59:32 -07:00
|
|
|
memcpy(sp->buffer, &sec, sizeof(sec));
|
|
|
|
memcpy(sp->buffer+4, &usec, sizeof(usec));
|
|
|
|
memcpy(sp->buffer+8, &pcount, sizeof(pcount));
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2014-08-28 08:59:32 -07:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
uint32_t sec, usec, pcount;
|
|
|
|
|
2018-05-16 23:49:45 +02:00
|
|
|
sec = htonl(before.secs);
|
|
|
|
usec = htonl(before.usecs);
|
2014-08-28 08:59:32 -07:00
|
|
|
pcount = htonl(sp->packet_count);
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2014-08-28 08:59:32 -07:00
|
|
|
memcpy(sp->buffer, &sec, sizeof(sec));
|
|
|
|
memcpy(sp->buffer+4, &usec, sizeof(usec));
|
|
|
|
memcpy(sp->buffer+8, &pcount, sizeof(pcount));
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2014-08-28 08:59:32 -07:00
|
|
|
}
|
2013-02-22 15:54:05 -08:00
|
|
|
|
|
|
|
r = Nwrite(sp->socket, sp->buffer, size, Pudp);
|
|
|
|
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
|
|
|
sp->result->bytes_sent += r;
|
|
|
|
sp->result->bytes_sent_this_interval += r;
|
|
|
|
|
2017-05-30 14:15:28 -07:00
|
|
|
if (sp->test->debug)
|
2017-11-08 17:29:26 +00:00
|
|
|
printf("sent %d bytes of %d, total %" PRIu64 "\n", r, sp->settings->blksize, sp->result->bytes_sent);
|
2017-05-30 14:15:28 -07:00
|
|
|
|
2013-02-22 15:54:05 -08:00
|
|
|
return r;
|
2009-11-02 22:43:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/*
|
|
|
|
* The following functions all have to do with managing UDP data sockets.
|
|
|
|
* UDP of course is connectionless, so there isn't really a concept of
|
|
|
|
* setting up a connection, although connect(2) can (and is) used to
|
|
|
|
* bind the remote end of sockets. We need to simulate some of the
|
|
|
|
* connection management that is built-in to TCP so that each side of the
|
|
|
|
* connection knows about each other before the real data transfers begin.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
* Set and verify socket buffer sizes.
|
|
|
|
* Return 0 if no error, -1 if an error, +1 if socket buffers are
|
|
|
|
* potentially too small to hold a message.
|
2009-11-02 22:43:19 +00:00
|
|
|
*/
|
|
|
|
int
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
iperf_udp_buffercheck(struct iperf_test *test, int s)
|
2009-11-02 22:43:19 +00:00
|
|
|
{
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
int rc = 0;
|
2017-05-03 14:03:22 -07:00
|
|
|
int sndbuf_actual, rcvbuf_actual;
|
2009-11-02 22:43:19 +00:00
|
|
|
|
2014-11-12 13:58:23 -08:00
|
|
|
/*
|
|
|
|
* Set socket buffer size if requested. Do this for both sending and
|
|
|
|
* receiving so that we can cover both normal and --reverse operation.
|
|
|
|
*/
|
|
|
|
int opt;
|
2016-11-23 11:05:47 -08:00
|
|
|
socklen_t optlen;
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2014-11-12 13:58:23 -08:00
|
|
|
if ((opt = test->settings->socket_bufsize)) {
|
|
|
|
if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt)) < 0) {
|
|
|
|
i_errno = IESETBUF;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &opt, sizeof(opt)) < 0) {
|
|
|
|
i_errno = IESETBUF;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-23 11:05:47 -08:00
|
|
|
/* Read back and verify the sender socket buffer size */
|
2017-05-03 14:03:22 -07:00
|
|
|
optlen = sizeof(sndbuf_actual);
|
|
|
|
if (getsockopt(s, SOL_SOCKET, SO_SNDBUF, &sndbuf_actual, &optlen) < 0) {
|
2016-11-23 11:05:47 -08:00
|
|
|
i_errno = IESETBUF;
|
|
|
|
return -1;
|
|
|
|
}
|
2016-12-01 11:53:37 -08:00
|
|
|
if (test->debug) {
|
2017-05-03 14:03:22 -07:00
|
|
|
printf("SNDBUF is %u, expecting %u\n", sndbuf_actual, test->settings->socket_bufsize);
|
2016-12-01 11:53:37 -08:00
|
|
|
}
|
2017-05-03 14:03:22 -07:00
|
|
|
if (test->settings->socket_bufsize && test->settings->socket_bufsize > sndbuf_actual) {
|
2016-11-23 11:05:47 -08:00
|
|
|
i_errno = IESETBUF2;
|
|
|
|
return -1;
|
|
|
|
}
|
2017-05-03 14:03:22 -07:00
|
|
|
if (test->settings->blksize > sndbuf_actual) {
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
char str[80];
|
|
|
|
snprintf(str, sizeof(str),
|
|
|
|
"Block size %d > sending socket buffer size %d",
|
2017-05-03 14:03:22 -07:00
|
|
|
test->settings->blksize, sndbuf_actual);
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
warning(str);
|
|
|
|
rc = 1;
|
|
|
|
}
|
2016-11-23 11:05:47 -08:00
|
|
|
|
|
|
|
/* Read back and verify the receiver socket buffer size */
|
2017-05-03 14:03:22 -07:00
|
|
|
optlen = sizeof(rcvbuf_actual);
|
|
|
|
if (getsockopt(s, SOL_SOCKET, SO_RCVBUF, &rcvbuf_actual, &optlen) < 0) {
|
2016-11-23 11:05:47 -08:00
|
|
|
i_errno = IESETBUF;
|
|
|
|
return -1;
|
|
|
|
}
|
2016-12-01 11:53:37 -08:00
|
|
|
if (test->debug) {
|
2017-05-03 14:03:22 -07:00
|
|
|
printf("RCVBUF is %u, expecting %u\n", rcvbuf_actual, test->settings->socket_bufsize);
|
2016-12-01 11:53:37 -08:00
|
|
|
}
|
2017-05-03 14:03:22 -07:00
|
|
|
if (test->settings->socket_bufsize && test->settings->socket_bufsize > rcvbuf_actual) {
|
2016-11-23 11:05:47 -08:00
|
|
|
i_errno = IESETBUF2;
|
|
|
|
return -1;
|
|
|
|
}
|
2017-05-03 14:03:22 -07:00
|
|
|
if (test->settings->blksize > rcvbuf_actual) {
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
char str[80];
|
|
|
|
snprintf(str, sizeof(str),
|
|
|
|
"Block size %d > receiving socket buffer size %d",
|
2017-05-03 14:03:22 -07:00
|
|
|
test->settings->blksize, rcvbuf_actual);
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
warning(str);
|
|
|
|
rc = 1;
|
|
|
|
}
|
2017-05-03 14:03:22 -07:00
|
|
|
|
|
|
|
if (test->json_output) {
|
|
|
|
cJSON_AddNumberToObject(test->json_start, "sock_bufsize", test->settings->socket_bufsize);
|
|
|
|
cJSON_AddNumberToObject(test->json_start, "sndbuf_actual", sndbuf_actual);
|
|
|
|
cJSON_AddNumberToObject(test->json_start, "rcvbuf_actual", rcvbuf_actual);
|
|
|
|
}
|
|
|
|
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
return rc;
|
|
|
|
}
|
2016-11-23 11:05:47 -08:00
|
|
|
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
/*
|
|
|
|
* iperf_udp_accept
|
|
|
|
*
|
|
|
|
* Accepts a new UDP "connection"
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
iperf_udp_accept(struct iperf_test *test)
|
|
|
|
{
|
|
|
|
struct sockaddr_storage sa_peer;
|
|
|
|
int buf;
|
|
|
|
socklen_t len;
|
|
|
|
int sz, s;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the current outstanding socket. This socket will be used to handle
|
|
|
|
* data transfers and a new "listening" socket will be created.
|
|
|
|
*/
|
|
|
|
s = test->prot_listener;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Grab the UDP packet sent by the client. From that we can extract the
|
|
|
|
* client's address, and then use that information to bind the remote side
|
|
|
|
* of the socket to the client.
|
|
|
|
*/
|
|
|
|
len = sizeof(sa_peer);
|
|
|
|
if ((sz = recvfrom(test->prot_listener, &buf, sizeof(buf), 0, (struct sockaddr *) &sa_peer, &len)) < 0) {
|
|
|
|
i_errno = IESTREAMACCEPT;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (connect(s, (struct sockaddr *) &sa_peer, len) < 0) {
|
|
|
|
i_errno = IESTREAMACCEPT;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check and set socket buffer sizes */
|
|
|
|
rc = iperf_udp_buffercheck(test, s);
|
|
|
|
if (rc < 0)
|
|
|
|
/* error */
|
|
|
|
return rc;
|
|
|
|
/*
|
|
|
|
* If the socket buffer was too small, but it was the default
|
|
|
|
* size, then try explicitly setting it to something larger.
|
|
|
|
*/
|
|
|
|
if (rc > 0) {
|
|
|
|
if (test->settings->socket_bufsize == 0) {
|
2017-01-11 11:37:52 -08:00
|
|
|
int bufsize = test->settings->blksize + UDP_BUFFER_EXTRA;
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
printf("Increasing socket buffer size to %d\n",
|
2017-01-11 11:37:52 -08:00
|
|
|
bufsize);
|
|
|
|
test->settings->socket_bufsize = bufsize;
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
rc = iperf_udp_buffercheck(test, s);
|
|
|
|
if (rc < 0)
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2016-05-26 09:47:48 -07:00
|
|
|
#if defined(HAVE_SO_MAX_PACING_RATE)
|
2016-12-12 13:47:53 -08:00
|
|
|
/* If socket pacing is specified, try it. */
|
|
|
|
if (test->settings->fqrate) {
|
2016-05-26 09:47:48 -07:00
|
|
|
/* Convert bits per second to bytes per second */
|
2016-12-12 13:47:53 -08:00
|
|
|
unsigned int fqrate = test->settings->fqrate / 8;
|
|
|
|
if (fqrate > 0) {
|
2016-05-26 09:47:48 -07:00
|
|
|
if (test->debug) {
|
2016-12-12 13:47:53 -08:00
|
|
|
printf("Setting fair-queue socket pacing to %u\n", fqrate);
|
2016-05-26 09:47:48 -07:00
|
|
|
}
|
2016-12-12 13:47:53 -08:00
|
|
|
if (setsockopt(s, SOL_SOCKET, SO_MAX_PACING_RATE, &fqrate, sizeof(fqrate)) < 0) {
|
|
|
|
warning("Unable to set socket pacing");
|
2016-05-26 09:47:48 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* HAVE_SO_MAX_PACING_RATE */
|
2016-12-12 13:47:53 -08:00
|
|
|
{
|
2016-11-30 07:13:28 -08:00
|
|
|
unsigned int rate = test->settings->rate / 8;
|
|
|
|
if (rate > 0) {
|
|
|
|
if (test->debug) {
|
|
|
|
printf("Setting application pacing to %u\n", rate);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-05-26 09:47:48 -07:00
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/*
|
|
|
|
* Create a new "listening" socket to replace the one we were using before.
|
|
|
|
*/
|
2020-12-22 15:52:24 -08:00
|
|
|
test->prot_listener = netannounce(test->settings->domain, Pudp, test->bind_address, test->bind_dev, test->server_port);
|
2010-07-22 18:57:08 +00:00
|
|
|
if (test->prot_listener < 0) {
|
|
|
|
i_errno = IESTREAMLISTEN;
|
2012-12-11 22:29:26 -08:00
|
|
|
return -1;
|
2010-07-20 22:27:50 +00:00
|
|
|
}
|
2009-11-02 22:43:19 +00:00
|
|
|
|
2010-07-22 18:57:08 +00:00
|
|
|
FD_SET(test->prot_listener, &test->read_set);
|
|
|
|
test->max_fd = (test->max_fd < test->prot_listener) ? test->prot_listener : test->max_fd;
|
2009-11-02 22:43:19 +00:00
|
|
|
|
2010-07-14 23:24:58 +00:00
|
|
|
/* Let the client know we're ready "accept" another UDP "stream" */
|
2014-11-12 12:10:33 -08:00
|
|
|
buf = 987654321; /* any content will work here */
|
2010-07-22 18:57:08 +00:00
|
|
|
if (write(s, &buf, sizeof(buf)) < 0) {
|
2010-07-20 22:27:50 +00:00
|
|
|
i_errno = IESTREAMWRITE;
|
2012-12-11 22:29:26 -08:00
|
|
|
return -1;
|
2009-11-02 22:43:19 +00:00
|
|
|
}
|
|
|
|
|
2012-12-11 22:29:26 -08:00
|
|
|
return s;
|
2010-07-22 18:57:08 +00:00
|
|
|
}
|
2009-11-02 22:43:19 +00:00
|
|
|
|
2010-07-22 18:57:08 +00:00
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/*
|
|
|
|
* iperf_udp_listen
|
2010-07-22 18:57:08 +00:00
|
|
|
*
|
2014-11-12 12:10:33 -08:00
|
|
|
* Start up a listener for UDP stream connections. Unlike for TCP,
|
|
|
|
* there is no listen(2) for UDP. This socket will however accept
|
|
|
|
* a UDP datagram from a client (indicating the client's presence).
|
2010-07-22 18:57:08 +00:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
iperf_udp_listen(struct iperf_test *test)
|
|
|
|
{
|
|
|
|
int s;
|
|
|
|
|
2020-12-22 15:52:24 -08:00
|
|
|
if ((s = netannounce(test->settings->domain, Pudp, test->bind_address, test->bind_dev, test->server_port)) < 0) {
|
2010-07-22 18:57:08 +00:00
|
|
|
i_errno = IESTREAMLISTEN;
|
2012-12-11 22:29:26 -08:00
|
|
|
return -1;
|
2010-07-22 18:57:08 +00:00
|
|
|
}
|
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/*
|
|
|
|
* The caller will put this value into test->prot_listener.
|
|
|
|
*/
|
2012-12-11 22:29:26 -08:00
|
|
|
return s;
|
2010-07-22 18:57:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/*
|
|
|
|
* iperf_udp_connect
|
2010-07-22 18:57:08 +00:00
|
|
|
*
|
2014-11-12 12:10:33 -08:00
|
|
|
* "Connect" to a UDP stream listener.
|
2010-07-22 18:57:08 +00:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
iperf_udp_connect(struct iperf_test *test)
|
|
|
|
{
|
2013-05-02 15:18:07 -07:00
|
|
|
int s, buf, sz;
|
2014-12-11 12:59:02 +02:00
|
|
|
#ifdef SO_RCVTIMEO
|
2014-11-24 10:02:37 +02:00
|
|
|
struct timeval tv;
|
2014-12-11 12:59:02 +02:00
|
|
|
#endif
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
int rc;
|
2010-07-22 18:57:08 +00:00
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/* Create and bind our local socket. */
|
2020-12-22 15:52:24 -08:00
|
|
|
if ((s = netdial(test->settings->domain, Pudp, test->bind_address, test->bind_dev, test->bind_port, test->server_hostname, test->server_port, -1)) < 0) {
|
2010-07-22 18:57:08 +00:00
|
|
|
i_errno = IESTREAMCONNECT;
|
2012-12-11 22:29:26 -08:00
|
|
|
return -1;
|
2010-07-22 18:57:08 +00:00
|
|
|
}
|
|
|
|
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
/* Check and set socket buffer sizes */
|
|
|
|
rc = iperf_udp_buffercheck(test, s);
|
|
|
|
if (rc < 0)
|
|
|
|
/* error */
|
|
|
|
return rc;
|
2014-11-12 13:58:23 -08:00
|
|
|
/*
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
* If the socket buffer was too small, but it was the default
|
|
|
|
* size, then try explicitly setting it to something larger.
|
2014-11-12 13:58:23 -08:00
|
|
|
*/
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
if (rc > 0) {
|
|
|
|
if (test->settings->socket_bufsize == 0) {
|
2017-01-11 11:37:52 -08:00
|
|
|
int bufsize = test->settings->blksize + UDP_BUFFER_EXTRA;
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
printf("Increasing socket buffer size to %d\n",
|
2017-01-11 11:37:52 -08:00
|
|
|
bufsize);
|
|
|
|
test->settings->socket_bufsize = bufsize;
|
Issue 496 (#498)
* Dynamically determine an appropriate default UDP send size.
We use the TCP MSS for the control connection as the default UDP
sending length, if the --length parameter is not specified for a
UDP test. This computation replaces the former hard-coded 8K
default, which was way too large for non-jumbo-frame Ethernet
networks.
The concept for this solution was adapted from nuttcp. The
iperf3 implementation is pretty easy since we already were
getting the MSS for the control connection anyway (although we
needed to get it slightly earlier in the setup process to be
useful).
Towards issue #496.
While here, s/int/socklen_t/ in one place to fix a compile warning,
and bump a few copyright dates.
* Warn if doing a UDP test and the socket buffer isn't big enough.
This is surprisingly an issue on FreeBSD and macOS, where the MTU
over the loopback interface is actually larger than the default
UDP socket buffer size. In these cases, doing a UDP test over the
loopback interface (with the new UDP defaults) will fail unless a
smaller --length or a larger --window size is set explicitly.
Linux has larger UDP socket buffers by default (much larger than the
largest possible MTU), but even in the case that the socket buffers
are too small to hold an MTU-sized send, the kernel seems to do the
send correctly anyway.
Still working towards a good solution for issue #496.
* Further refinement on UDP buffer size settings.
If the default buffer size on a UDP test can't hold a packet,
then increase the buffer size to be large enough to hold one
packet payload. (If the buffer size was explicitly set, but too
small to hold a packet payload, then warn but don't change the
buffer size.)
Minor code refactoring to...factor out some common code into
a new iperf_udp_buffercheck() function.
Still working towards issue #496.
2017-01-10 09:13:57 -08:00
|
|
|
rc = iperf_udp_buffercheck(test, s);
|
|
|
|
if (rc < 0)
|
|
|
|
return rc;
|
|
|
|
}
|
2016-11-23 11:05:47 -08:00
|
|
|
}
|
2021-09-03 13:24:55 +00:00
|
|
|
|
2016-05-26 09:47:48 -07:00
|
|
|
#if defined(HAVE_SO_MAX_PACING_RATE)
|
|
|
|
/* If socket pacing is available and not disabled, try it. */
|
2016-12-12 13:47:53 -08:00
|
|
|
if (test->settings->fqrate) {
|
2016-05-26 09:47:48 -07:00
|
|
|
/* Convert bits per second to bytes per second */
|
2016-12-12 13:47:53 -08:00
|
|
|
unsigned int fqrate = test->settings->fqrate / 8;
|
|
|
|
if (fqrate > 0) {
|
2016-05-26 09:47:48 -07:00
|
|
|
if (test->debug) {
|
2016-12-12 13:47:53 -08:00
|
|
|
printf("Setting fair-queue socket pacing to %u\n", fqrate);
|
2016-05-26 09:47:48 -07:00
|
|
|
}
|
2016-12-12 13:47:53 -08:00
|
|
|
if (setsockopt(s, SOL_SOCKET, SO_MAX_PACING_RATE, &fqrate, sizeof(fqrate)) < 0) {
|
|
|
|
warning("Unable to set socket pacing");
|
2016-05-26 09:47:48 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* HAVE_SO_MAX_PACING_RATE */
|
2016-12-12 13:47:53 -08:00
|
|
|
{
|
2016-11-30 07:13:28 -08:00
|
|
|
unsigned int rate = test->settings->rate / 8;
|
|
|
|
if (rate > 0) {
|
|
|
|
if (test->debug) {
|
|
|
|
printf("Setting application pacing to %u\n", rate);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-05-26 09:47:48 -07:00
|
|
|
|
2014-12-11 12:59:02 +02:00
|
|
|
#ifdef SO_RCVTIMEO
|
2014-11-24 10:02:37 +02:00
|
|
|
/* 30 sec timeout for a case when there is a network problem. */
|
|
|
|
tv.tv_sec = 30;
|
|
|
|
tv.tv_usec = 0;
|
|
|
|
setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval));
|
2014-12-11 12:59:02 +02:00
|
|
|
#endif
|
2014-11-24 10:02:37 +02:00
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/*
|
|
|
|
* Write a datagram to the UDP stream to let the server know we're here.
|
|
|
|
* The server learns our address by obtaining its peer's address.
|
|
|
|
*/
|
|
|
|
buf = 123456789; /* this can be pretty much anything */
|
2010-07-22 18:57:08 +00:00
|
|
|
if (write(s, &buf, sizeof(buf)) < 0) {
|
2021-09-03 13:24:55 +00:00
|
|
|
// XXX: Should this be changed to IESTREAMCONNECT?
|
2010-07-22 18:57:08 +00:00
|
|
|
i_errno = IESTREAMWRITE;
|
2012-12-11 22:29:26 -08:00
|
|
|
return -1;
|
2010-07-22 18:57:08 +00:00
|
|
|
}
|
2013-05-02 15:18:07 -07:00
|
|
|
|
2014-11-12 12:10:33 -08:00
|
|
|
/*
|
|
|
|
* Wait until the server replies back to us.
|
|
|
|
*/
|
2013-05-02 15:18:07 -07:00
|
|
|
if ((sz = recv(s, &buf, sizeof(buf), 0)) < 0) {
|
2010-07-22 18:57:08 +00:00
|
|
|
i_errno = IESTREAMREAD;
|
2012-12-11 22:29:26 -08:00
|
|
|
return -1;
|
2010-07-22 18:57:08 +00:00
|
|
|
}
|
|
|
|
|
2012-12-11 22:29:26 -08:00
|
|
|
return s;
|
2009-11-02 22:43:19 +00:00
|
|
|
}
|
|
|
|
|
2010-07-22 18:57:08 +00:00
|
|
|
|
|
|
|
/* iperf_udp_init
|
|
|
|
*
|
|
|
|
* initializer for UDP streams in TEST_START
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
iperf_udp_init(struct iperf_test *test)
|
|
|
|
{
|
2012-12-11 22:29:26 -08:00
|
|
|
return 0;
|
2010-07-22 18:57:08 +00:00
|
|
|
}
|