diff options
| author | markd <markd@pkgsrc.org> | 2005-10-07 20:29:52 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2005-10-07 20:29:52 +0000 |
| commit | ac3637a1ae861216c7048b79813bd133e5633371 (patch) | |
| tree | 16ee253a2249f1dd56204c79d79d0b2f07bb5502 /net/iperf/patches | |
| parent | ba5d834941c35663681f2d2f3b34f1a4e9274a02 (diff) | |
| download | pkgsrc-ac3637a1ae861216c7048b79813bd133e5633371.tar.gz | |
Update iperf to 2.0.2.
Fixes configuring of multicast support and ipv6 support on NetBSD.
Add patches to deal with:
setsockopt(..., IP_MULTICAST_TTL,..) takes a u_char arg (not int).
On NetBSD and Solaris (probably other BSD's) ipv6 multicast group
join is done with IPV6_JOIN_GROUP not linux's IPV6_ADD_MEMERSHIP.
Diffstat (limited to 'net/iperf/patches')
| -rw-r--r-- | net/iperf/patches/patch-aa | 14 | ||||
| -rw-r--r-- | net/iperf/patches/patch-ab | 25 | ||||
| -rw-r--r-- | net/iperf/patches/patch-ac | 15 |
3 files changed, 54 insertions, 0 deletions
diff --git a/net/iperf/patches/patch-aa b/net/iperf/patches/patch-aa new file mode 100644 index 00000000000..e2b160256a2 --- /dev/null +++ b/net/iperf/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.3 2005/10/07 20:29:52 markd Exp $ + +--- configure.orig 2005-05-03 08:22:07.000000000 +1200 ++++ configure +@@ -11915,6 +11915,9 @@ cat >>conftest.$ac_ext <<_ACEOF + int + main () + { ++#if !defined(IPV6_ADD_MEMBERSHIP) && defined(IPV6_JOIN_GROUP) ++#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP ++#endif + #ifndef IPV6_ADD_MEMBERSHIP + char *p = (char *) IPV6_ADD_MEMBERSHIP; + #endif diff --git a/net/iperf/patches/patch-ab b/net/iperf/patches/patch-ab new file mode 100644 index 00000000000..6844deeb494 --- /dev/null +++ b/net/iperf/patches/patch-ab @@ -0,0 +1,25 @@ +$NetBSD: patch-ab,v 1.1 2005/10/07 20:29:52 markd Exp $ + +--- src/Listener.cpp.orig 2005-05-03 08:09:27.000000000 +1200 ++++ src/Listener.cpp +@@ -369,6 +369,9 @@ void Listener::McastJoin( ) { + WARN_errno( rc == SOCKET_ERROR, "multicast join" ); + } + #ifdef HAVE_IPV6_MULTICAST ++#if !defined(IPV6_ADD_MEMBERSHIP) && defined(IPV6_JOIN_GROUP) ++#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP ++#endif + else { + struct ipv6_mreq mreq; + +@@ -393,8 +396,9 @@ void Listener::McastJoin( ) { + void Listener::McastSetTTL( int val ) { + #ifdef HAVE_MULTICAST + if ( !SockAddr_isIPv6( &mSettings->local ) ) { ++ u_char uval = val; + int rc = setsockopt( mSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL, +- (char*) &val, sizeof(val)); ++ (char*) &uval, sizeof(uval)); + WARN_errno( rc == SOCKET_ERROR, "multicast ttl" ); + } + #ifdef HAVE_IPV6_MULTICAST diff --git a/net/iperf/patches/patch-ac b/net/iperf/patches/patch-ac new file mode 100644 index 00000000000..f092be136fa --- /dev/null +++ b/net/iperf/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2005/10/07 20:29:52 markd Exp $ + +--- src/PerfSocket.cpp.orig 2005-10-07 13:34:29.000000000 +1300 ++++ src/PerfSocket.cpp +@@ -95,8 +95,9 @@ void SetSocketOptions( thread_Settings * + int val = inSettings->mTTL; + #ifdef HAVE_MULTICAST + if ( !SockAddr_isIPv6( &inSettings->local ) ) { ++ u_char uval = val; + int rc = setsockopt( inSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL, +- (const void*) &val, (Socklen_t) sizeof(val)); ++ (const void*) &uval, (Socklen_t) sizeof(uval)); + + WARN_errno( rc == SOCKET_ERROR, "multicast ttl" ); + } |