diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-11 17:34:20 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-14 20:28:18 +0200 |
commit | 02d4d36d4ba826c29cae48835dba3899ed0c483d (patch) | |
tree | df4fd9496212f42737b7c9476249b821e3aff8fd /package/network/utils/iperf/patches/0003-fix-non-ipv6-builds.patch | |
parent | 3611cfe73d5f9680d387ef14632431fac30bbd9b (diff) | |
download | upstream-02d4d36d4ba826c29cae48835dba3899ed0c483d.tar.gz upstream-02d4d36d4ba826c29cae48835dba3899ed0c483d.tar.bz2 upstream-02d4d36d4ba826c29cae48835dba3899ed0c483d.zip |
iperf: Update to version 2.0.13
The removed patches are already integrated in the upstream version.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/network/utils/iperf/patches/0003-fix-non-ipv6-builds.patch')
-rw-r--r-- | package/network/utils/iperf/patches/0003-fix-non-ipv6-builds.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/package/network/utils/iperf/patches/0003-fix-non-ipv6-builds.patch b/package/network/utils/iperf/patches/0003-fix-non-ipv6-builds.patch index 9d96c1919a..c6afa3e160 100644 --- a/package/network/utils/iperf/patches/0003-fix-non-ipv6-builds.patch +++ b/package/network/utils/iperf/patches/0003-fix-non-ipv6-builds.patch @@ -1,18 +1,16 @@ -Index: iperf-2.0.12/src/Listener.cpp -=================================================================== ---- iperf-2.0.12.orig/src/Listener.cpp -+++ iperf-2.0.12/src/Listener.cpp -@@ -670,6 +670,7 @@ int Listener::L2_setup (void) { +--- a/src/Listener.cpp ++++ b/src/Listener.cpp +@@ -723,6 +723,7 @@ int Listener::L2_setup (void) { // Now optimize packet flow up the raw socket // Establish the flow BPF to forward up only "connected" packets to this raw socket +#ifdef HAVE_IPV6 if (l->sa_family == AF_INET6) { + #ifdef HAVE_IPV6 struct in6_addr *v6peer = SockAddr_get_in6_addr(&server->peer); - struct in6_addr *v6local = SockAddr_get_in6_addr(&server->local); -@@ -682,6 +683,9 @@ int Listener::L2_setup (void) { - WARN_errno( rc == SOCKET_ERROR, "l2 v4in6 connect ip bpf"); - } +@@ -740,6 +741,9 @@ int Listener::L2_setup (void) { + return -1; + #endif /* HAVE_IPV6 */ } else { +#else + { |