diff options
| author | Alexey Zelkin <phantom@FreeBSD.org> | 2003-03-11 08:13:53 +0000 |
|---|---|---|
| committer | Alexey Zelkin <phantom@FreeBSD.org> | 2003-03-11 08:13:53 +0000 |
| commit | 4b12e892bfe5f414cc628687f6249d116b105619 (patch) | |
| tree | 61d53a5854e69a89e06615535e98fbc5536bf76d | |
| parent | Fix a (rather uncritical) typo to suppress noisy warnings with ruby (diff) | |
Add patch which backouts some of my early compile hacks which now preventing
MulticastSocket.joinGroup() from behaving correctly.
Submitted by: Stefan Farfeleder <stefan@fafoe.dyndns.org>
Notes
Notes:
svn path=/head/; revision=77088
| -rw-r--r-- | java/jdk14/files/patch-PlainDatagramSocketImpl.c | 13 | ||||
| -rw-r--r-- | java/jdk15/files/patch-PlainDatagramSocketImpl.c | 13 | ||||
| -rw-r--r-- | java/jdk16/files/patch-PlainDatagramSocketImpl.c | 13 |
3 files changed, 39 insertions, 0 deletions
diff --git a/java/jdk14/files/patch-PlainDatagramSocketImpl.c b/java/jdk14/files/patch-PlainDatagramSocketImpl.c new file mode 100644 index 000000000000..c67cba9b612c --- /dev/null +++ b/java/jdk14/files/patch-PlainDatagramSocketImpl.c @@ -0,0 +1,13 @@ +--- ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig Tue Mar 11 10:43:29 2003 ++++ ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Mar 11 10:43:24 2003 +@@ -2034,9 +2034,7 @@ + /* + * Join the multicast group. + */ +-// XXXBSD: fix for BSD (re-implement with KAME ?) +-// if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), +- if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? 1 : 0), ++ if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), + (char *) &mname, mname_len) < 0) { + + /* diff --git a/java/jdk15/files/patch-PlainDatagramSocketImpl.c b/java/jdk15/files/patch-PlainDatagramSocketImpl.c new file mode 100644 index 000000000000..c67cba9b612c --- /dev/null +++ b/java/jdk15/files/patch-PlainDatagramSocketImpl.c @@ -0,0 +1,13 @@ +--- ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig Tue Mar 11 10:43:29 2003 ++++ ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Mar 11 10:43:24 2003 +@@ -2034,9 +2034,7 @@ + /* + * Join the multicast group. + */ +-// XXXBSD: fix for BSD (re-implement with KAME ?) +-// if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), +- if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? 1 : 0), ++ if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), + (char *) &mname, mname_len) < 0) { + + /* diff --git a/java/jdk16/files/patch-PlainDatagramSocketImpl.c b/java/jdk16/files/patch-PlainDatagramSocketImpl.c new file mode 100644 index 000000000000..c67cba9b612c --- /dev/null +++ b/java/jdk16/files/patch-PlainDatagramSocketImpl.c @@ -0,0 +1,13 @@ +--- ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig Tue Mar 11 10:43:29 2003 ++++ ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Mar 11 10:43:24 2003 +@@ -2034,9 +2034,7 @@ + /* + * Join the multicast group. + */ +-// XXXBSD: fix for BSD (re-implement with KAME ?) +-// if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), +- if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? 1 : 0), ++ if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), + (char *) &mname, mname_len) < 0) { + + /* |