From c0983a3a423cd6e87bdbaae4a926b41a9e0e770d Mon Sep 17 00:00:00 2001 From: Marcos Schwarz Date: Wed, 10 Jul 2024 14:19:48 -0400 Subject: [PATCH] Changed fqrate from uint to uint64 to allow pacing above 30G --- src/iperf_tcp.c | 8 ++++---- src/iperf_udp.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/iperf_tcp.c b/src/iperf_tcp.c index e025515ab..058914eeb 100644 --- a/src/iperf_tcp.c +++ b/src/iperf_tcp.c @@ -131,10 +131,10 @@ iperf_tcp_accept(struct iperf_test * test) if (test->settings->fqrate) { /* Convert bits per second to bytes per second */ - unsigned int fqrate = test->settings->fqrate / 8; + uint64_t fqrate = test->settings->fqrate / 8; if (fqrate > 0) { if (test->debug) { - printf("Setting fair-queue socket pacing to %u\n", fqrate); + printf("Setting fair-queue socket pacing to %"PRIu64"\n", fqrate); } if (setsockopt(s, SOL_SOCKET, SO_MAX_PACING_RATE, &fqrate, sizeof(fqrate)) < 0) { warning("Unable to set socket pacing"); @@ -541,10 +541,10 @@ iperf_tcp_connect(struct iperf_test *test) /* If socket pacing is specified try to enable it. */ if (test->settings->fqrate) { /* Convert bits per second to bytes per second */ - unsigned int fqrate = test->settings->fqrate / 8; + uint64_t fqrate = test->settings->fqrate / 8; if (fqrate > 0) { if (test->debug) { - printf("Setting fair-queue socket pacing to %u\n", fqrate); + printf("Setting fair-queue socket pacing to %"PRIu64"\n", fqrate); } if (setsockopt(s, SOL_SOCKET, SO_MAX_PACING_RATE, &fqrate, sizeof(fqrate)) < 0) { warning("Unable to set socket pacing"); diff --git a/src/iperf_udp.c b/src/iperf_udp.c index a603236df..375d38f6e 100644 --- a/src/iperf_udp.c +++ b/src/iperf_udp.c @@ -423,10 +423,10 @@ iperf_udp_accept(struct iperf_test *test) /* If socket pacing is specified, try it. */ if (test->settings->fqrate) { /* Convert bits per second to bytes per second */ - unsigned int fqrate = test->settings->fqrate / 8; + uint64_t fqrate = test->settings->fqrate / 8; if (fqrate > 0) { if (test->debug) { - printf("Setting fair-queue socket pacing to %u\n", fqrate); + printf("Setting fair-queue socket pacing to %"PRIu64"\n", fqrate); } if (setsockopt(s, SOL_SOCKET, SO_MAX_PACING_RATE, &fqrate, sizeof(fqrate)) < 0) { warning("Unable to set socket pacing"); @@ -539,10 +539,10 @@ iperf_udp_connect(struct iperf_test *test) /* If socket pacing is available and not disabled, try it. */ if (test->settings->fqrate) { /* Convert bits per second to bytes per second */ - unsigned int fqrate = test->settings->fqrate / 8; + uint64_t fqrate = test->settings->fqrate / 8; if (fqrate > 0) { if (test->debug) { - printf("Setting fair-queue socket pacing to %u\n", fqrate); + printf("Setting fair-queue socket pacing to %"PRIu64"\n", fqrate); } if (setsockopt(s, SOL_SOCKET, SO_MAX_PACING_RATE, &fqrate, sizeof(fqrate)) < 0) { warning("Unable to set socket pacing");