From: Philip Prindeville Date: Wed, 14 Feb 2018 23:58:54 +0000 (-0700) Subject: iperf3: update to 3.4 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=81ccf24c09d31ee4630d477c50a646e22a0fd34b;p=openwrt%2Fstaging%2Fblocktrron.git iperf3: update to 3.4 Signed-off-by: Philip Prindeville --- diff --git a/package/network/utils/iperf3/Makefile b/package/network/utils/iperf3/Makefile index a64d7396a2..f76bd7ca8c 100644 --- a/package/network/utils/iperf3/Makefile +++ b/package/network/utils/iperf3/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf -PKG_VERSION:=3.3 +PKG_VERSION:=3.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.es.net/pub/iperf -PKG_HASH:=6f596271251056bffc11bbb8f17d4244ad9a7d4a317c2459fdbb853ae51284d8 +PKG_HASH:=71528332d751df85e046d1944d9a0269773cadd6e51840aecdeed30925f79111 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause diff --git a/package/network/utils/iperf3/patches/010-iperf-3.3-fix-build-warnings.patch b/package/network/utils/iperf3/patches/010-iperf-3.3-fix-build-warnings.patch index d617ba9f40..30ea618090 100644 --- a/package/network/utils/iperf3/patches/010-iperf-3.3-fix-build-warnings.patch +++ b/package/network/utils/iperf3/patches/010-iperf-3.3-fix-build-warnings.patch @@ -4,133 +4,6 @@ https://github.com/esnet/iperf/pull/664 as an upstream submission. -commit b63d41b25f49a76d0be66edfb61bd4cb68921d55 -Author: Philip Prindeville -Date: Tue Oct 31 13:41:08 2017 -0600 - - Fix warnings about _GNU_SOURCE being redefined. - - Signed-off-by: Philip Prindeville - -diff --git a/src/iperf.h b/src/iperf.h -index bb951dc..b656784 100755 ---- a/src/iperf.h -+++ b/src/iperf.h -@@ -36,7 +36,9 @@ - #endif - #include - #include --#define _GNU_SOURCE -+#ifndef _GNU_SOURCE -+# define _GNU_SOURCE -+#endif - #include - - #if defined(HAVE_CPUSET_SETAFFINITY) -diff --git a/src/iperf_api.c b/src/iperf_api.c -index ab30b93..9e41238 100755 ---- a/src/iperf_api.c -+++ b/src/iperf_api.c -@@ -24,7 +24,9 @@ - * This code is distributed under a BSD style license, see the LICENSE file - * for complete information. - */ --#define _GNU_SOURCE -+#ifndef _GNU_SOURCE -+# define _GNU_SOURCE -+#endif - #define __USE_GNU - - #include "iperf_config.h" - -commit 315254cfc5f5682627f4a46ade3100bc3c64cfcc -Author: Philip Prindeville -Date: Tue Oct 31 13:42:58 2017 -0600 - - Fix warnings of format-specified mismatching type - - Signed-off-by: Philip Prindeville - -diff --git a/src/iperf_tcp.c b/src/iperf_tcp.c -index 91cf032..6f86d5d 100644 ---- a/src/iperf_tcp.c -+++ b/src/iperf_tcp.c -@@ -24,8 +24,6 @@ - * This code is distributed under a BSD style license, see the LICENSE - * file for complete information. - */ --#include "iperf_config.h" -- - #include - #include - #include -@@ -44,6 +42,12 @@ - #include "net.h" - #include "cjson.h" - -+#if defined(HAVE_INTTYPES_H) -+# include -+#else -+# define PRIu64 "llu" -+#endif -+ - #if defined(HAVE_FLOWLABEL) - #include "flowlabel.h" - #endif /* HAVE_FLOWLABEL */ -@@ -90,7 +94,7 @@ iperf_tcp_send(struct iperf_stream *sp) - sp->result->bytes_sent_this_interval += r; - - if (sp->test->debug) -- printf("sent %d bytes of %d, total %llu\n", r, sp->settings->blksize, sp->result->bytes_sent); -+ printf("sent %d bytes of %d, total %" PRIu64 "\n", r, sp->settings->blksize, sp->result->bytes_sent); - - return r; - } -diff --git a/src/iperf_udp.c b/src/iperf_udp.c -index a2ea6d0..d04ae44 100644 ---- a/src/iperf_udp.c -+++ b/src/iperf_udp.c -@@ -48,6 +48,12 @@ - #include "cjson.h" - #include "portable_endian.h" - -+#if defined(HAVE_INTTYPES_H) -+# include -+#else -+# define PRIu64 "llu" -+#endif -+ - /* iperf_udp_recv - * - * receives the data for UDP -@@ -98,7 +104,7 @@ iperf_udp_recv(struct iperf_stream *sp) - } - - if (sp->test->debug) -- fprintf(stderr, "pcount %llu packet_count %d\n", pcount, sp->packet_count); -+ fprintf(stderr, "pcount %" PRIu64 " packet_count %d\n", pcount, sp->packet_count); - - /* - * Try to handle out of order packets. The way we do this -@@ -141,7 +147,7 @@ iperf_udp_recv(struct iperf_stream *sp) - - /* Log the out-of-order packet */ - if (sp->test->debug) -- fprintf(stderr, "OUT OF ORDER - incoming packet sequence %llu but expected sequence %d on stream %d", pcount, sp->packet_count, sp->socket); -+ fprintf(stderr, "OUT OF ORDER - incoming packet sequence %" PRIu64 " but expected sequence %d on stream %d", pcount, sp->packet_count, sp->socket); - } - - /* -@@ -220,7 +226,7 @@ iperf_udp_send(struct iperf_stream *sp) - sp->result->bytes_sent_this_interval += r; - - if (sp->test->debug) -- printf("sent %d bytes of %d, total %llu\n", r, sp->settings->blksize, sp->result->bytes_sent); -+ printf("sent %d bytes of %d, total %" PRIu64 "\n", r, sp->settings->blksize, sp->result->bytes_sent); - - return r; - } - commit 9a66b3b0349e0a158bb4940b668a5cbc7c245762 Author: Philip Prindeville Date: Tue Oct 31 13:44:34 2017 -0600 @@ -151,7 +24,7 @@ diff --git a/configure.ac b/configure.ac index f57e83f..cfb42ac 100644 --- a/configure.ac +++ b/configure.ac -@@ -101,6 +101,14 @@ AC_CHECK_HEADERS([netinet/sctp.h], +@@ -103,6 +103,14 @@ AC_CHECK_HEADERS([netinet/sctp.h], #endif ]) @@ -170,7 +43,7 @@ diff --git a/src/iperf_config.h.in b/src/iperf_config.h.in index bd03935..a9e51ec 100644 --- a/src/iperf_config.h.in +++ b/src/iperf_config.h.in -@@ -9,6 +9,9 @@ +@@ -15,6 +15,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -180,7 +53,7 @@ index bd03935..a9e51ec 100644 /* Have IPv6 flowlabel support. */ #undef HAVE_FLOWLABEL -@@ -54,6 +57,9 @@ +@@ -69,6 +69,9 @@ /* Define to 1 if the system has the type `struct sctp_assoc_value'. */ #undef HAVE_STRUCT_SCTP_ASSOC_VALUE @@ -190,111 +63,3 @@ index bd03935..a9e51ec 100644 /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H -diff --git a/src/portable_endian.h b/src/portable_endian.h -index b86d37a..5dbc6e5 100644 ---- a/src/portable_endian.h -+++ b/src/portable_endian.h -@@ -10,14 +10,33 @@ - - #endif - --// GLIBC / Linux with endian(3) support, which was added in glibc 2.9. --// Intended to support CentOS 6 and newer. --#if defined(__linux__) && \ -- ((__GLIBC__ > 3) || \ -- (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) -- -+#if defined(HAVE_ENDIAN_H) - # include - -+#elif defined(HAVE_SYS_ENDIAN_H) -+# include -+ -+# if defined(__OpenBSD__) -+ -+# define be16toh(x) betoh16(x) -+# define le16toh(x) letoh16(x) -+ -+# define be32toh(x) betoh32(x) -+# define le32toh(x) letoh32(x) -+ -+# define be64toh(x) betoh64(x) -+# define le64toh(x) letoh64(x) -+ -+# elif defined(__sgi) -+ -+# include -+# include -+ -+# define be64toh(x) (x) -+# define htobe64(x) (x) -+ -+# endif -+ - #elif defined(__CYGWIN__) - - # include -@@ -46,32 +65,6 @@ - # define __LITTLE_ENDIAN LITTLE_ENDIAN - # define __PDP_ENDIAN PDP_ENDIAN - --#elif defined(__OpenBSD__) -- --# include -- --# define be16toh(x) betoh16(x) --# define le16toh(x) letoh16(x) -- --# define be32toh(x) betoh32(x) --# define le32toh(x) letoh32(x) -- --# define be64toh(x) betoh64(x) --# define le64toh(x) letoh64(x) -- --#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) -- --# include -- --#elif defined(__sgi) -- --# include --# include --# include -- --# define be64toh(x) (x) --# define htobe64(x) (x) -- - #elif defined(__sun) && defined(__SVR4) - - # include - -commit 7e7285d0daf92ef7beda8f78a6f63cc647a77f38 -Author: Philip Prindeville -Date: Tue Oct 31 13:48:06 2017 -0600 - - Sys headers should not be included directly - - There's usually a top-level header which then includes the sys/ - descendent. - - Signed-off-by: Philip Prindeville - -diff --git a/src/net.c b/src/net.c -index af456cb..afd0022 100644 ---- a/src/net.c -+++ b/src/net.c -@@ -31,13 +31,12 @@ - #include - #include - #include --#include - #include - #include - #include - #include - #include --#include -+#include - - #ifdef HAVE_SENDFILE - #ifdef linux