Date: Thu, 16 May 2024 06:31:28 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b11ca2ebed84 - main - benchmarks/iperf: Fix build with IPV6 disabled Message-ID: <202405160631.44G6VSgD049146@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b11ca2ebed842069b62922f242fb1ef44bb1df57 commit b11ca2ebed842069b62922f242fb1ef44bb1df57 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-05-16 06:19:34 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-05-16 06:22:15 +0000 benchmarks/iperf: Fix build with IPV6 disabled PR: 278607 Reported by: <peter.sopko+freebsd.org@backbone.sk> --- benchmarks/iperf/files/patch-ipv6 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/benchmarks/iperf/files/patch-ipv6 b/benchmarks/iperf/files/patch-ipv6 new file mode 100644 index 000000000000..3e8c72ae0a3a --- /dev/null +++ b/benchmarks/iperf/files/patch-ipv6 @@ -0,0 +1,32 @@ +--- src/iperf_multicast_api.c.orig 2024-04-07 03:47:17 UTC ++++ src/iperf_multicast_api.c +@@ -175,6 +175,7 @@ static int iperf_multicast_join_v6 (struct thread_Sett + + + static int iperf_multicast_join_v6 (struct thread_Settings *inSettings) { ++#if HAVE_IPV6 + #if (HAVE_DECL_IPV6_JOIN_GROUP || HAVE_DECL_IPV6_ADD_MEMBERSHIP) + #if HAVE_STRUCT_IPV6_MREQ + struct ipv6_mreq mreq; +@@ -191,11 +192,12 @@ static int iperf_multicast_join_v6 (struct thread_Sett + return ((rc == 0) ? IPERF_MULTICAST_JOIN_SUCCESS : IPERF_MULTICAST_JOIN_FAIL); + #endif + #endif ++#endif + return IPERF_MULTICAST_JOIN_UNSUPPORTED; +- + } + + static int iperf_multicast_join_v6_pi (struct thread_Settings *inSettings) { ++#if HAVE_IPV6 + #if HAVE_DECL_MCAST_JOIN_GROUP + int rc = -1; + struct group_req group_req; +@@ -208,6 +210,7 @@ static int iperf_multicast_join_v6_pi (struct thread_S + (socklen_t) sizeof(struct group_source_req)); + FAIL_errno(rc == SOCKET_ERROR, "mcast v6 join group", inSettings); + return ((rc == 0) ? IPERF_MULTICAST_JOIN_SUCCESS : IPERF_MULTICAST_JOIN_FAIL); ++#endif + #endif + return IPERF_MULTICAST_JOIN_UNSUPPORTED; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405160631.44G6VSgD049146>