Mercurial > hg > openjdk > jdk8 > jdk
changeset 5040:c68342532e2e jdk8-b27
Merge
| author | lana |
|---|---|
| date | Sat, 18 Feb 2012 16:11:47 -0800 |
| parents | 4196fc971f65 (current diff) 2a3f026b3a29 (diff) |
| children | 7d683ab46571 f525c1e9e12c 6a5d6b2800f6 f959bde6990a 75247b827d6c e4f3f5ceb082 |
| files | src/linux/doc/man/apt.1 src/linux/doc/man/ja/apt.1 src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java src/share/classes/com/sun/management/DiagnosticCommandInfo.java src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java src/share/classes/sun/nio/ch/SctpStdSocketOption.java src/solaris/classes/sun/nio/ch/SctpAssocChange.java src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java src/solaris/classes/sun/nio/ch/SctpChannelImpl.java src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java src/solaris/classes/sun/nio/ch/SctpNet.java src/solaris/classes/sun/nio/ch/SctpNotification.java src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java src/solaris/classes/sun/nio/ch/SctpResultContainer.java src/solaris/classes/sun/nio/ch/SctpSendFailed.java src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java src/solaris/classes/sun/nio/ch/SctpShutdown.java src/solaris/doc/sun/man/man1/apt.1 src/solaris/doc/sun/man/man1/ja/apt.1 src/solaris/native/sun/nio/ch/Sctp.h src/solaris/native/sun/nio/ch/SctpChannelImpl.c src/solaris/native/sun/nio/ch/SctpNet.c src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c src/windows/classes/sun/nio/ch/SctpChannelImpl.java src/windows/classes/sun/nio/ch/SctpMultiChannelImpl.java src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java |
| diffstat | 162 files changed, 7534 insertions(+), 7936 deletions(-) [+] |
line wrap: on
line diff
--- a/make/com/sun/Makefile Thu Feb 16 13:01:36 2012 -0800 +++ b/make/com/sun/Makefile Sat Feb 18 16:11:47 2012 -0800 @@ -47,7 +47,6 @@ org rowset net/httpserver SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo -# Omit mirror since it's built with the apt tool. SUBDIRS_tools = tools include $(BUILDDIR)/common/Subdirs.gmk
--- a/make/com/sun/nio/sctp/Exportedfiles.gmk Thu Feb 16 13:01:36 2012 -0800 +++ b/make/com/sun/nio/sctp/Exportedfiles.gmk Sat Feb 18 16:11:47 2012 -0800 @@ -29,11 +29,11 @@ ifneq ($(PLATFORM), windows) FILES_export = \ - sun/nio/ch/SctpAssocChange.java \ - sun/nio/ch/SctpChannelImpl.java \ - sun/nio/ch/SctpNet.java \ - sun/nio/ch/SctpPeerAddrChange.java \ - sun/nio/ch/SctpResultContainer.java \ - sun/nio/ch/SctpServerChannelImpl.java \ - sun/nio/ch/SctpStdSocketOption.java + sun/nio/ch/sctp/AssociationChange.java \ + sun/nio/ch/sctp/SctpChannelImpl.java \ + sun/nio/ch/sctp/SctpNet.java \ + sun/nio/ch/sctp/PeerAddrChange.java \ + sun/nio/ch/sctp/ResultContainer.java \ + sun/nio/ch/sctp/SctpServerChannelImpl.java \ + sun/nio/ch/sctp/SctpStdSocketOption.java endif
--- a/make/com/sun/nio/sctp/FILES_java.gmk Thu Feb 16 13:01:36 2012 -0800 +++ b/make/com/sun/nio/sctp/FILES_java.gmk Sat Feb 18 16:11:47 2012 -0800 @@ -42,25 +42,25 @@ com/sun/nio/sctp/SendFailedNotification.java \ com/sun/nio/sctp/ShutdownNotification.java \ \ - sun/nio/ch/SctpMessageInfoImpl.java \ - sun/nio/ch/SctpStdSocketOption.java + sun/nio/ch/sctp/MessageInfoImpl.java \ + sun/nio/ch/sctp/SctpStdSocketOption.java ifneq ($(PLATFORM), windows) FILES_java += \ - sun/nio/ch/SctpAssocChange.java \ - sun/nio/ch/SctpAssociationImpl.java \ - sun/nio/ch/SctpChannelImpl.java \ - sun/nio/ch/SctpMultiChannelImpl.java \ - sun/nio/ch/SctpNet.java \ - sun/nio/ch/SctpNotification.java \ - sun/nio/ch/SctpPeerAddrChange.java \ - sun/nio/ch/SctpResultContainer.java \ - sun/nio/ch/SctpSendFailed.java \ - sun/nio/ch/SctpServerChannelImpl.java \ - sun/nio/ch/SctpShutdown.java + sun/nio/ch/sctp/AssociationChange.java \ + sun/nio/ch/sctp/AssociationImpl.java \ + sun/nio/ch/sctp/PeerAddrChange.java \ + sun/nio/ch/sctp/ResultContainer.java \ + sun/nio/ch/sctp/SctpChannelImpl.java \ + sun/nio/ch/sctp/SctpMultiChannelImpl.java \ + sun/nio/ch/sctp/SctpNet.java \ + sun/nio/ch/sctp/SctpNotification.java \ + sun/nio/ch/sctp/SctpServerChannelImpl.java \ + sun/nio/ch/sctp/SendFailed.java \ + sun/nio/ch/sctp/Shutdown.java else FILES_java += \ - sun/nio/ch/SctpChannelImpl.java \ - sun/nio/ch/SctpMultiChannelImpl.java \ - sun/nio/ch/SctpServerChannelImpl.java + sun/nio/ch/sctp/SctpChannelImpl.java \ + sun/nio/ch/sctp/SctpMultiChannelImpl.java \ + sun/nio/ch/sctp/SctpServerChannelImpl.java endif
--- a/make/com/sun/nio/sctp/Makefile Thu Feb 16 13:01:36 2012 -0800 +++ b/make/com/sun/nio/sctp/Makefile Sat Feb 18 16:11:47 2012 -0800 @@ -47,14 +47,16 @@ # # Find platform-specific C source files # -vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch +vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch/sctp # # Include nio.h, net_util.h, sun_nio_ch_IOStatus.h, etc # OTHER_INCLUDES += \ -I$(SHARE_SRC)/native/sun/nio/ch \ + -I$(SHARE_SRC)/native/sun/nio/ch/sctp \ -I$(SHARE_SRC)/native/java/net \ + -I$(PLATFORM_SRC)/native/sun/nio/ch \ -I$(PLATFORM_SRC)/native/java/net \ -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders @@ -75,5 +77,5 @@ clean clobber:: $(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp - $(RM) -r $(CLASSDESTDIR)/sun/nio/ch + $(RM) -r $(CLASSDESTDIR)/sun/nio/ch/sctp
--- a/make/com/sun/nio/sctp/mapfile-vers Thu Feb 16 13:01:36 2012 -0800 +++ b/make/com/sun/nio/sctp/mapfile-vers Sat Feb 18 16:11:47 2012 -0800 @@ -25,30 +25,30 @@ SUNWprivate_1.1 { global: - Java_sun_nio_ch_SctpNet_init; - Java_sun_nio_ch_SctpNet_socket0; - Java_sun_nio_ch_SctpNet_bindx; - Java_sun_nio_ch_SctpNet_branch0; - Java_sun_nio_ch_SctpNet_listen0; - Java_sun_nio_ch_SctpNet_connect0; - Java_sun_nio_ch_SctpNet_close0; - Java_sun_nio_ch_SctpNet_preClose0; - Java_sun_nio_ch_SctpNet_getLocalAddresses0; - Java_sun_nio_ch_SctpNet_getRemoteAddresses0; - Java_sun_nio_ch_SctpNet_getPrimAddrOption0; - Java_sun_nio_ch_SctpNet_setPrimAddrOption0; - Java_sun_nio_ch_SctpNet_setPeerPrimAddrOption0; - Java_sun_nio_ch_SctpNet_getInitMsgOption0; - Java_sun_nio_ch_SctpNet_setInitMsgOption0; - Java_sun_nio_ch_SctpNet_getIntOption0; - Java_sun_nio_ch_SctpNet_setIntOption0; - Java_sun_nio_ch_SctpNet_shutdown0; - Java_sun_nio_ch_SctpChannelImpl_initIDs; - Java_sun_nio_ch_SctpChannelImpl_checkConnect; - Java_sun_nio_ch_SctpChannelImpl_receive0; - Java_sun_nio_ch_SctpChannelImpl_send0; - Java_sun_nio_ch_SctpServerChannelImpl_initIDs; - Java_sun_nio_ch_SctpServerChannelImpl_accept0; + Java_sun_nio_ch_sctp_SctpNet_init; + Java_sun_nio_ch_sctp_SctpNet_socket0; + Java_sun_nio_ch_sctp_SctpNet_bindx; + Java_sun_nio_ch_sctp_SctpNet_branch0; + Java_sun_nio_ch_sctp_SctpNet_listen0; + Java_sun_nio_ch_sctp_SctpNet_connect0; + Java_sun_nio_ch_sctp_SctpNet_close0; + Java_sun_nio_ch_sctp_SctpNet_preClose0; + Java_sun_nio_ch_sctp_SctpNet_getLocalAddresses0; + Java_sun_nio_ch_sctp_SctpNet_getRemoteAddresses0; + Java_sun_nio_ch_sctp_SctpNet_getPrimAddrOption0; + Java_sun_nio_ch_sctp_SctpNet_setPrimAddrOption0; + Java_sun_nio_ch_sctp_SctpNet_setPeerPrimAddrOption0; + Java_sun_nio_ch_sctp_SctpNet_getInitMsgOption0; + Java_sun_nio_ch_sctp_SctpNet_setInitMsgOption0; + Java_sun_nio_ch_sctp_SctpNet_getIntOption0; + Java_sun_nio_ch_sctp_SctpNet_setIntOption0; + Java_sun_nio_ch_sctp_SctpNet_shutdown0; + Java_sun_nio_ch_sctp_SctpChannelImpl_initIDs; + Java_sun_nio_ch_sctp_SctpChannelImpl_checkConnect; + Java_sun_nio_ch_sctp_SctpChannelImpl_receive0; + Java_sun_nio_ch_sctp_SctpChannelImpl_send0; + Java_sun_nio_ch_sctp_SctpServerChannelImpl_initIDs; + Java_sun_nio_ch_sctp_SctpServerChannelImpl_accept0; JNI_OnLoad; local: *;
--- a/make/common/Release.gmk Thu Feb 16 13:01:36 2012 -0800 +++ b/make/common/Release.gmk Sat Feb 18 16:11:47 2012 -0800 @@ -132,7 +132,6 @@ JDK_MAN_PAGES = \ $(JRE_MAN_PAGES) \ appletviewer.1 \ - apt.1 \ extcheck.1 \ idlj.1 \ jar.1 \ @@ -264,7 +263,6 @@ com/sun/java/swing \ com/sun/javadoc \ com/sun/jmx \ - com/sun/mirror \ com/sun/source \ com/sun/naming \ com/sun/security/auth \ @@ -346,7 +344,6 @@ com/sun/javadoc \ com/sun/jdi \ com/sun/jarsigner \ - com/sun/mirror \ com/sun/source \ com/sun/tools/classfile \ com/sun/tools/doclets \ @@ -356,16 +353,16 @@ com/sun/tools/hat \ com/sun/tools/javac \ com/sun/tools/javadoc \ - com/sun/tools/apt \ com/sun/tools/javah \ com/sun/tools/javap \ com/sun/tools/corba \ com/sun/tools/internal/xjc \ com/sun/tools/internal/ws \ - META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \ - META-INF/services/com.sun.tools.xjc.Plugin \ + META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ + META-INF/services/com.sun.tools.internal.xjc.Plugin \ com/sun/istack/internal/tools \ - com/sun/istack/internal/ws \ + com/sun/tools/internal/jxc/ap \ + com/sun/tools/internal/ws/wscompile/plugin/at_generated \ com/sun/codemodel \ com/sun/tools/internal/jxc \ com/sun/xml/internal/rngom \ @@ -438,7 +435,6 @@ java-rmi.cgi \ javac$(EXE_SUFFIX) \ javadoc$(EXE_SUFFIX) \ - apt$(EXE_SUFFIX) \ javah$(EXE_SUFFIX) \ javap$(EXE_SUFFIX) \ jcmd$(EXE_SUFFIX) \ @@ -525,13 +521,10 @@ $(ECHO) "com/sun/javadoc/" >> $@ $(ECHO) "com/sun/jdi/" >> $@ $(ECHO) "com/sun/jarsigner/" >> $@ - $(ECHO) "com/sun/mirror/" >> $@ $(ECHO) "com/sun/source/" >> $@ $(ECHO) "com/sun/istack/internal/tools/" >> $@ - $(ECHO) "com/sun/istack/internal/ws/" >> $@ $(ECHO) "META-INF/services/com.sun.jdi.connect.Connector" >> $@ $(ECHO) "META-INF/services/com.sun.jdi.connect.spi.TransportService" >> $@ - $(ECHO) "META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory" >> $@ $(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@ $(ECHO) "com/sun/tools/" >> $@ $(ECHO) "sun/jvmstat/" >> $@ @@ -1000,7 +993,7 @@ @# @# files that might not exist need to be touched. @# - $(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.xjc.Plugin + $(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.internal.xjc.Plugin @# @# lib/tools.jar @#
--- a/make/common/internal/Defs-jaxws.gmk Thu Feb 16 13:01:36 2012 -0800 +++ b/make/common/internal/Defs-jaxws.gmk Sat Feb 18 16:11:47 2012 -0800 @@ -34,7 +34,6 @@ javax/xml/ws \ javax/jws \ javax/annotation \ - com/sun/istack/internal \ com/sun/xml/internal/bind \ com/sun/xml/internal/fastinfoset \ com/sun/xml/internal/messaging \ @@ -42,13 +41,13 @@ com/sun/xml/internal/txw2 \ com/sun/xml/internal/ws \ com/sun/xml/internal/stream/buffer + NOT_USED_PACKAGES += \ com/sun/tools/internal/txw2 IMPORT_TOOLS_PACKAGES += \ com/sun/codemodel \ com/sun/istack/internal/tools \ - com/sun/istack/internal/ws \ com/sun/xml/internal/rngom \ com/sun/xml/internal/xsom \ com/sun/xml/internal/dtdparser \ @@ -56,6 +55,9 @@ com/sun/tools/internal/ws \ com/sun/tools/internal/jxc \ org/relaxng \ - META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \ - META-INF/services/com.sun.tools.internal.xjc.Plugin + META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ + META-INF/services/com.sun.tools.internal.xjc.Plugin \ + com/sun/tools/internal/jxc/ap \ + com/sun/tools/internal/ws/wscompile/plugin/at_generated +
--- a/make/common/internal/Defs-langtools.gmk Thu Feb 16 13:01:36 2012 -0800 +++ b/make/common/internal/Defs-langtools.gmk Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -32,9 +32,7 @@ IMPORT_TOOLS_PACKAGES += \ com/sun/javadoc \ - com/sun/mirror \ com/sun/source \ - com/sun/tools/apt \ com/sun/tools/classfile \ com/sun/tools/doclets \ com/sun/tools/javac \
--- a/make/docs/Makefile Thu Feb 16 13:01:36 2012 -0800 +++ b/make/docs/Makefile Sat Feb 18 16:11:47 2012 -0800 @@ -1,4 +1,4 @@ -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -358,64 +358,6 @@ ############################################################# # -# mirrordocs -# - -# Part of langtools -ifdef LANGTOOLS_DIST - ALL_OTHER_TARGETS += mirrordocs -endif - -MIRROR_DOCDIR := $(JDK_API_DOCSDIR)/apt/mirror -MIRROR2COREAPI := ../../$(JDKJRE2COREAPI) -MIRROR_DOCTITLE := Mirror API -MIRROR_WINDOWTITLE := Mirror API -MIRROR_HEADER := <strong>Mirror API</strong> -MIRROR_BOTTOM := $(call CommonBottom,$(MIRROR_FIRST_COPYRIGHT_YEAR)) -MIRROR_GROUPNAME := Packages -MIRROR_OVERVIEW := $(IMPORTSRCDIR)/com/sun/mirror/overview.html -MIRROR_REGEXP := com.sun.mirror.* -# MIRROR_PKGS is located in NON_CORE_PKGS.gmk - -# The index.html, options, and packages files -MIRROR_INDEX_FILE = $(MIRROR_DOCDIR)/index.html -MIRROR_OPTIONS_FILE = $(DOCSTMPDIR)/mirror.options -MIRROR_PACKAGES_FILE = $(DOCSTMPDIR)/mirror.packages - -mirrordocs: $(MIRROR_INDEX_FILE) - -# Set relative location to core api document root -$(MIRROR_INDEX_FILE): GET2DOCSDIR=$(MIRROR2COREAPI)/.. - -# Run javadoc if the index file is out of date or missing -$(MIRROR_INDEX_FILE): $(MIRROR_OPTIONS_FILE) $(MIRROR_PACKAGES_FILE) - $(prep-javadoc) - $(call JavadocSummary,$(MIRROR_OPTIONS_FILE),$(MIRROR_PACKAGES_FILE)) - $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \ - @$(MIRROR_OPTIONS_FILE) @$(MIRROR_PACKAGES_FILE) - -# Create file with javadoc options in it -$(MIRROR_OPTIONS_FILE): $(MIRROR_OVERVIEW) - $(prep-target) - @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \ - $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \ - $(call OptionPair,-encoding,ascii) ; \ - $(call OptionPair,-overview,$(MIRROR_OVERVIEW)) ; \ - $(call OptionPair,-doctitle,$(MIRROR_DOCTITLE)) ; \ - $(call OptionPair,-windowtitle,$(MIRROR_WINDOWTITLE) $(DRAFT_WINTITLE));\ - $(call OptionPair,-header,$(MIRROR_HEADER)$(DRAFT_HEADER)) ; \ - $(call OptionPair,-bottom,$(MIRROR_BOTTOM)$(DRAFT_BOTTOM)) ; \ - $(call OptionTrip,-group,$(MIRROR_GROUPNAME),$(MIRROR_REGEXP)); \ - $(call OptionTrip,-linkoffline,$(MIRROR2COREAPI),$(COREAPI_DOCSDIR)); \ - ) >> $@ - -# Create a file with the package names in it -$(MIRROR_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MIRROR_PKGS)) - $(prep-target) - $(call PackageFilter,$(MIRROR_PKGS)) - -############################################################# -# # docletapidocs #
--- a/make/docs/NON_CORE_PKGS.gmk Thu Feb 16 13:01:36 2012 -0800 +++ b/make/docs/NON_CORE_PKGS.gmk Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -71,11 +71,6 @@ TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java -MIRROR_PKGS = com.sun.mirror.apt \ - com.sun.mirror.declaration \ - com.sun.mirror.type \ - com.sun.mirror.util - ATTACH_PKGS = com.sun.tools.attach \ com.sun.tools.attach.spi
--- a/make/java/management/mapfile-vers Thu Feb 16 13:01:36 2012 -0800 +++ b/make/java/management/mapfile-vers Sat Feb 18 16:11:47 2012 -0800 @@ -54,9 +54,6 @@ Java_sun_management_GcInfoBuilder_getLastGcInfo0; Java_sun_management_GcInfoBuilder_getNumGcExtAttributes; Java_sun_management_HotSpotDiagnostic_dumpHeap; - Java_sun_management_HotSpotDiagnostic_executeDiagnosticCommand0; - Java_sun_management_HotSpotDiagnostic_getDiagnosticCommandInfo0; - Java_sun_management_HotSpotDiagnostic_getDiagnosticCommands0; Java_sun_management_HotspotThread_getInternalThreadCount; Java_sun_management_HotspotThread_getInternalThreadTimes0; Java_sun_management_MemoryImpl_getMemoryManagers0;
--- a/make/launchers/Makefile Thu Feb 16 13:01:36 2012 -0800 +++ b/make/launchers/Makefile Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -55,7 +55,6 @@ define make-all-launchers $(make-appletviewer) -$(call make-launcher, apt, com.sun.tools.apt.Main, , ) $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) $(call make-launcher, jar, sun.tools.jar.Main, , )
--- a/make/launchers/Makefile.launcher Thu Feb 16 13:01:36 2012 -0800 +++ b/make/launchers/Makefile.launcher Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -47,10 +47,6 @@ endif # Some tools need the wildcard expansion option -ifeq ($(PROGRAM),apt) - WILDCARDS=true - NEVER_ACT_AS_SERVER_CLASS_MACHINE=true -endif ifeq ($(PROGRAM),javac) WILDCARDS=true MAIN_JAVA_ARGS += -J-Xss4m -J-ea:com.sun.tools...
--- a/src/linux/doc/man/apt.1 Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH apt 1 "10 May 2011" - -.LP -.SH "NAME" -.LP -.LP -\f2apt\fP \- annotation processing tool -.LP -.SH "SYNOPSIS" -.LP -.LP -\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files] -.LP -.SH "PARAMETERS" -.LP -.LP -Options may be in any order. For a discussion of parameters which apply to a specific option, see OPTIONS below. -.LP -.RS 3 -.TP 3 -sourcefiles -Zero or more source files to be processed. -.TP 3 -@files -One or more files that list source files or other options -.RE - -.LP -.SH "DESCRIPTION" -.LP -.LP -\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. -.LP -.LP -The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. -.LP -.LP -A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in -.na -\f4Getting Started with \fP\f4apt\fP. @ -.fi -http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html -.LP -.SH "OPTIONS" -.LP -.SS -apt specific options -.LP -.RS 3 -.TP 3 -\-s dir -Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace. -.TP 3 -\-nocompile -Do not compile source files to class files. -.TP 3 -\-print -Print out textual representation of specified types; perform no annotation processing or compilation. -.TP 3 -\-A[key[=val]] -Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors -.TP 3 -\-factorypath path -Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories. -.TP 3 -\-factory classname -Name of annotation processor factory to use; bypasses default discovery process -.TP 3 -\-version -Print version information. -.TP 3 -\-X -Display information about non\-standard options. -.RE - -.LP -.SS -Options shared with javac -.LP -.RS 3 -.TP 3 -\-d dir -Specify where to place processor and javac generated class files -.TP 3 -\-cp path or \-classpath path -Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories. -.RE - -.LP -.LP -Consult the javac(1) man page for information on \f2javac\fP options. -.LP -.SS -Non\-Standard Options -.LP -.RS 3 -.TP 3 -\-XListAnnotationTypes -List found annotation types. -.TP 3 -\-XListDeclarations -List specified and included declarations. -.TP 3 -\-XPrintAptRounds -Print information about initial and recursive \f2apt\fP rounds. -.TP 3 -\-XPrintFactoryInfo -Print information about which annotations a factory is asked to process. -.TP 3 -\-XclassesAsDecls -Treat both class and source files as declarations to process. -.RE - -.LP -.LP -\f3Note\fP: Because these options are non\-standard, they are subject to change without notice. -.LP -.SH "NOTES" -.LP -.LP -The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. -.LP -.SH "SEE ALSO" -.LP -.RS 3 -.TP 2 -o -javac(1), java(1) -.RE - -.LP -
--- a/src/linux/doc/man/ja/apt.1 Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH apt 1 "07 May 2011" - -.LP -.SH "NAME" -.LP -.LP -\f2apt\fP \- Ãí¼á½èÍý¥Ä¡¼¥ë -.LP -.SH "·Á¼°" -.LP -.LP -\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files] -.LP -.SH "¥Ñ¥é¥á¡¼¥¿" -.LP -.LP -¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£ÆÃÄê¤Î¥ª¥×¥·¥ç¥ó¤ËŬÍѤµ¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢²¼µ¤Î¡Ö¥ª¥×¥·¥ç¥ó¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.RS 3 -.TP 3 -sourcefiles -¥¼¥í¡¢1 ¤Ä¡¢¤Þ¤¿¤ÏÊ£¿ô¤Î½èÍýÂоݤΥ½¡¼¥¹¥Õ¥¡¥¤¥ë -.TP 3 -@files -¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¾¤Î¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë 1 ¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë -.RE - -.LP -.SH "ÀâÌÀ" -.LP -.LP -\f3Ãí\fP: \f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.LP -Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£ -.LP -.LP -¥Ä¡¼¥ë¤Îµ¡Ç½¤Ë´Ø¤¹¤ë¾ÜºÙ¤È¡¢\f2apt\fP ¤ò»ÈÍѤ·¤¿³«È¯ÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢ -.na -\f4¡Öapt ÆþÌç¡×\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.SH "¥ª¥×¥·¥ç¥ó" -.LP -.SS -apt ¸ÇͤΥª¥×¥·¥ç¥ó -.LP -.RS 3 -.TP 3 -\-s dir -¥×¥í¥»¥Ã¥µ¤ÎÀ¸À®¤¹¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¥Ç¥£¥ì¥¯¥È¥ê¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¶õ´Ö¤Ë´ð¤Å¤¤¤Æ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹¡£ -.TP 3 -\-nocompile -¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤»¤ó¡£ -.TP 3 -\-print -»ØÄꤷ¤¿¥¿¥¤¥×¤Î¥Æ¥¥¹¥Èɽ¸½¤ò½ÐÎϤ·¤Þ¤¹¡£ Ãí¼á½èÍý¤Þ¤¿¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ï¹Ô¤¤¤Þ¤»¤ó¡£ -.TP 3 -\-A[key[=val]] -Ãí¼á¥×¥í¥»¥Ã¥µ¤ØÅϤ¹¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2apt\fP ¤¬Ä¾Àܲò¼á¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢¤½¤ì¤¾¤ì¤Î¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ»ÈÍѤǤ¤ë¤è¤¦¤ËÊѤ¨¤é¤ì¤Þ¤¹¡£ -.TP 3 -\-factorypath path -Ãí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£ -.TP 3 -\-factory classname -»ÈÍѤ¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤Î̾Á°¤Ç¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Î¸¡½Ð¥×¥í¥»¥¹¤ò¾Êά¤·¤Þ¤¹¡£ -.TP 3 -\-version -¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£ -.TP 3 -\-X -Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ -.RE - -.LP -.SS -javac ¤È¶¦ÍѤ¹¤ë¥ª¥×¥·¥ç¥ó -.LP -.RS 3 -.TP 3 -\-d dir -¥×¥í¥»¥Ã¥µ¤È javac À¸À®¤Î¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ -.TP 3 -\-cp path ¤Þ¤¿¤Ï \-classpath path -¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤ÈÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£\f2\-factorypath\fP ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£ -.RE - -.LP -.LP -\f2javac\fP ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢javac(1) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.SS -Èóɸ½à¥ª¥×¥·¥ç¥ó -.LP -.RS 3 -.TP 3 -\-XListAnnotationTypes -Ãí¼á¤Î·¿¤Ë¸¡½Ð¤µ¤ì¤ë¥ê¥¹¥È. -.TP 3 -\-XListDeclarations -»ØÄꤪ¤è¤ÓÀë¸À¤¬¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤ë¥ê¥¹¥È. -.TP 3 -\-XPrintAptRounds -½é´ü¤ª¤è¤ÓºÆµ¢Åª¤Ê \f2apt\fP ¥é¥¦¥ó¥É¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë. -.TP 3 -\-XPrintFactoryInfo -½èÍý¤òÍ׵᤹¤ë¥Õ¥¡¥¯¥È¥ê¤ÎÃí¼á¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë. -.TP 3 -\-XclassesAsDecls -¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¡¢½èÍýÂоݤÎÀë¸À¤È¤·¤Æ½èÍý¤·¤Þ¤¹¡£ -.RE - -.LP -.LP -\f3Ãí\fP: ¤³¤ì¤é¤ÏÈóɸ½à¥ª¥×¥·¥ç¥ó¤Ê¤Î¤Ç¡¢Í½¹ð¤Ê¤¯Êѹ¹¤µ¤ì¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£ -.LP -.SH "Ãí" -.LP -.LP -\f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.SH "´ØÏ¢¹àÌÜ" -.LP -.RS 3 -.TP 2 -o -javac(1), java(1) -.RE - -.LP -
--- a/src/share/classes/com/sun/crypto/provider/PBEKey.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/crypto/provider/PBEKey.java Sat Feb 18 16:11:47 2012 -0800 @@ -55,9 +55,12 @@ // Should allow an empty password. passwd = new char[0]; } - for (int i=0; i<passwd.length; i++) { - if ((passwd[i] < '\u0020') || (passwd[i] > '\u007E')) { - throw new InvalidKeySpecException("Password is not ASCII"); + // Accept "\0" to signify "zero-length password with no terminator". + if (!(passwd.length == 1 && passwd[0] == 0)) { + for (int i=0; i<passwd.length; i++) { + if ((passwd[i] < '\u0020') || (passwd[i] > '\u007E')) { + throw new InvalidKeySpecException("Password is not ASCII"); + } } } this.key = new byte[passwd.length];
--- a/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java Sat Feb 18 16:11:47 2012 -0800 @@ -60,11 +60,16 @@ static byte[] derive(char[] chars, byte[] salt, int ic, int n, int type) { - // Add in trailing NULL terminator. + // Add in trailing NULL terminator. Special case: + // no terminator if password is "\0". int length = chars.length*2; - if (length != 0) { + if (length == 2 && chars[0] == 0) { + chars = new char[0]; + length = 0; + } else { length += 2; } + byte[] passwd = new byte[length]; for (int i = 0, j = 0; i < chars.length; i++, j+=2) { passwd[j] = (byte) ((chars[i] >>> 8) & 0xFF); @@ -133,6 +138,9 @@ } private static void concat(byte[] src, byte[] dst, int start, int len) { + if (src.length == 0) { + return; + } int loop = len / src.length; int off, i; for (i = 0, off = 0; i < loop; i++, off += src.length)
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java Sat Feb 18 16:11:47 2012 -0800 @@ -137,6 +137,11 @@ g.setColor(progressBar.getForeground()); barRectHeight -= 2; barRectWidth -= 2; + + if (barRectWidth <= 0 || barRectHeight <= 0) { + return; + } + Graphics2D g2 = (Graphics2D)g; g2.setStroke(new BasicStroke((float)(vertical ? barRectWidth : barRectHeight), BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
--- a/src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.sun.management; - -import java.beans.ConstructorProperties; - -/** - * Diagnostic Command Argument information. It contains the description - * of one parameter of the diagnostic command. A parameter can either be an - * option or an argument. Options are identified by the option name while - * arguments are identified by their position in the command line. The generic - * syntax of a diagnostic command is: - * <blockquote> - * <command name> [<option>=<value>] [<argument_value>] - * </blockquote> - * Example: - * <blockquote> - * command_name option1=value1 option2=value argumentA argumentB argumentC - * </blockquote> - * In this command line, the diagnostic command receives five parameters, two - * options named {@code option1} and {@code option2}, and three arguments. - * argumentA's position is 0, argumentB's position is 1 and argumentC's - * position is 2. - * - * @author Frederic Parain - * @since 7u4 - */ - -public class DiagnosticCommandArgumentInfo { - private final String name; - private final String description; - private final String type; - private final String defaultValue; - private final boolean mandatory; - private final boolean option; - private final int position; - - /** - * Returns the argument name - * - * @return the argument name - */ - public String getName() { - return name; - } - - /** - * Returns the argument description - * - * @return the argument description - */ - public String getDescription() { - return description; - } - - /** - * Returns the argument type - * - * @return the argument type - */ - public String getType() { - return type; - } - - /** - * Returns the default value as a String if a default value - * is defined, null otherwise. - * - * @return the default value as a String if a default value - * is defined, null otherwise. - */ - public String getDefault() { - return defaultValue; - } - - /** - * Returns {@code true} if the argument is mandatory, - * {@code false} otherwise - * - * @return {@code true} if the argument is mandatory, - * {@code false} otherwise - */ - public boolean isMandatory() { - return mandatory; - } - - /** - * Returns {@code true} if the argument is an option, - * {@code false} otherwise. Options have to be specified using the - * <key>=<value> syntax on the command line, while other - * arguments are specified with a single <value> field and are - * identified by their position on command line. - * - * @return {@code true} if the argument is an option, - * {@code false} otherwise - */ - public boolean isOption() { - return option; - } - - /** - * Returns the expected position of this argument if it is not an option, - * -1 otherwise. Argument position if defined from left to right, - * starting at zero and ignoring the diagnostic command name and - * options. - * - * @return the expected position of this argument if it is not an option, - * -1 otherwise. - */ - public int getPosition() { - return position; - } - - @ConstructorProperties({"name","description","type","default", - "mandatory","option","position"}) - public DiagnosticCommandArgumentInfo(String name, String description, - String type, String defaultValue, - boolean mandatory, boolean option, - int position) { - this.name = name; - this.description = description; - this.type = type; - this.defaultValue = defaultValue; - this.mandatory = mandatory; - this.option = option; - this.position = position; - } -}
--- a/src/share/classes/com/sun/management/DiagnosticCommandInfo.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.sun.management; - -import java.beans.ConstructorProperties; -import java.util.List; - -/** - * Diagnostic command information. It contains the description of a - * diagnostic command. - * - * @author Frederic Parain - * @since 7u4 - */ - -public class DiagnosticCommandInfo { - private final String name; - private final String description; - private final String impact; - private final boolean enabled; - private final List<DiagnosticCommandArgumentInfo> arguments; - - /** - * Returns the diagnostic command name - * - * @return the diagnostic command name - */ - public String getName() { - return name; - } - - /** - * Returns the diagnostic command description - * - * @return the diagnostic command description - */ - public String getDescription() { - return description; - } - - /** - * Returns the potential impact of the diagnostic command execution - * on the Java virtual machine behavior - * - * @return the potential impact of the diagnostic command execution - * on the Java virtual machine behavior - */ - public String getImpact() { - return impact; - } - - /** - * Returns {@code true} if the diagnostic command is enabled, - * {@code false} otherwise. The enabled/disabled - * status of a diagnostic command can evolve during - * the lifetime of the Java virtual machine. - * - * @return {@code true} if the diagnostic command is enabled, - * {@code false} otherwise - */ - public boolean isEnabled() { - return enabled; - } - - /** - * Returns the list of the diagnostic command arguments description. - * If the diagnostic command has no arguments, it returns an empty list. - * - * @return a list of the diagnostic command arguments description - */ - public List<DiagnosticCommandArgumentInfo> getArgumentsInfo() { - return arguments; - } - - @ConstructorProperties({"name", "description","impact","enabled", - "argumentsInfo"}) - public DiagnosticCommandInfo(String name, String description, - String impact, boolean enabled, - List<DiagnosticCommandArgumentInfo> arguments) - { - this.name = name; - this.description = description; - this.impact = impact; - this.enabled = enabled; - this.arguments = arguments; - } -}
--- a/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,11 +31,6 @@ /** * Diagnostic management interface for the HotSpot Virtual Machine. * - * <p>{@linkplain #getDiagnosticCommands Diagnostic commands} - * are actions that can be invoked dynamically and - * executed in a target Java virtual machine, mainly for troubleshooting - * and diagnosis. - * * <p>The diagnostic MBean is registered to the platform MBeanServer * as are other platform MBeans. * @@ -116,108 +111,4 @@ * ManagementPermission("control"). */ public void setVMOption(String name, String value); - - /** - * Returns the {@linkplain DiagnosticCommandInfo#getName() names} - * of all diagnostic commands. - * A diagnostic command is an action that can be invoked dynamically - * mainly for troubleshooting and diagnosis. The list of diagnostic - * commands may change at runtime. A diagnostic command may be - * {@linkplain DiagnosticCommandInfo#isEnabled disabled} but will - * not be removed from a previously returned list. - * - * @return the names of all diagnostic commands. - * - * @since 7u4 - */ - public List<String> getDiagnosticCommands(); - - /** - * Returns a {@code DiagnosticCommandInfo} object describing the - * diagnostic command of the specified name {@code command} - * - * @param command a diagnostic command name - * @return a {@code DiagnosticCommandInfo} object - * @throws java.lang.IllegalArgumentException if the {@code command} - * doesn't match any diagnostic command registered in the - * targeted Java virtual machine. - * - * @since 7u4 - */ - public DiagnosticCommandInfo getDiagnosticCommandInfo(String command); - - /** - * Returns a list of {@code DiagnosticCommandInfo} object describing - * all diagnostic commands available on the targeted Java virtual machine - * - * @return a list of {@code DiagnosticCommandInfo} objects - * - * @since 7u4 - */ - public List<DiagnosticCommandInfo> getDiagnosticCommandInfo(); - - /** - * Returns a list of {@code DiagnosticCommandInfo} object describing - * all diagnostic commands specified in the {@code commands} list. - * - * @param commands {@code List} of {@code String} containing diagnostic - * command names - * @return a {@code List} of {@code DiagnosticCommandInfo} objects - * - * @throws java.lang.IllegalArgumentException if at least one - * command specified in the {@code commands } list - * doesn't match any diagnostic command registered in the - * targeted Java virtual machine. - * - * @since 7u4 - */ - public List<DiagnosticCommandInfo> getDiagnosticCommandInfo(List<String> commands); - - /** - * Executes the command line {@code commandLine}. The command line must - * start with a diagnostic command name, optionally followed by parameters. - * Each command has its own syntax but the generic syntax for a diagnostic - * command line is: - * <blockquote> - * <command name> [<option>=<value>] [<argument_value>] - * </blockquote> - * - * @param commandLine command line to execute - * @return a {@code String} object containing the diagnostic command - * output. - * - * @throws java.lang.IllegalArgumentException if the command line doesn't - * match any diagnostic command registered in the virtual machine - * of if the parameters don't match the diagnostic command syntax. - * @throws java.lang.SecurityException - * if a security manager exists and the caller does not have - * ManagementPermission("control"). - * - * @since 7u4 - */ - public String execute(String commandLine); - - /** - * Invokes the diagnostic command named {@code cmd} with the parameters - * specified in {@code args}. Each command has its own syntax but - * the generic syntax for parameters is: - * <blockquote> - * [<option>=<value>] [<argument_value>] - * </blockquote> - * - * @param cmd a diagnostic command name - * @param args the command parameters - * @return a {@code String} object containing the diagnostic command - * output. - * - * @throws java.lang.IllegalArgumentException if the command line doesn't - * match any diagnostic command registered in the virtual machine - * of if the parameters don't match the diagnostic command syntax. - * @throws java.lang.SecurityException - * if a security manager exists and the caller does not have - * ManagementPermission("control"). - * - * @since 7u4 - */ - public String execute(String cmd, String... args); }
--- a/src/share/classes/com/sun/nio/sctp/MessageInfo.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/nio/sctp/MessageInfo.java Sat Feb 18 16:11:47 2012 -0800 @@ -94,7 +94,7 @@ if (streamNumber < 0 || streamNumber > 65536) throw new IllegalArgumentException("Invalid stream number"); - return new sun.nio.ch.SctpMessageInfoImpl(null, address, streamNumber); + return new sun.nio.ch.sctp.MessageInfoImpl(null, address, streamNumber); } /** * Creates a {@code MessageInfo} instance suitable for use when @@ -133,8 +133,8 @@ if (streamNumber < 0 || streamNumber > 65536) throw new IllegalArgumentException("Invalid stream number"); - return new sun.nio.ch.SctpMessageInfoImpl(association, address, - streamNumber); + return new sun.nio.ch.sctp.MessageInfoImpl(association, + address, streamNumber); } /**
--- a/src/share/classes/com/sun/nio/sctp/SctpChannel.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/nio/sctp/SctpChannel.java Sat Feb 18 16:11:47 2012 -0800 @@ -162,7 +162,7 @@ */ public static SctpChannel open() throws IOException { - return new sun.nio.ch.SctpChannelImpl((SelectorProvider)null); + return new sun.nio.ch.sctp.SctpChannelImpl((SelectorProvider)null); } /**
--- a/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java Sat Feb 18 16:11:47 2012 -0800 @@ -162,7 +162,7 @@ */ public static SctpMultiChannel open() throws IOException { - return new sun.nio.ch.SctpMultiChannelImpl((SelectorProvider)null); + return new sun.nio.ch.sctp.SctpMultiChannelImpl((SelectorProvider)null); } /**
--- a/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java Sat Feb 18 16:11:47 2012 -0800 @@ -98,7 +98,7 @@ */ public static SctpServerChannel open() throws IOException { - return new sun.nio.ch.SctpServerChannelImpl((SelectorProvider)null); + return new sun.nio.ch.sctp.SctpServerChannelImpl((SelectorProvider)null); } /**
--- a/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java Sat Feb 18 16:11:47 2012 -0800 @@ -25,7 +25,7 @@ package com.sun.nio.sctp; import java.net.SocketAddress; -import sun.nio.ch.SctpStdSocketOption; +import sun.nio.ch.sctp.SctpStdSocketOption; /** * SCTP channels supports the socket options defined by this class @@ -50,7 +50,7 @@ */ public static final SctpSocketOption<Boolean> SCTP_DISABLE_FRAGMENTS = new SctpStdSocketOption<Boolean>("SCTP_DISABLE_FRAGMENTS", Boolean.class, - sun.nio.ch.SctpStdSocketOption.SCTP_DISABLE_FRAGMENTS); + sun.nio.ch.sctp.SctpStdSocketOption.SCTP_DISABLE_FRAGMENTS); /** * Enables or disables explicit message completion. @@ -69,7 +69,7 @@ */ public static final SctpSocketOption<Boolean> SCTP_EXPLICIT_COMPLETE = new SctpStdSocketOption<Boolean>("SCTP_EXPLICIT_COMPLETE", Boolean.class, - sun.nio.ch.SctpStdSocketOption.SCTP_EXPLICIT_COMPLETE); + sun.nio.ch.sctp.SctpStdSocketOption.SCTP_EXPLICIT_COMPLETE); /** * Fragmented interleave controls how the presentation of messages occur @@ -120,7 +120,7 @@ public static final SctpSocketOption<Integer> SCTP_FRAGMENT_INTERLEAVE = new SctpStdSocketOption<Integer>("SCTP_FRAGMENT_INTERLEAVE", Integer.class, - sun.nio.ch.SctpStdSocketOption.SCTP_FRAGMENT_INTERLEAVE); + sun.nio.ch.sctp.SctpStdSocketOption.SCTP_FRAGMENT_INTERLEAVE); /** * The maximum number of streams requested by the local endpoint during @@ -171,7 +171,7 @@ */ public static final SctpSocketOption<Boolean> SCTP_NODELAY = new SctpStdSocketOption<Boolean>("SCTP_NODELAY", Boolean.class, - sun.nio.ch.SctpStdSocketOption.SCTP_NODELAY); + sun.nio.ch.sctp.SctpStdSocketOption.SCTP_NODELAY); /** * Requests that the local SCTP stack use the given peer address as @@ -246,7 +246,7 @@ */ public static final SctpSocketOption<Integer> SO_SNDBUF = new SctpStdSocketOption<Integer>("SO_SNDBUF", Integer.class, - sun.nio.ch.SctpStdSocketOption.SO_SNDBUF); + sun.nio.ch.sctp.SctpStdSocketOption.SO_SNDBUF); /** * The size of the socket receive buffer. @@ -273,7 +273,7 @@ */ public static final SctpSocketOption<Integer> SO_RCVBUF = new SctpStdSocketOption<Integer>("SO_RCVBUF", Integer.class, - sun.nio.ch.SctpStdSocketOption.SO_RCVBUF); + sun.nio.ch.sctp.SctpStdSocketOption.SO_RCVBUF); /** * Linger on close if data is present. @@ -304,7 +304,7 @@ */ public static final SctpSocketOption<Integer> SO_LINGER = new SctpStdSocketOption<Integer>("SO_LINGER", Integer.class, - sun.nio.ch.SctpStdSocketOption.SO_LINGER); + sun.nio.ch.sctp.SctpStdSocketOption.SO_LINGER); /** * This class is used to set the maximum number of inbound/outbound streams
--- a/src/share/classes/java/awt/List.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/awt/List.java Sat Feb 18 16:11:47 2012 -0800 @@ -115,7 +115,7 @@ * @see #addItem(String) * @see #getItem(int) */ - Vector items = new Vector(); + Vector<String> items = new Vector<>(); /** * This field will represent the number of visible rows in the @@ -306,7 +306,7 @@ // to insure that it cannot be overridden by client subclasses. // DO NOT INVOKE CLIENT CODE ON THIS THREAD! final String getItemImpl(int index) { - return (String)items.elementAt(index); + return items.elementAt(index); } /** @@ -415,7 +415,7 @@ if (peer != null) { peer.removeAll(); } - items = new Vector(); + items = new Vector<>(); selected = new int[0]; } @@ -490,9 +490,9 @@ public synchronized int[] getSelectedIndexes() { ListPeer peer = (ListPeer)this.peer; if (peer != null) { - selected = ((ListPeer)peer).getSelectedIndexes(); + selected = peer.getSelectedIndexes(); } - return (int[])selected.clone(); + return selected.clone(); } /** @@ -908,7 +908,7 @@ * @since 1.4 */ public synchronized ItemListener[] getItemListeners() { - return (ItemListener[])(getListeners(ItemListener.class)); + return getListeners(ItemListener.class); } /** @@ -975,7 +975,7 @@ * @since 1.4 */ public synchronized ActionListener[] getActionListeners() { - return (ActionListener[])(getListeners(ActionListener.class)); + return getListeners(ActionListener.class); } /**
--- a/src/share/classes/java/awt/Window.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/awt/Window.java Sat Feb 18 16:11:47 2012 -0800 @@ -398,10 +398,10 @@ initIDs(); } - String s = (String) java.security.AccessController.doPrivileged( + String s = java.security.AccessController.doPrivileged( new GetPropertyAction("java.awt.syncLWRequests")); systemSyncLWRequests = (s != null && s.equals("true")); - s = (String) java.security.AccessController.doPrivileged( + s = java.security.AccessController.doPrivileged( new GetPropertyAction("java.awt.Window.locationByPlatform")); locationByPlatformProp = (s != null && s.equals("true")); } @@ -1378,7 +1378,7 @@ // make sure the privileged action is only // for getting the property! We don't want the // above checkTopLevelWindow call to always succeed! - warningString = (String) AccessController.doPrivileged( + warningString = AccessController.doPrivileged( new GetPropertyAction("awt.appletWarning", "Java Applet Window")); }
--- a/src/share/classes/java/awt/color/ICC_Profile.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/awt/color/ICC_Profile.java Sat Feb 18 16:11:47 2012 -0800 @@ -921,9 +921,9 @@ */ private static ICC_Profile getStandardProfile(final String name) { - return (ICC_Profile) AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { + return AccessController.doPrivileged( + new PrivilegedAction<ICC_Profile>() { + public ICC_Profile run() { ICC_Profile p = null; try { p = getInstance (name);
--- a/src/share/classes/java/awt/event/InputEvent.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/awt/event/InputEvent.java Sat Feb 18 16:11:47 2012 -0800 @@ -321,14 +321,15 @@ * @param when a long int that gives the time the event occurred. * Passing negative or zero value * is not recommended - * @param modifiers the modifier keys down during event (e.g. shift, ctrl, - * alt, meta) - * Passing negative parameter is not recommended. - * Zero value means no modifiers. - * Either extended _DOWN_MASK or old _MASK modifiers - * should be used, but both models should not be mixed - * in one event. Use of the extended modifiers is - * preferred + * @param modifiers a modifier mask describing the modifier keys and mouse + * buttons (for example, shift, ctrl, alt, and meta) that + * are down during the event. + * Only extended modifiers are allowed to be used as a + * value for this parameter (see the {@link InputEvent#getModifiersEx} + * class for the description of extended modifiers). + * Passing negative parameter + * is not recommended. + * Zero value means that no modifiers were passed * @throws IllegalArgumentException if <code>source</code> is null * @see #getSource() * @see #getID() @@ -416,9 +417,13 @@ /** * Returns the extended modifier mask for this event. + * <P> + * Extended modifiers are the modifiers that ends with the _DOWN_MASK suffix, + * such as ALT_DOWN_MASK, BUTTON1_DOWN_MASK, and others. + * <P> * Extended modifiers represent the state of all modal keys, * such as ALT, CTRL, META, and the mouse buttons just after - * the event occurred + * the event occurred. * <P> * For example, if the user presses <b>button 1</b> followed by * <b>button 2</b>, and then releases them in the same order,
--- a/src/share/classes/java/awt/event/MouseEvent.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/awt/event/MouseEvent.java Sat Feb 18 16:11:47 2012 -0800 @@ -488,14 +488,15 @@ * @param when A long integer that gives the time the event occurred. * Passing negative or zero value * is not recommended - * @param modifiers The modifier keys down during event (e.g. shift, ctrl, - * alt, meta) + * @param modifiers a modifier mask describing the modifier keys and mouse + * buttons (for example, shift, ctrl, alt, and meta) that + * are down during the event. + * Only extended modifiers are allowed to be used as a + * value for this parameter (see the {@link InputEvent#getModifiersEx} + * class for the description of extended modifiers). * Passing negative parameter * is not recommended. - * Zero value means that no modifiers were passed. - * Use either an extended _DOWN_MASK or old _MASK modifiers, - * however do not mix models in the one event. - * The extended modifiers are preferred for using + * Zero value means that no modifiers were passed * @param x The horizontal x coordinate for the mouse location. * It is allowed to pass negative values * @param y The vertical y coordinate for the mouse location. @@ -586,14 +587,15 @@ * @param when A long integer that gives the time the event occurred. * Passing negative or zero value * is not recommended - * @param modifiers The modifier keys down during event (e.g. shift, ctrl, - * alt, meta) + * @param modifiers a modifier mask describing the modifier keys and mouse + * buttons (for example, shift, ctrl, alt, and meta) that + * are down during the event. + * Only extended modifiers are allowed to be used as a + * value for this parameter (see the {@link InputEvent#getModifiersEx} + * class for the description of extended modifiers). * Passing negative parameter * is not recommended. - * Zero value means that no modifiers were passed. - * Use either an extended _DOWN_MASK or old _MASK modifiers, - * however do not mix models in the one event. - * The extended modifiers are preferred for using + * Zero value means that no modifiers were passed * @param x The horizontal x coordinate for the mouse location. * It is allowed to pass negative values * @param y The vertical y coordinate for the mouse location. @@ -657,14 +659,15 @@ * @param when A long integer that gives the time the event occurred. * Passing negative or zero value * is not recommended - * @param modifiers The modifier keys down during event (e.g. shift, ctrl, - * alt, meta) + * @param modifiers a modifier mask describing the modifier keys and mouse + * buttons (for example, shift, ctrl, alt, and meta) that + * are down during the event. + * Only extended modifiers are allowed to be used as a + * value for this parameter (see the {@link InputEvent#getModifiersEx} + * class for the description of extended modifiers). * Passing negative parameter * is not recommended. - * Zero value means that no modifiers were passed. - * Use either an extended _DOWN_MASK or old _MASK modifiers, - * however do not mix models in the one event. - * The extended modifiers are preferred for using + * Zero value means that no modifiers were passed * @param x The horizontal x coordinate for the mouse location. * It is allowed to pass negative values * @param y The vertical y coordinate for the mouse location.
--- a/src/share/classes/java/lang/management/ManagementPermission.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/lang/management/ManagementPermission.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,12 +46,17 @@ * <tr> * <td>control</td> * <td>Ability to control the runtime characteristics of the Java virtual - * machine, for example, setting the -verbose:gc and -verbose:class flag, - * setting the threshold of a memory pool, and enabling and disabling - * the thread contention monitoring support. + * machine, for example, enabling and disabling the verbose output for + * the class loading or memory system, setting the threshold of a memory + * pool, and enabling and disabling the thread contention monitoring + * support. Some actions controlled by this permission can disclose + * information about the running application, like the -verbose:class + * flag. * </td> * <td>This allows an attacker to control the runtime characteristics - * of the Java virtual machine and cause the system to misbehave. + * of the Java virtual machine and cause the system to misbehave. An + * attacker can also access some information related to the running + * application. * </td> * </tr> * <tr>
--- a/src/share/classes/java/util/jar/Attributes.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/util/jar/Attributes.java Sat Feb 18 16:11:47 2012 -0800 @@ -71,7 +71,7 @@ * @param size the initial number of attributes */ public Attributes(int size) { - map = new HashMap(size); + map = new HashMap<>(size); } /** @@ -81,7 +81,7 @@ * @param attr the specified Attributes */ public Attributes(Attributes attr) { - map = new HashMap(attr); + map = new HashMap<>(attr); } @@ -296,9 +296,9 @@ * XXX Need to handle UTF8 values and break up lines longer than 72 bytes */ void write(DataOutputStream os) throws IOException { - Iterator it = entrySet().iterator(); + Iterator<Map.Entry<Object, Object>> it = entrySet().iterator(); while (it.hasNext()) { - Map.Entry e = (Map.Entry)it.next(); + Map.Entry<Object, Object> e = it.next(); StringBuffer buffer = new StringBuffer( ((Name)e.getKey()).toString()); buffer.append(": "); @@ -340,9 +340,9 @@ // write out all attributes except for the version // we wrote out earlier - Iterator it = entrySet().iterator(); + Iterator<Map.Entry<Object, Object>> it = entrySet().iterator(); while (it.hasNext()) { - Map.Entry e = (Map.Entry)it.next(); + Map.Entry<Object, Object> e = it.next(); String name = ((Name)e.getKey()).toString(); if ((version != null) && ! (name.equalsIgnoreCase(vername))) { @@ -499,7 +499,7 @@ */ public boolean equals(Object o) { if (o instanceof Name) { - Comparator c = ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER; + Comparator<String> c = ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER; return c.compare(name, ((Name)o).name) == 0; } else { return false;
--- a/src/share/classes/java/util/jar/JarOutputStream.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/util/jar/JarOutputStream.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -135,7 +135,7 @@ * The bytes are assumed to be in Intel (little-endian) byte order. */ private static int get16(byte[] b, int off) { - return (b[off] & 0xff) | ((b[off+1] & 0xff) << 8); + return Byte.toUnsignedInt(b[off]) | ( Byte.toUnsignedInt(b[off+1]) << 8); } /*
--- a/src/share/classes/java/util/jar/JarVerifier.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/util/jar/JarVerifier.java Sat Feb 18 16:11:47 2012 -0800 @@ -48,21 +48,21 @@ /* a table mapping names to code signers, for jar entries that have had their actual hashes verified */ - private Hashtable verifiedSigners; + private Hashtable<String, CodeSigner[]> verifiedSigners; /* a table mapping names to code signers, for jar entries that have passed the .SF/.DSA/.EC -> MANIFEST check */ - private Hashtable sigFileSigners; + private Hashtable<String, CodeSigner[]> sigFileSigners; /* a hash table to hold .SF bytes */ - private Hashtable sigFileData; + private Hashtable<String, byte[]> sigFileData; /** "queue" of pending PKCS7 blocks that we couldn't parse * until we parsed the .SF file */ - private ArrayList pendingBlocks; + private ArrayList<SignatureFileVerifier> pendingBlocks; /* cache of CodeSigner objects */ - private ArrayList signerCache; + private ArrayList<CodeSigner[]> signerCache; /* Are we parsing a block? */ private boolean parsingBlockOrSF = false; @@ -94,10 +94,10 @@ public JarVerifier(byte rawBytes[]) { manifestRawBytes = rawBytes; - sigFileSigners = new Hashtable(); - verifiedSigners = new Hashtable(); - sigFileData = new Hashtable(11); - pendingBlocks = new ArrayList(); + sigFileSigners = new Hashtable<>(); + verifiedSigners = new Hashtable<>(); + sigFileData = new Hashtable<>(11); + pendingBlocks = new ArrayList<>(); baos = new ByteArrayOutputStream(); manifestDigests = new ArrayList<>(); } @@ -248,10 +248,9 @@ sigFileData.put(key, bytes); // check pending blocks, we can now process // anyone waiting for this .SF file - Iterator it = pendingBlocks.iterator(); + Iterator<SignatureFileVerifier> it = pendingBlocks.iterator(); while (it.hasNext()) { - SignatureFileVerifier sfv = - (SignatureFileVerifier) it.next(); + SignatureFileVerifier sfv = it.next(); if (sfv.needSignatureFile(key)) { if (debug != null) { debug.println( @@ -270,7 +269,7 @@ String key = uname.substring(0, uname.lastIndexOf(".")); if (signerCache == null) - signerCache = new ArrayList(); + signerCache = new ArrayList<>(); if (manDig == null) { synchronized(manifestRawBytes) { @@ -287,7 +286,7 @@ if (sfv.needSignatureFileBytes()) { // see if we have already parsed an external .SF file - byte[] bytes = (byte[]) sigFileData.get(key); + byte[] bytes = sigFileData.get(key); if (bytes == null) { // put this block on queue for later processing @@ -343,7 +342,7 @@ */ public CodeSigner[] getCodeSigners(String name) { - return (CodeSigner[])verifiedSigners.get(name); + return verifiedSigners.get(name); } public CodeSigner[] getCodeSigners(JarFile jar, JarEntry entry) @@ -376,15 +375,14 @@ CodeSigner[] signers) { if (signers != null) { - ArrayList certChains = new ArrayList(); + ArrayList<java.security.cert.Certificate> certChains = new ArrayList<>(); for (int i = 0; i < signers.length; i++) { certChains.addAll( signers[i].getSignerCertPath().getCertificates()); } // Convert into a Certificate[] - return (java.security.cert.Certificate[]) - certChains.toArray( + return certChains.toArray( new java.security.cert.Certificate[certChains.size()]); } return null; @@ -418,8 +416,8 @@ // MANIFEST.MF is always treated as signed and verified, // move its signers from sigFileSigners to verifiedSigners. if (sigFileSigners.containsKey(JarFile.MANIFEST_NAME)) { - verifiedSigners.put(JarFile.MANIFEST_NAME, - sigFileSigners.remove(JarFile.MANIFEST_NAME)); + CodeSigner[] codeSigners = sigFileSigners.remove(JarFile.MANIFEST_NAME); + verifiedSigners.put(JarFile.MANIFEST_NAME, codeSigners); } } @@ -493,10 +491,10 @@ // Extended JavaUtilJarAccess CodeSource API Support - private Map urlToCodeSourceMap = new HashMap(); - private Map signerToCodeSource = new HashMap(); + private Map<URL, Map<CodeSigner[], CodeSource>> urlToCodeSourceMap = new HashMap<>(); + private Map<CodeSigner[], CodeSource> signerToCodeSource = new HashMap<>(); private URL lastURL; - private Map lastURLMap; + private Map<CodeSigner[], CodeSource> lastURLMap; /* * Create a unique mapping from codeSigner cache entries to CodeSource. @@ -504,19 +502,19 @@ * and shared JAR file although in practice there will be a single URL in use. */ private synchronized CodeSource mapSignersToCodeSource(URL url, CodeSigner[] signers) { - Map map; + Map<CodeSigner[], CodeSource> map; if (url == lastURL) { map = lastURLMap; } else { - map = (Map) urlToCodeSourceMap.get(url); + map = urlToCodeSourceMap.get(url); if (map == null) { - map = new HashMap(); + map = new HashMap<>(); urlToCodeSourceMap.put(url, map); } lastURLMap = map; lastURL = url; } - CodeSource cs = (CodeSource) map.get(signers); + CodeSource cs = map.get(signers); if (cs == null) { cs = new VerifierCodeSource(csdomain, url, signers); signerToCodeSource.put(signers, cs); @@ -524,16 +522,16 @@ return cs; } - private CodeSource[] mapSignersToCodeSources(URL url, List signers, boolean unsigned) { - List sources = new ArrayList(); + private CodeSource[] mapSignersToCodeSources(URL url, List<CodeSigner[]> signers, boolean unsigned) { + List<CodeSource> sources = new ArrayList<>(); for (int i = 0; i < signers.size(); i++) { - sources.add(mapSignersToCodeSource(url, (CodeSigner[]) signers.get(i))); + sources.add(mapSignersToCodeSource(url, signers.get(i))); } if (unsigned) { sources.add(mapSignersToCodeSource(url, null)); } - return (CodeSource[]) sources.toArray(new CodeSource[sources.size()]); + return sources.toArray(new CodeSource[sources.size()]); } private CodeSigner[] emptySigner = new CodeSigner[0]; @@ -553,7 +551,7 @@ * but this handles a CodeSource of any type, just in case. */ CodeSource[] sources = mapSignersToCodeSources(cs.getLocation(), getJarCodeSigners(), true); - List sourceList = new ArrayList(); + List<CodeSource> sourceList = new ArrayList<>(); for (int i = 0; i < sources.length; i++) { sourceList.add(sources[i]); } @@ -574,6 +572,7 @@ * signing data that can be compared by object reference identity. */ private static class VerifierCodeSource extends CodeSource { + private static final long serialVersionUID = -9047366145967768825L; URL vlocation; CodeSigner[] vsigners; @@ -641,16 +640,16 @@ return vcerts; } } - private Map signerMap; + private Map<String, CodeSigner[]> signerMap; - private synchronized Map signerMap() { + private synchronized Map<String, CodeSigner[]> signerMap() { if (signerMap == null) { /* * Snapshot signer state so it doesn't change on us. We care * only about the asserted signatures. Verification of * signature validity happens via the JarEntry apis. */ - signerMap = new HashMap(verifiedSigners.size() + sigFileSigners.size()); + signerMap = new HashMap<>(verifiedSigners.size() + sigFileSigners.size()); signerMap.putAll(verifiedSigners); signerMap.putAll(sigFileSigners); } @@ -658,15 +657,15 @@ } public synchronized Enumeration<String> entryNames(JarFile jar, final CodeSource[] cs) { - final Map map = signerMap(); - final Iterator itor = map.entrySet().iterator(); + final Map<String, CodeSigner[]> map = signerMap(); + final Iterator<Map.Entry<String, CodeSigner[]>> itor = map.entrySet().iterator(); boolean matchUnsigned = false; /* * Grab a single copy of the CodeSigner arrays. Check * to see if we can optimize CodeSigner equality test. */ - List req = new ArrayList(cs.length); + List<CodeSigner[]> req = new ArrayList<>(cs.length); for (int i = 0; i < cs.length; i++) { CodeSigner[] match = findMatchingSigners(cs[i]); if (match != null) { @@ -678,8 +677,8 @@ } } - final List signersReq = req; - final Enumeration enum2 = (matchUnsigned) ? unsignedEntryNames(jar) : emptyEnumeration; + final List<CodeSigner[]> signersReq = req; + final Enumeration<String> enum2 = (matchUnsigned) ? unsignedEntryNames(jar) : emptyEnumeration; return new Enumeration<String>() { @@ -691,14 +690,14 @@ } while (itor.hasNext()) { - Map.Entry e = (Map.Entry) itor.next(); - if (signersReq.contains((CodeSigner[]) e.getValue())) { - name = (String) e.getKey(); + Map.Entry<String, CodeSigner[]> e = itor.next(); + if (signersReq.contains(e.getValue())) { + name = e.getKey(); return true; } } while (enum2.hasMoreElements()) { - name = (String) enum2.nextElement(); + name = enum2.nextElement(); return true; } return false; @@ -719,13 +718,13 @@ * Like entries() but screens out internal JAR mechanism entries * and includes signed entries with no ZIP data. */ - public Enumeration<JarEntry> entries2(final JarFile jar, Enumeration e) { - final Map map = new HashMap(); + public Enumeration<JarEntry> entries2(final JarFile jar, Enumeration<? extends ZipEntry> e) { + final Map<String, CodeSigner[]> map = new HashMap<>(); map.putAll(signerMap()); - final Enumeration enum_ = e; + final Enumeration<? extends ZipEntry> enum_ = e; return new Enumeration<JarEntry>() { - Enumeration signers = null; + Enumeration<String> signers = null; JarEntry entry; public boolean hasMoreElements() { @@ -733,7 +732,7 @@ return true; } while (enum_.hasMoreElements()) { - ZipEntry ze = (ZipEntry) enum_.nextElement(); + ZipEntry ze = enum_.nextElement(); if (JarVerifier.isSigningRelated(ze.getName())) { continue; } @@ -744,7 +743,7 @@ signers = Collections.enumeration(map.keySet()); } while (signers.hasMoreElements()) { - String name = (String) signers.nextElement(); + String name = signers.nextElement(); entry = jar.newEntry(new ZipEntry(name)); return true; } @@ -764,7 +763,7 @@ } }; } - private Enumeration emptyEnumeration = new Enumeration<String>() { + private Enumeration<String> emptyEnumeration = new Enumeration<String>() { public boolean hasMoreElements() { return false; @@ -797,8 +796,8 @@ } private Enumeration<String> unsignedEntryNames(JarFile jar) { - final Map map = signerMap(); - final Enumeration entries = jar.entries(); + final Map<String, CodeSigner[]> map = signerMap(); + final Enumeration<JarEntry> entries = jar.entries(); return new Enumeration<String>() { String name; @@ -813,7 +812,7 @@ } while (entries.hasMoreElements()) { String value; - ZipEntry e = (ZipEntry) entries.nextElement(); + ZipEntry e = entries.nextElement(); value = e.getName(); if (e.isDirectory() || isSigningRelated(value)) { continue; @@ -836,14 +835,14 @@ } }; } - private List jarCodeSigners; + private List<CodeSigner[]> jarCodeSigners; - private synchronized List getJarCodeSigners() { + private synchronized List<CodeSigner[]> getJarCodeSigners() { CodeSigner[] signers; if (jarCodeSigners == null) { - HashSet set = new HashSet(); + HashSet<CodeSigner[]> set = new HashSet<>(); set.addAll(signerMap().values()); - jarCodeSigners = new ArrayList(); + jarCodeSigners = new ArrayList<>(); jarCodeSigners.addAll(set); } return jarCodeSigners; @@ -858,7 +857,7 @@ public CodeSource getCodeSource(URL url, String name) { CodeSigner[] signers; - signers = (CodeSigner[]) signerMap().get(name); + signers = signerMap().get(name); return mapSignersToCodeSource(url, signers); }
--- a/src/share/classes/java/util/jar/Manifest.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/util/jar/Manifest.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -339,7 +339,7 @@ return -1; } } - return buf[pos++] & 0xff; + return Byte.toUnsignedInt(buf[pos++]); } public int read(byte[] b, int off, int len) throws IOException {
--- a/src/share/classes/java/util/zip/InflaterInputStream.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/util/zip/InflaterInputStream.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -119,7 +119,7 @@ */ public int read() throws IOException { ensureOpen(); - return read(singleByteBuf, 0, 1) == -1 ? -1 : singleByteBuf[0] & 0xff; + return read(singleByteBuf, 0, 1) == -1 ? -1 : Byte.toUnsignedInt(singleByteBuf[0]); } /**
--- a/src/share/classes/java/util/zip/ZipInputStream.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/java/util/zip/ZipInputStream.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -435,7 +435,7 @@ * The bytes are assumed to be in Intel (little-endian) byte order. */ private static final int get16(byte b[], int off) { - return (b[off] & 0xff) | ((b[off+1] & 0xff) << 8); + return Byte.toUnsignedInt(b[off]) | (Byte.toUnsignedInt(b[off+1]) << 8); } /*
--- a/src/share/classes/javax/crypto/CipherSpi.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/crypto/CipherSpi.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -775,7 +775,7 @@ int outOfs = output.arrayOffset() + outPos; byte[] inArray = new byte[getTempArraySize(inLen)]; int total = 0; - while (inLen > 0) { + do { int chunk = Math.min(inLen, inArray.length); input.get(inArray, 0, chunk); int n; @@ -787,7 +787,7 @@ total += n; outOfs += n; inLen -= chunk; - } + } while (inLen > 0); output.position(outPos + total); return total; } else { // output is not backed by an accessible byte[] @@ -804,7 +804,7 @@ int outSize = outArray.length; int total = 0; boolean resized = false; - while (inLen > 0) { + do { int chunk = Math.min(inLen, outSize); if ((a1 == false) && (resized == false)) { input.get(inArray, 0, chunk); @@ -834,7 +834,7 @@ int newOut = engineGetOutputSize(chunk); outArray = new byte[newOut]; } - } + } while (inLen > 0); input.position(inLimit); return total; }
--- a/src/share/classes/javax/net/ssl/ExtendedSSLSession.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/net/ssl/ExtendedSSLSession.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ * The signature algorithm name must be a standard Java Security * name (such as "SHA1withRSA", "SHA256withECDSA", and so on). * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> + * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> * Java Cryptography Architecture API Specification & Reference </a> * for information about standard algorithm names. * <p> @@ -71,7 +71,7 @@ * The signature algorithm name must be a standard Java Security * name (such as "SHA1withRSA", "SHA256withECDSA", and so on). * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> + * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> * Java Cryptography Architecture API Specification & Reference </a> * for information about standard algorithm names. *
--- a/src/share/classes/javax/net/ssl/SSLParameters.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/net/ssl/SSLParameters.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -242,7 +242,7 @@ * * @param algorithm The standard string name of the endpoint * identification algorithm (or null). See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> + * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> * Java Cryptography Architecture API Specification & Reference </a> * for information about standard algorithm names. *
--- a/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java Sat Feb 18 16:11:47 2012 -0800 @@ -180,8 +180,7 @@ if (severity == null) { throw new NullPointerException("severity is null"); } - return super.put((PrinterStateReason) reason, - (Severity) severity); + return super.put(reason, severity); } /**
--- a/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java Sat Feb 18 16:11:47 2012 -0800 @@ -141,7 +141,7 @@ * Returns the string table for class ReferenceUriSchemesSupported. */ protected String[] getStringTable() { - return (String[])myStringTable.clone(); + return myStringTable.clone(); } /**
--- a/src/share/classes/javax/security/auth/x500/X500Principal.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/security/auth/x500/X500Principal.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -107,10 +107,17 @@ * defined in RFC 1779 and RFC 2253 * (and listed in {@link #getName(String format) getName(String format)}), * as well as the T, DNQ or DNQUALIFIER, SURNAME, GIVENNAME, INITIALS, - * GENERATION, EMAILADDRESS, and SERIALNUMBER keywords whose OIDs are - * defined in RFC 3280 and its successor. + * GENERATION, EMAILADDRESS, and SERIALNUMBER keywords whose Object + * Identifiers (OIDs) are defined in RFC 3280 and its successor. * Any other attribute type must be specified as an OID. * + * <p>This implementation enforces a more restrictive OID syntax than + * defined in RFC 1779 and 2253. It uses the more correct syntax defined in + * <a href="http://www.ietf.org/rfc/rfc4512.txt">RFC 4512</a>, which + * specifies that OIDs contain at least 2 digits: + * + * <p>{@code numericoid = number 1*( DOT number ) } + * * @param name an X.500 distinguished name in RFC 1779 or RFC 2253 format * @exception NullPointerException if the <code>name</code> * is <code>null</code> @@ -135,10 +142,17 @@ * keywords recognized by <code>X500Principal(String)</code>. Keywords * MUST be specified in all upper-case, otherwise they will be ignored. * Improperly specified keywords are ignored; however if a keyword in the - * name maps to an improperly specified OID, an + * name maps to an improperly specified Object Identifier (OID), an * <code>IllegalArgumentException</code> is thrown. It is permissible to * have 2 different keywords that map to the same OID. * + * <p>This implementation enforces a more restrictive OID syntax than + * defined in RFC 1779 and 2253. It uses the more correct syntax defined in + * <a href="http://www.ietf.org/rfc/rfc4512.txt">RFC 4512</a>, which + * specifies that OIDs contain at least 2 digits: + * + * <p>{@code numericoid = number 1*( DOT number ) } + * * @param name an X.500 distinguished name in RFC 1779 or RFC 2253 format * @param keywordMap an attribute type keyword map, where each key is a * keyword String that maps to a corresponding object identifier in String
--- a/src/share/classes/javax/security/auth/x500/package.html Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/security/auth/x500/package.html Sat Feb 18 16:11:47 2012 -0800 @@ -2,7 +2,7 @@ <html> <head> <!-- -Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it @@ -30,17 +30,26 @@ <body bgcolor="white"> This package contains the classes that should be used to store - X500 Principal and X500 Private Crendentials in a + X500 Principal and X500 Private Credentials in a <i>Subject</i>. -<!-- <h2>Package Specification</h2> -##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT ##### <ul> - <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a> + <li><a href="http://www.ietf.org/rfc/rfc1779.txt"> + RFC 1779: A String Representation of Distinguished Names</a></li> + <li><a href="http://www.ietf.org/rfc/rfc2253.txt"> + RFC 2253: Lightweight Directory Access Protocol (v3): + UTF-8 String Representation of Distinguished Names</a></li> + <li><a href="http://www.ietf.org/rfc/rfc3280.txt"> + RFC 3280: Internet X.509 Public Key Infrastructure + Certificate and Certificate Revocation List (CRL) Profile</a></li> + <li><a href="http://www.ietf.org/rfc/rfc4512.txt"> + RFC 4512: Lightweight Directory Access Protocol (LDAP): + Directory Information Models</a></li> </ul> +<!-- <h2>Related Documentation</h2> For overviews, tutorials, examples, guides, and tool documentation, please see:
--- a/src/share/classes/javax/swing/JOptionPane.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/swing/JOptionPane.java Sat Feb 18 16:11:47 2012 -0800 @@ -34,7 +34,6 @@ import java.awt.Frame; import java.awt.Point; import java.awt.HeadlessException; -import java.awt.Toolkit; import java.awt.Window; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -994,8 +993,7 @@ // if the user closed the window without selecting a button // (newValue = null in that case). Otherwise, close the dialog. if (dialog.isVisible() && event.getSource() == JOptionPane.this && - (event.getPropertyName().equals(VALUE_PROPERTY) || - event.getPropertyName().equals(INPUT_VALUE_PROPERTY)) && + (event.getPropertyName().equals(VALUE_PROPERTY)) && event.getNewValue() != null && event.getNewValue() != JOptionPane.UNINITIALIZED_VALUE) { dialog.setVisible(false);
--- a/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java Sat Feb 18 16:11:47 2012 -0800 @@ -1236,6 +1236,7 @@ int index = list.locationToIndex(e.getPoint()); optionPane.setInputValue(list.getModel().getElementAt(index)); + optionPane.setValue(JOptionPane.OK_OPTION); } }
--- a/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java Sat Feb 18 16:11:47 2012 -0800 @@ -434,6 +434,8 @@ // Empty out the renderer pane, allowing renderers to be gc'ed. rendererPane.removeAll(); + + paintContext = null; } private void configureRenderer(SynthContext context) {
--- a/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java Sat Feb 18 16:11:47 2012 -0800 @@ -156,7 +156,7 @@ protected Color borderSelectionColor; private boolean isDropCell; - private boolean fillBackground = true; + private boolean fillBackground; /** * Set to true after the constructor has run.
--- a/src/share/classes/sun/awt/image/OffScreenImageSource.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/awt/image/OffScreenImageSource.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -185,6 +185,7 @@ theConsumer.setDimensions(image.getWidth(), image.getHeight()); theConsumer.setProperties(properties); sendPixels(); + theConsumer.imageComplete(ImageConsumer.SINGLEFRAMEDONE); theConsumer.imageComplete(ImageConsumer.STATICIMAGEDONE); } catch (NullPointerException e) { if (theConsumer != null) {
--- a/src/share/classes/sun/beans/infos/ComponentBeanInfo.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/beans/infos/ComponentBeanInfo.java Sat Feb 18 16:11:47 2012 -0800 @@ -32,7 +32,7 @@ */ public class ComponentBeanInfo extends SimpleBeanInfo { - private static final Class beanClass = java.awt.Component.class; + private static final Class<java.awt.Component> beanClass = java.awt.Component.class; public PropertyDescriptor[] getPropertyDescriptors() { try {
--- a/src/share/classes/sun/font/FileFont.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/font/FileFont.java Sat Feb 18 16:11:47 2012 -0800 @@ -163,7 +163,9 @@ } } } - scaler.dispose(); + if (scaler != null) { + scaler.dispose(); + } scaler = FontScaler.getNullScaler(); }
--- a/src/share/classes/sun/font/StandardGlyphVector.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/font/StandardGlyphVector.java Sat Feb 18 16:11:47 2012 -0800 @@ -1740,8 +1740,9 @@ tx, sgv.font.getStyle(), aa, fm); - - FontStrike strike = sgv.font2D.getStrike(desc); // !!! getStrike(desc, false) + // Get the strike via the handle. Shouldn't matter + // if we've invalidated the font but its an extra precaution. + FontStrike strike = sgv.font2D.handle.font2D.getStrike(desc); // !!! getStrike(desc, false) return new GlyphStrike(sgv, strike, dx, dy); }
--- a/src/share/classes/sun/font/SunFontManager.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/font/SunFontManager.java Sat Feb 18 16:11:47 2012 -0800 @@ -2619,6 +2619,9 @@ physicalFonts.remove(oldFont.fullName); fullNameToFont.remove(oldFont.fullName.toLowerCase(Locale.ENGLISH)); FontFamily.remove(oldFont); + if (oldFont instanceof FileFont) { + ((FileFont)oldFont).deregisterFontAndClearStrikeCache(); + } if (localeFullNamesToFont != null) { Map.Entry[] mapEntries =
--- a/src/share/classes/sun/font/TrueTypeFont.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/font/TrueTypeFont.java Sat Feb 18 16:11:47 2012 -0800 @@ -1037,6 +1037,9 @@ if (head_Table != null && head_Table.capacity() >= 18) { ShortBuffer sb = head_Table.asShortBuffer(); upem = sb.get(9) & 0xffff; + if (upem < 16 || upem > 16384) { + upem = 2048; + } } ByteBuffer os2_Table = getTableBuffer(os_2Tag);
--- a/src/share/classes/sun/management/HotSpotDiagnostic.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/management/HotSpotDiagnostic.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,13 +27,9 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import javax.management.ObjectName; -import com.sun.management.DiagnosticCommandInfo; -import com.sun.management.DiagnosticCommandArgumentInfo; import com.sun.management.HotSpotDiagnosticMXBean; import com.sun.management.VMOption; @@ -120,54 +116,7 @@ } } - public List<String> getDiagnosticCommands() { - String[] commands = getDiagnosticCommands0(); - return commands == null ? Collections.<String>emptyList() : - Arrays.asList(commands); - } - - public DiagnosticCommandInfo getDiagnosticCommandInfo(String command) { - String[] array = new String[] { command }; - return getDiagnosticCommandInfo0(array)[0]; - } - - public List<DiagnosticCommandInfo> getDiagnosticCommandInfo() { - String[] commands = getDiagnosticCommands0(); - return Arrays.asList(getDiagnosticCommandInfo0(commands)); - } - - public List<DiagnosticCommandInfo> getDiagnosticCommandInfo( - List<String> commands) { - return Arrays.asList(getDiagnosticCommandInfo0( - commands.toArray(new String[commands.size()]))); - } - - public String execute(String command) { - Util.checkControlAccess(); - return executeDiagnosticCommand0(command); - } - - public String execute(String cmd, String... arguments) { - if(cmd == null) { - throw new NullPointerException("Missing command name"); - } - StringBuilder sb = new StringBuilder(); - sb.append(cmd); - sb.append(" "); - for(String arg : arguments) { - sb.append(arg); - sb.append(" "); - } - return execute(sb.toString()); - } - public ObjectName getObjectName() { return Util.newObjectName("com.sun.management:type=HotSpotDiagnostic"); } - - private native String[] getDiagnosticCommands0(); - private native DiagnosticCommandInfo[] getDiagnosticCommandInfo0( - String[] commands) throws IllegalArgumentException; - private native String executeDiagnosticCommand0(String command) - throws IllegalArgumentException; }
--- a/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Sat Feb 18 16:11:47 2012 -0800 @@ -270,7 +270,7 @@ protected Proxy instProxy; private CookieHandler cookieHandler; - private ResponseCache cacheHandler; + private final ResponseCache cacheHandler; // the cached response, and cached response headers and body protected CacheResponse cachedResponse; @@ -1579,7 +1579,7 @@ if (respCode == 200 || respCode == 203 || respCode == 206 || respCode == 300 || respCode == 301 || respCode == 410) { - if (cacheHandler != null) { + if (cacheHandler != null && getUseCaches()) { // give cache a chance to save response in cache URI uri = ParseUtil.toURI(url); if (uri != null) {
--- a/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java Sat Feb 18 16:11:47 2012 -0800 @@ -35,15 +35,15 @@ * @since 1.4 */ -abstract class AbstractPollArrayWrapper { +public abstract class AbstractPollArrayWrapper { // Event masks - static final short POLLIN = 0x0001; - static final short POLLOUT = 0x0004; - static final short POLLERR = 0x0008; - static final short POLLHUP = 0x0010; - static final short POLLNVAL = 0x0020; - static final short POLLREMOVE = 0x0800; + public static final short POLLIN = 0x0001; + public static final short POLLOUT = 0x0004; + public static final short POLLERR = 0x0008; + public static final short POLLHUP = 0x0010; + public static final short POLLNVAL = 0x0020; + public static final short POLLREMOVE = 0x0800; // Miscellaneous constants static final short SIZE_POLLFD = 8;
--- a/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -67,7 +67,7 @@ this.channelOffset = offset; } - void putEventOps(SelectionKeyImpl sk, int ops) { + public void putEventOps(SelectionKeyImpl sk, int ops) { synchronized (closeLock) { if (closed) throw new ClosedSelectorException();
--- a/src/share/classes/sun/nio/ch/IOStatus.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/IOStatus.java Sat Feb 18 16:11:47 2012 -0800 @@ -28,16 +28,16 @@ // Constants for reporting I/O status -final class IOStatus { +public final class IOStatus { private IOStatus() { } - static final int EOF = -1; // End of file - static final int UNAVAILABLE = -2; // Nothing available (non-blocking) - static final int INTERRUPTED = -3; // System call interrupted - static final int UNSUPPORTED = -4; // Operation not supported - static final int THROWN = -5; // Exception thrown in JNI code - static final int UNSUPPORTED_CASE = -6; // This case not supported + public static final int EOF = -1; // End of file + public static final int UNAVAILABLE = -2; // Nothing available (non-blocking) + public static final int INTERRUPTED = -3; // System call interrupted + public static final int UNSUPPORTED = -4; // Operation not supported + public static final int THROWN = -5; // Exception thrown in JNI code + public static final int UNSUPPORTED_CASE = -6; // This case not supported // The following two methods are for use in try/finally blocks where a // status value needs to be normalized before being returned to the invoker @@ -55,28 +55,28 @@ // } // - static int normalize(int n) { + public static int normalize(int n) { if (n == UNAVAILABLE) return 0; return n; } - static boolean check(int n) { + public static boolean check(int n) { return (n >= UNAVAILABLE); } - static long normalize(long n) { + public static long normalize(long n) { if (n == UNAVAILABLE) return 0; return n; } - static boolean check(long n) { + public static boolean check(long n) { return (n >= UNAVAILABLE); } // Return true iff n is not one of the IOStatus values - static boolean checkAll(long n) { + public static boolean checkAll(long n) { return ((n > EOF) || (n < UNSUPPORTED_CASE)); }
--- a/src/share/classes/sun/nio/ch/IOUtil.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/IOUtil.java Sat Feb 18 16:11:47 2012 -0800 @@ -34,7 +34,7 @@ * File-descriptor based I/O utilities that are shared by NIO classes. */ -class IOUtil { +public class IOUtil { private IOUtil() { } // No instantiation @@ -309,7 +309,7 @@ } } - static FileDescriptor newFD(int i) { + public static FileDescriptor newFD(int i) { FileDescriptor fd = new FileDescriptor(); setfdVal(fd, i); return fd; @@ -326,10 +326,11 @@ static native boolean drain(int fd) throws IOException; - static native void configureBlocking(FileDescriptor fd, boolean blocking) + public static native void configureBlocking(FileDescriptor fd, + boolean blocking) throws IOException; - static native int fdVal(FileDescriptor fd); + public static native int fdVal(FileDescriptor fd); static native void setfdVal(FileDescriptor fd, int value);
--- a/src/share/classes/sun/nio/ch/Net.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/Net.java Sat Feb 18 16:11:47 2012 -0800 @@ -33,7 +33,7 @@ import java.security.PrivilegedAction; -class Net { // package-private +public class Net { private Net() { } @@ -75,7 +75,7 @@ return canJoin6WithIPv4Group0(); } - static InetSocketAddress checkAddress(SocketAddress sa) { + public static InetSocketAddress checkAddress(SocketAddress sa) { if (sa == null) throw new NullPointerException(); if (!(sa instanceof InetSocketAddress)) @@ -330,7 +330,7 @@ // Due to oddities SO_REUSEADDR on windows reuse is ignored private static native int socket0(boolean preferIPv6, boolean stream, boolean reuse); - static void bind(FileDescriptor fd, InetAddress addr, int port) + public static void bind(FileDescriptor fd, InetAddress addr, int port) throws IOException { bind(UNSPEC, fd, addr, port); @@ -383,7 +383,7 @@ private static native InetAddress localInetAddress(FileDescriptor fd) throws IOException; - static InetSocketAddress localAddress(FileDescriptor fd) + public static InetSocketAddress localAddress(FileDescriptor fd) throws IOException { return new InetSocketAddress(localInetAddress(fd), localPort(fd));
--- a/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,170 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.SocketAddress; -import com.sun.nio.sctp.MessageInfo; -import com.sun.nio.sctp.Association; - -/** - * An implementation of a MessageInfo. - */ -public class SctpMessageInfoImpl extends MessageInfo { - private final SocketAddress address; - private final int bytes; /* 0 */ - - private Association association; - private int assocId; - private int streamNumber; - private boolean complete = true; - private boolean unordered; /* false */ - private long timeToLive; /* 0L */ - private int ppid; /* 0 */ - - public SctpMessageInfoImpl(Association association, - SocketAddress address, - int streamNumber) { - this.association = association; - this.address = address; - this.streamNumber = streamNumber; - bytes = 0; - } - - /* Invoked from native */ - private SctpMessageInfoImpl(int assocId, - SocketAddress address, - int bytes, - int streamNumber, - boolean complete, - boolean unordered, - int ppid) { - this.assocId = assocId; - this.address = address; - this.bytes = bytes; - this.streamNumber = streamNumber; - this.complete = complete; - this.unordered = unordered; - this.ppid = ppid; - } - - @Override - public Association association() { - return association; - } - - /** - * SctpMessageInfoImpl instances created from native will need to have their - * association set from the channel. - */ - void setAssociation(Association association) { - this.association = association; - } - - int associationID() { - return assocId; - } - - @Override - public SocketAddress address() { - return address; - } - - @Override - public int bytes() { - return bytes; - } - - @Override - public int streamNumber() { - return streamNumber; - } - - @Override - public MessageInfo streamNumber(int streamNumber) { - if (streamNumber < 0 || streamNumber > 65536) - throw new IllegalArgumentException("Invalid stream number"); - - this.streamNumber = streamNumber; - return this; - } - - @Override - public int payloadProtocolID() { - return ppid; - } - - @Override - public MessageInfo payloadProtocolID(int ppid) { - this.ppid = ppid; - return this; - } - - @Override - public boolean isComplete() { - return complete; - } - - @Override - public MessageInfo complete(boolean complete) { - this.complete = complete; - return this; - } - - @Override - public boolean isUnordered() { - return unordered; - } - - @Override - public MessageInfo unordered(boolean unordered) { - this.unordered = unordered; - return this; - } - - @Override - public long timeToLive() { - return timeToLive; - } - - @Override - public MessageInfo timeToLive(long millis) { - timeToLive = millis; - return this; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(super.toString()); - sb.append( "[Address: ").append(address) - .append(", Association: ").append(association) - .append(", Assoc ID: ").append(assocId) - .append(", Bytes: ").append(bytes) - .append(", Stream Number: ").append(streamNumber) - .append(", Complete: ").append(complete) - .append(", isUnordered: ").append(unordered) - .append("]"); - return sb.toString(); - } -}
--- a/src/share/classes/sun/nio/ch/SctpStdSocketOption.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import com.sun.nio.sctp.SctpSocketOption; - -public class SctpStdSocketOption<T> - implements SctpSocketOption<T> -{ - /* for native mapping of int options */ - public static final int SCTP_DISABLE_FRAGMENTS = 1; - public static final int SCTP_EXPLICIT_COMPLETE = 2; - public static final int SCTP_FRAGMENT_INTERLEAVE = 3; - public static final int SCTP_NODELAY = 4; - public static final int SO_SNDBUF = 5; - public static final int SO_RCVBUF = 6; - public static final int SO_LINGER = 7; - - private final String name; - private final Class<T> type; - - /* for native mapping of int options */ - private int constValue; - - public SctpStdSocketOption(String name, Class<T> type) { - this.name = name; - this.type = type; - } - - public SctpStdSocketOption(String name, Class<T> type, int constValue) { - this.name = name; - this.type = type; - this.constValue = constValue; - } - - @Override - public String name() { - return name; - } - - @Override - public Class<T> type() { - return type; - } - - @Override - public String toString() { - return name; - } - - int constValue() { - return constValue; - } -}
--- a/src/share/classes/sun/nio/ch/SelChImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/SelChImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -36,7 +36,7 @@ * @since 1.4 */ -interface SelChImpl extends Channel { +public interface SelChImpl extends Channel { FileDescriptor getFD();
--- a/src/share/classes/sun/nio/ch/SelectionKeyImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/SelectionKeyImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -34,12 +34,12 @@ * An implementation of SelectionKey for Solaris. */ -class SelectionKeyImpl +public class SelectionKeyImpl extends AbstractSelectionKey { final SelChImpl channel; // package-private - final SelectorImpl selector; // package-private + public final SelectorImpl selector; // Index for a pollfd array in Selector that this key is registered with private int index; @@ -91,15 +91,15 @@ // The nio versions of these operations do not care if a key // has been invalidated. They are for internal use by nio code. - void nioReadyOps(int ops) { // package-private + public void nioReadyOps(int ops) { readyOps = ops; } - int nioReadyOps() { // package-private + public int nioReadyOps() { return readyOps; } - SelectionKey nioInterestOps(int ops) { // package-private + public SelectionKey nioInterestOps(int ops) { if ((ops & ~channel().validOps()) != 0) throw new IllegalArgumentException(); channel.translateAndSetInterestOps(ops, this); @@ -107,7 +107,7 @@ return this; } - int nioInterestOps() { // package-private + public int nioInterestOps() { return interestOps; }
--- a/src/share/classes/sun/nio/ch/SelectorImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/SelectorImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -36,7 +36,7 @@ * Base Selector implementation class. */ -abstract class SelectorImpl +public abstract class SelectorImpl extends AbstractSelector { @@ -118,7 +118,7 @@ protected abstract void implClose() throws IOException; - void putEventOps(SelectionKeyImpl sk, int ops) { } + public void putEventOps(SelectionKeyImpl sk, int ops) { } protected final SelectionKey register(AbstractSelectableChannel ch, int ops,
--- a/src/share/classes/sun/nio/ch/Util.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/nio/ch/Util.java Sat Feb 18 16:11:47 2012 -0800 @@ -40,7 +40,7 @@ import sun.security.action.GetPropertyAction; -class Util { +public class Util { // -- Caches -- @@ -158,7 +158,7 @@ /** * Returns a temporary buffer of at least the given size */ - static ByteBuffer getTemporaryDirectBuffer(int size) { + public static ByteBuffer getTemporaryDirectBuffer(int size) { BufferCache cache = bufferCache.get(); ByteBuffer buf = cache.get(size); if (buf != null) { @@ -178,7 +178,7 @@ /** * Releases a temporary buffer by returning to the cache or freeing it. */ - static void releaseTemporaryDirectBuffer(ByteBuffer buf) { + public static void releaseTemporaryDirectBuffer(ByteBuffer buf) { offerFirstTemporaryDirectBuffer(buf); } @@ -467,7 +467,7 @@ private static boolean loaded = false; - static void load() { + public static void load() { synchronized (Util.class) { if (loaded) return;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.SocketAddress; +import com.sun.nio.sctp.MessageInfo; +import com.sun.nio.sctp.Association; + +/** + * An implementation of a MessageInfo. + */ +public class MessageInfoImpl extends MessageInfo { + private final SocketAddress address; + private final int bytes; /* 0 */ + + private Association association; + private int assocId; + private int streamNumber; + private boolean complete = true; + private boolean unordered; /* false */ + private long timeToLive; /* 0L */ + private int ppid; /* 0 */ + + public MessageInfoImpl(Association association, + SocketAddress address, + int streamNumber) { + this.association = association; + this.address = address; + this.streamNumber = streamNumber; + bytes = 0; + } + + /* Invoked from native */ + private MessageInfoImpl(int assocId, + SocketAddress address, + int bytes, + int streamNumber, + boolean complete, + boolean unordered, + int ppid) { + this.assocId = assocId; + this.address = address; + this.bytes = bytes; + this.streamNumber = streamNumber; + this.complete = complete; + this.unordered = unordered; + this.ppid = ppid; + } + + @Override + public Association association() { + return association; + } + + /** + * MessageInfoImpl instances created from native will need to have their + * association set from the channel. + */ + void setAssociation(Association association) { + this.association = association; + } + + int associationID() { + return assocId; + } + + @Override + public SocketAddress address() { + return address; + } + + @Override + public int bytes() { + return bytes; + } + + @Override + public int streamNumber() { + return streamNumber; + } + + @Override + public MessageInfo streamNumber(int streamNumber) { + if (streamNumber < 0 || streamNumber > 65536) + throw new IllegalArgumentException("Invalid stream number"); + + this.streamNumber = streamNumber; + return this; + } + + @Override + public int payloadProtocolID() { + return ppid; + } + + @Override + public MessageInfo payloadProtocolID(int ppid) { + this.ppid = ppid; + return this; + } + + @Override + public boolean isComplete() { + return complete; + } + + @Override + public MessageInfo complete(boolean complete) { + this.complete = complete; + return this; + } + + @Override + public boolean isUnordered() { + return unordered; + } + + @Override + public MessageInfo unordered(boolean unordered) { + this.unordered = unordered; + return this; + } + + @Override + public long timeToLive() { + return timeToLive; + } + + @Override + public MessageInfo timeToLive(long millis) { + timeToLive = millis; + return this; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(super.toString()); + sb.append( "[Address: ").append(address) + .append(", Association: ").append(association) + .append(", Assoc ID: ").append(assocId) + .append(", Bytes: ").append(bytes) + .append(", Stream Number: ").append(streamNumber) + .append(", Complete: ").append(complete) + .append(", isUnordered: ").append(unordered) + .append("]"); + return sb.toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import com.sun.nio.sctp.SctpSocketOption; + +public class SctpStdSocketOption<T> + implements SctpSocketOption<T> +{ + /* for native mapping of int options */ + public static final int SCTP_DISABLE_FRAGMENTS = 1; + public static final int SCTP_EXPLICIT_COMPLETE = 2; + public static final int SCTP_FRAGMENT_INTERLEAVE = 3; + public static final int SCTP_NODELAY = 4; + public static final int SO_SNDBUF = 5; + public static final int SO_RCVBUF = 6; + public static final int SO_LINGER = 7; + + private final String name; + private final Class<T> type; + + /* for native mapping of int options */ + private int constValue; + + public SctpStdSocketOption(String name, Class<T> type) { + this.name = name; + this.type = type; + } + + public SctpStdSocketOption(String name, Class<T> type, int constValue) { + this.name = name; + this.type = type; + this.constValue = constValue; + } + + @Override + public String name() { + return name; + } + + @Override + public Class<T> type() { + return type; + } + + @Override + public String toString() { + return name; + } + + int constValue() { + return constValue; + } +}
--- a/src/share/classes/sun/security/pkcs/PKCS7.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/security/pkcs/PKCS7.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,16 +72,19 @@ /* * Random number generator for creating nonce values + * (Lazy initialization) */ - private static final SecureRandom RANDOM; - static { - SecureRandom tmp = null; - try { - tmp = SecureRandom.getInstance("SHA1PRNG"); - } catch (NoSuchAlgorithmException e) { - // should not happen + private static class SecureRandomHolder { + static final SecureRandom RANDOM; + static { + SecureRandom tmp = null; + try { + tmp = SecureRandom.getInstance("SHA1PRNG"); + } catch (NoSuchAlgorithmException e) { + // should not happen + } + RANDOM = tmp; } - RANDOM = tmp; } /* @@ -862,8 +865,8 @@ // Generate a nonce BigInteger nonce = null; - if (RANDOM != null) { - nonce = new BigInteger(64, RANDOM); + if (SecureRandomHolder.RANDOM != null) { + nonce = new BigInteger(64, SecureRandomHolder.RANDOM); tsQuery.setNonce(nonce); } tsQuery.requestCertificate(true);
--- a/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Sat Feb 18 16:11:47 2012 -0800 @@ -253,11 +253,25 @@ } try { - // Use JCE - SecretKey skey = getPBEKey(password); - Cipher cipher = Cipher.getInstance(algOid.toString()); - cipher.init(Cipher.DECRYPT_MODE, skey, algParams); - byte[] privateKeyInfo = cipher.doFinal(encryptedKey); + byte[] privateKeyInfo; + while (true) { + try { + // Use JCE + SecretKey skey = getPBEKey(password); + Cipher cipher = Cipher.getInstance(algOid.toString()); + cipher.init(Cipher.DECRYPT_MODE, skey, algParams); + privateKeyInfo = cipher.doFinal(encryptedKey); + break; + } catch (Exception e) { + if (password.length == 0) { + // Retry using an empty password + // without a NULL terminator. + password = new char[1]; + continue; + } + throw e; + } + } PKCS8EncodedKeySpec kspec = new PKCS8EncodedKeySpec(privateKeyInfo); @@ -1251,16 +1265,24 @@ ObjectIdentifier algOid = in.getOID(); AlgorithmParameters algParams = parseAlgParameters(in); - try { - // Use JCE - SecretKey skey = getPBEKey(password); - Cipher cipher = Cipher.getInstance(algOid.toString()); - cipher.init(Cipher.DECRYPT_MODE, skey, algParams); - safeContentsData = cipher.doFinal(safeContentsData); - - } catch (Exception e) { - throw new IOException("failed to decrypt safe" - + " contents entry: " + e, e); + while (true) { + try { + // Use JCE + SecretKey skey = getPBEKey(password); + Cipher cipher = Cipher.getInstance(algOid.toString()); + cipher.init(Cipher.DECRYPT_MODE, skey, algParams); + safeContentsData = cipher.doFinal(safeContentsData); + break; + } catch (Exception e) { + if (password.length == 0) { + // Retry using an empty password + // without a NULL terminator. + password = new char[1]; + continue; + } + throw new IOException( + "failed to decrypt safe contents entry: " + e, e); + } } } else { throw new IOException("public key protected PKCS12" +
--- a/src/share/classes/sun/tools/jar/CommandLine.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/tools/jar/CommandLine.java Sat Feb 18 16:11:47 2012 -0800 @@ -55,7 +55,7 @@ public static String[] parse(String[] args) throws IOException { - ArrayList newArgs = new ArrayList(args.length); + List<String> newArgs = new ArrayList<>(args.length); for (int i = 0; i < args.length; i++) { String arg = args[i]; if (arg.length() > 1 && arg.charAt(0) == '@') { @@ -69,10 +69,10 @@ newArgs.add(arg); } } - return (String[])newArgs.toArray(new String[newArgs.size()]); + return newArgs.toArray(new String[newArgs.size()]); } - private static void loadCmdFile(String name, List args) + private static void loadCmdFile(String name, List<String> args) throws IOException { Reader r = new BufferedReader(new FileReader(name)); @@ -83,7 +83,7 @@ st.commentChar('#'); st.quoteChar('"'); st.quoteChar('\''); - while (st.nextToken() != st.TT_EOF) { + while (st.nextToken() != StreamTokenizer.TT_EOF) { args.add(st.sval); } r.close();
--- a/src/share/classes/sun/tools/jar/Manifest.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/tools/jar/Manifest.java Sat Feb 18 16:11:47 2012 -0800 @@ -47,10 +47,10 @@ /* list of headers that all pertain to a particular * file in the archive */ - private Vector entries = new Vector(); + private Vector<MessageHeader> entries = new Vector<>(); private byte[] tmpbuf = new byte[512]; /* a hashtable of entries, for fast lookup */ - private Hashtable tableEntries = new Hashtable(); + private Hashtable<String, MessageHeader> tableEntries = new Hashtable<>(); static final String[] hashes = {"SHA"}; static final byte[] EOL = {(byte)'\r', (byte)'\n'}; @@ -115,14 +115,14 @@ } public MessageHeader getEntry(String name) { - return (MessageHeader) tableEntries.get(name); + return tableEntries.get(name); } public MessageHeader entryAt(int i) { - return (MessageHeader) entries.elementAt(i); + return entries.elementAt(i); } - public Enumeration entries() { + public Enumeration<MessageHeader> entries() { return entries.elements(); } @@ -214,7 +214,7 @@ /* the first header in the file should be the global one. * It should say "Manifest-Version: x.x"; if not add it */ - MessageHeader globals = (MessageHeader) entries.elementAt(0); + MessageHeader globals = entries.elementAt(0); if (globals.findValue("Manifest-Version") == null) { /* Assume this is a user-defined manifest. If it has a Name: <..> @@ -238,7 +238,7 @@ globals.print(ps); for (int i = 1; i < entries.size(); ++i) { - MessageHeader mh = (MessageHeader) entries.elementAt(i); + MessageHeader mh = entries.elementAt(i); mh.print(ps); } }
--- a/src/share/classes/sun/tools/jar/SignatureFile.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/classes/sun/tools/jar/SignatureFile.java Sat Feb 18 16:11:47 2012 -0800 @@ -47,7 +47,7 @@ * * <p>Each entry section contains the name of an entry (which must * have a counterpart in the manifest). Like the manifest it contains - * a hash, the hash of the manifest section correspondind to the + * a hash, the hash of the manifest section corresponding to the * name. Since the manifest entry contains the hash of the data, this * is equivalent to a signature of the data, plus the attributes of * the manifest entry. @@ -66,7 +66,7 @@ /* list of headers that all pertain to a particular file in the * archive */ - private Vector entries = new Vector(); + private Vector<MessageHeader> entries = new Vector<>(); /* Right now we only support SHA hashes */ static final String[] hashes = {"SHA"}; @@ -98,7 +98,7 @@ * character in length. */ private SignatureFile(String name) throws JarException { - entries = new Vector(); + entries = new Vector<>(); if (name != null) { if (name.length() > 8 || name.indexOf('.') != -1) { @@ -142,9 +142,9 @@ this(name, true); this.manifest = manifest; - Enumeration enum_ = manifest.entries(); + Enumeration<MessageHeader> enum_ = manifest.entries(); while (enum_.hasMoreElements()) { - MessageHeader mh = (MessageHeader)enum_.nextElement(); + MessageHeader mh = enum_.nextElement(); String entryName = mh.findValue("Name"); if (entryName != null) { add(entryName); @@ -269,9 +269,9 @@ *the entry does not exist. */ public MessageHeader getEntry(String name) { - Enumeration enum_ = entries(); + Enumeration<MessageHeader> enum_ = entries(); while(enum_.hasMoreElements()) { - MessageHeader mh = (MessageHeader)enum_.nextElement(); + MessageHeader mh = enum_.nextElement(); if (name.equals(mh.findValue("Name"))) { return mh; } @@ -282,13 +282,13 @@ /** * Returns the n-th entry. The global header is a entry 0. */ public MessageHeader entryAt(int n) { - return (MessageHeader) entries.elementAt(n); + return entries.elementAt(n); } /** * Returns an enumeration of the entries. */ - public Enumeration entries() { + public Enumeration<MessageHeader> entries() { return entries.elements(); } @@ -322,11 +322,11 @@ } } - private Hashtable digests = new Hashtable(); + private Hashtable<String, MessageDigest> digests = new Hashtable<>(); private MessageDigest getDigest(String algorithm) throws NoSuchAlgorithmException { - MessageDigest dig = (MessageDigest)digests.get(algorithm); + MessageDigest dig = digests.get(algorithm); if (dig == null) { dig = MessageDigest.getInstance(algorithm); digests.put(algorithm, dig); @@ -344,7 +344,7 @@ /* the first header in the file should be the global one. * It should say "SignatureFile-Version: x.x"; barf if not */ - MessageHeader globals = (MessageHeader) entries.elementAt(0); + MessageHeader globals = entries.elementAt(0); if (globals.findValue("Signature-Version") == null) { throw new JarException("Signature file requires " + "Signature-Version: 1.0 in 1st header"); @@ -354,7 +354,7 @@ globals.print(ps); for (int i = 1; i < entries.size(); ++i) { - MessageHeader mh = (MessageHeader) entries.elementAt(i); + MessageHeader mh = entries.elementAt(i); mh.print(ps); } }
--- a/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Sat Feb 18 16:11:47 2012 -0800 @@ -213,10 +213,10 @@ // Calculate remaining size float ssH = ascent + descent; - float remainingHeight = (float) (y2 - (ssH*2) - 0.5f); + float remainingHeight = y2 - (ssH*2) - 0.5f; float blockHeight = remainingHeight/10; float blockWidth = 20.0f; - float remainingWidth = (float) (x2 - blockWidth - 10); + float remainingWidth = x2 - blockWidth - 10; // .. Memory Free .. big.setColor(mfColor); @@ -224,7 +224,7 @@ int i = 0; for ( ; i < MemUsage ; i++) { mfRect.setRect(x1+5,(float) y1+ssH+i*blockHeight, - blockWidth,(float) blockHeight-1); + blockWidth, blockHeight-1); big.fill(mfRect); } @@ -232,13 +232,13 @@ big.setColor(Color.green); for ( ; i < 10; i++) { muRect.setRect(x1+5,(float) y1 + ssH+i*blockHeight, - blockWidth,(float) blockHeight-1); + blockWidth, blockHeight-1); big.fill(muRect); } // .. Draw History Graph .. if (remainingWidth <= 30) remainingWidth = (float)30; - if (remainingHeight <= ssH) remainingHeight = (float)ssH; + if (remainingHeight <= ssH) remainingHeight = ssH; big.setColor(graphColor); int graphX = x1+30; int graphY = y1 + (int) ssH; @@ -347,8 +347,8 @@ big = bimg.createGraphics(); big.setFont(font); FontMetrics fm = big.getFontMetrics(font); - ascent = (int) fm.getAscent(); - descent = (int) fm.getDescent(); + ascent = fm.getAscent(); + descent = fm.getDescent(); } repaint(); try {
--- a/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java Sat Feb 18 16:11:47 2012 -0800 @@ -185,11 +185,11 @@ */ /////////////////////////////////////////////////////// static final int CH(byte[] b, int n) { - return b[n] & 0xff; + return Byte.toUnsignedInt(b[n]); } static final int SH(byte[] b, int n) { - return (b[n] & 0xff) | ((b[n + 1] & 0xff) << 8); + return Byte.toUnsignedInt(b[n]) | (Byte.toUnsignedInt(b[n + 1]) << 8); } static final long LG(byte[] b, int n) {
--- a/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java Sat Feb 18 16:11:47 2012 -0800 @@ -61,7 +61,7 @@ private final ZipFileSystem zfs; ZipFileStore(ZipPath zpath) { - this.zfs = (ZipFileSystem)zpath.getFileSystem(); + this.zfs = zpath.getFileSystem(); } @Override
--- a/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java Sat Feb 18 16:11:47 2012 -0800 @@ -1609,7 +1609,7 @@ synchronized (inflaters) { int size = inflaters.size(); if (size > 0) { - Inflater inf = (Inflater)inflaters.remove(size - 1); + Inflater inf = inflaters.remove(size - 1); return inf; } else { return new Inflater(true); @@ -1638,7 +1638,7 @@ synchronized (deflaters) { int size = deflaters.size(); if (size > 0) { - Deflater def = (Deflater)deflaters.remove(size - 1); + Deflater def = deflaters.remove(size - 1); return def; } else { return new Deflater(Deflater.DEFAULT_COMPRESSION, true);
--- a/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java Sat Feb 18 16:11:47 2012 -0800 @@ -211,7 +211,7 @@ public <V extends FileAttributeView> V getFileAttributeView(Path path, Class<V> type, LinkOption... options) { - return (V)ZipFileAttributeView.get(toZipPath(path), type); + return ZipFileAttributeView.get(toZipPath(path), type); } @Override
--- a/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java Sat Feb 18 16:11:47 2012 -0800 @@ -78,12 +78,12 @@ // twice long len = LOCHDR + CENNAM(cen, pos) + CENEXT(cen, pos) + CENHDR; if (zfs.readFullyAt(buf, 0, len, locoff(cen, pos)) != len) - zfs.zerror("read loc header failed"); + ZipFileSystem.zerror("read loc header failed"); if (LOCEXT(buf) > CENEXT(cen, pos) + CENHDR) { // have to read the second time; len = LOCHDR + LOCNAM(buf) + LOCEXT(buf); if (zfs.readFullyAt(buf, 0, len, locoff(cen, pos)) != len) - zfs.zerror("read loc header failed"); + ZipFileSystem.zerror("read loc header failed"); } printLOC(buf); pos += CENHDR + CENNAM(cen, pos) + CENEXT(cen, pos) + CENCOM(cen, pos);
--- a/src/share/native/sun/management/HotSpotDiagnostic.c Thu Feb 16 13:01:36 2012 -0800 +++ b/src/share/native/sun/management/HotSpotDiagnostic.c Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,141 +34,3 @@ { jmm_interface->DumpHeap0(env, outputfile, live); } - -JNIEXPORT jobjectArray JNICALL -Java_sun_management_HotSpotDiagnostic_getDiagnosticCommands0 - (JNIEnv *env, jobject dummy) -{ - if ((jmm_version > JMM_VERSION_1_2_1) - || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=2))) { - return jmm_interface->GetDiagnosticCommands(env); - } - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - "Diagnostic commands are not supported by this VM"); -} - -jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command, - int num_arg) { - int i; - jobject obj; - jobjectArray result; - dcmdArgInfo* dcmd_arg_info_array; - jclass dcmdArgInfoCls; - jclass arraysCls; - jmethodID mid; - jobject resultList; - - dcmd_arg_info_array = (dcmdArgInfo*) malloc(num_arg * sizeof(dcmdArgInfo)); - if (dcmd_arg_info_array == NULL) { - return NULL; - } - jmm_interface->GetDiagnosticCommandArgumentsInfo(env, command, - dcmd_arg_info_array); - dcmdArgInfoCls = (*env)->FindClass(env, - "com/sun/management/DiagnosticCommandArgumentInfo"); - result = (*env)->NewObjectArray(env, num_arg, dcmdArgInfoCls, NULL); - if (result == NULL) { - free(dcmd_arg_info_array); - return NULL; - } - for (i=0; i<num_arg; i++) { - obj = JNU_NewObjectByName(env, - "com/sun/management/DiagnosticCommandArgumentInfo", - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZI)V", - (*env)->NewStringUTF(env,dcmd_arg_info_array[i].name), - (*env)->NewStringUTF(env,dcmd_arg_info_array[i].description), - (*env)->NewStringUTF(env,dcmd_arg_info_array[i].type), - dcmd_arg_info_array[i].default_string == NULL ? NULL: - (*env)->NewStringUTF(env, dcmd_arg_info_array[i].default_string), - dcmd_arg_info_array[i].mandatory, - dcmd_arg_info_array[i].option, - dcmd_arg_info_array[i].position); - if (obj == NULL) { - free(dcmd_arg_info_array); - return NULL; - } - (*env)->SetObjectArrayElement(env, result, i, obj); - } - free(dcmd_arg_info_array); - arraysCls = (*env)->FindClass(env, "java/util/Arrays"); - mid = (*env)->GetStaticMethodID(env, arraysCls, - "asList", "([Ljava/lang/Object;)Ljava/util/List;"); - resultList = (*env)->CallStaticObjectMethod(env, arraysCls, mid, result); - return resultList; -} - -/* Throws IllegalArgumentException if at least one the diagnostic command - * passed in argument is not supported by the JVM - */ -JNIEXPORT jobjectArray JNICALL -Java_sun_management_HotSpotDiagnostic_getDiagnosticCommandInfo0 -(JNIEnv *env, jobject dummy, jobjectArray commands) -{ - int i; - jclass dcmdInfoCls; - jobject result; - jobjectArray args; - jobject obj; - - if (commands == NULL) { - JNU_ThrowNullPointerException(env, "Invalid String Array"); - return NULL; - } - if ((jmm_version > JMM_VERSION_1_2_1) - || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=2))) { - jsize num_commands = (*env)->GetArrayLength(env, commands); - dcmdInfo* dcmd_info_array = (dcmdInfo*) malloc(num_commands * - sizeof(dcmdInfo)); - if (dcmd_info_array == NULL) { - JNU_ThrowOutOfMemoryError(env, NULL); - } - jmm_interface->GetDiagnosticCommandInfo(env, commands, dcmd_info_array); - dcmdInfoCls = (*env)->FindClass(env, - "com/sun/management/DiagnosticCommandInfo"); - result = (*env)->NewObjectArray(env, num_commands, dcmdInfoCls, NULL); - if (result == NULL) { - free(dcmd_info_array); - JNU_ThrowOutOfMemoryError(env, 0); - } - for (i=0; i<num_commands; i++) { - args = getDiagnosticCommandArgumentInfoArray(env, - (*env)->GetObjectArrayElement(env,commands,i), - dcmd_info_array[i].num_arguments); - if (args == NULL) { - free(dcmd_info_array); - JNU_ThrowOutOfMemoryError(env, 0); - } - obj = JNU_NewObjectByName(env, - "com/sun/management/DiagnosticCommandInfo", - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V", - (*env)->NewStringUTF(env,dcmd_info_array[i].name), - (*env)->NewStringUTF(env,dcmd_info_array[i].description), - (*env)->NewStringUTF(env,dcmd_info_array[i].impact), - dcmd_info_array[i].enabled, - args); - if (obj == NULL) { - free(dcmd_info_array); - JNU_ThrowOutOfMemoryError(env, 0); - } - (*env)->SetObjectArrayElement(env, result, i, obj); - } - free(dcmd_info_array); - return result; - } - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - "Diagnostic commands are not supported by this VM"); -} - -/* Throws IllegalArgumentException if the diagnostic command - * passed in argument is not supported by the JVM - */ -JNIEXPORT jstring JNICALL -Java_sun_management_HotSpotDiagnostic_executeDiagnosticCommand0 -(JNIEnv *env, jobject dummy, jstring command) { - if((jmm_version > JMM_VERSION_1_2_1 ) - || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=2))) { - return jmm_interface->ExecuteDiagnosticCommand(env, command); - } - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - "Diagnostic commands are not supported by this VM"); -}
--- a/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -180,7 +180,7 @@ ((SelChImpl)selch).kill(); } - void putEventOps(SelectionKeyImpl sk, int ops) { + public void putEventOps(SelectionKeyImpl sk, int ops) { if (closed) throw new ClosedSelectorException(); int fd = IOUtil.fdVal(sk.channel.getFD());
--- a/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -181,7 +181,7 @@ ((SelChImpl)selch).kill(); } - void putEventOps(SelectionKeyImpl sk, int ops) { + public void putEventOps(SelectionKeyImpl sk, int ops) { if (closed) throw new ClosedSelectorException(); pollWrapper.setInterest(sk.channel, ops);
--- a/src/solaris/classes/sun/nio/ch/NativeThread.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/solaris/classes/sun/nio/ch/NativeThread.java Sat Feb 18 16:11:47 2012 -0800 @@ -37,21 +37,21 @@ // always returns -1 and the signal(long) method has no effect. -class NativeThread { +public class NativeThread { // Returns an opaque token representing the native thread underlying the // invoking Java thread. On systems that do not require signalling, this // method always returns -1. // - static native long current(); + public static native long current(); // Signals the given native thread so as to release it from a blocking I/O // operation. On systems that do not require signalling, this method has // no effect. // - static native void signal(long nt); + public static native void signal(long nt); - static native void init(); + private static native void init(); static { Util.load();
--- a/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java Sat Feb 18 16:11:47 2012 -0800 @@ -41,9 +41,9 @@ * @since 1.4 */ -class PollArrayWrapper extends AbstractPollArrayWrapper { +public class PollArrayWrapper extends AbstractPollArrayWrapper { - static final short POLLCONN = POLLOUT; + public static final short POLLCONN = POLLOUT; // File descriptor to write for interrupt int interruptFD;
--- a/src/solaris/classes/sun/nio/ch/SctpAssocChange.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.AssociationChangeNotification; - -/** - * An implementation of AssociationChangeNotification - */ -public class SctpAssocChange extends AssociationChangeNotification - implements SctpNotification -{ - /* static final ints so that they can be referenced from native */ - private final static int SCTP_COMM_UP = 1; - private final static int SCTP_COMM_LOST = 2; - private final static int SCTP_RESTART = 3; - private final static int SCTP_SHUTDOWN = 4; - private final static int SCTP_CANT_START = 5; - - private Association association; - - /* assocId is used to lookup the association before the notification is - * returned to user code */ - private int assocId; - private AssocChangeEvent event; - private int maxOutStreams; - private int maxInStreams; - - /* Invoked from native */ - private SctpAssocChange(int assocId, - int intEvent, - int maxOutStreams, - int maxInStreams) { - switch (intEvent) { - case SCTP_COMM_UP : - this.event = AssocChangeEvent.COMM_UP; - break; - case SCTP_COMM_LOST : - this.event = AssocChangeEvent.COMM_LOST; - break; - case SCTP_RESTART : - this.event = AssocChangeEvent.RESTART; - break; - case SCTP_SHUTDOWN : - this.event = AssocChangeEvent.SHUTDOWN; - break; - case SCTP_CANT_START : - this.event = AssocChangeEvent.CANT_START; - break; - default : - throw new AssertionError( - "Unknown Association Change Event type: " + intEvent); - } - - this.assocId = assocId; - this.maxOutStreams = maxOutStreams; - this.maxInStreams = maxInStreams; - } - - @Override - public int assocId() { - return assocId; - } - - @Override - public void setAssociation(Association association) { - this.association = association; - } - - @Override - public Association association() { - assert association != null; - return association; - } - - @Override - public AssocChangeEvent event() { - return event; - } - - int maxOutStreams() { - return maxOutStreams; - } - - int maxInStreams() { - return maxInStreams; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(super.toString()).append(" ["); - sb.append("Association:").append(association); - sb.append(", Event: ").append(event).append("]"); - return sb.toString(); - } -}
--- a/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import com.sun.nio.sctp.Association; - -/** - * An implementation of Association - */ -public class SctpAssociationImpl extends Association { - public SctpAssociationImpl(int associationID, - int maxInStreams, - int maxOutStreams) { - super(associationID, maxInStreams, maxOutStreams); - } - - @Override - public String toString() { - StringBuffer sb = new StringBuffer(super.toString()); - return sb.append("[associationID:") - .append(associationID()) - .append(", maxIn:") - .append(maxInboundStreams()) - .append(", maxOut:") - .append(maxOutboundStreams()) - .append("]") - .toString(); - } -} -
--- a/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1097 +0,0 @@ -/* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.InetAddress; -import java.net.SocketAddress; -import java.net.SocketException; -import java.net.InetSocketAddress; -import java.io.FileDescriptor; -import java.io.IOException; -import java.util.Collections; -import java.util.Set; -import java.util.HashSet; -import java.nio.ByteBuffer; -import java.nio.channels.SelectionKey; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.ConnectionPendingException; -import java.nio.channels.NoConnectionPendingException; -import java.nio.channels.AlreadyConnectedException; -import java.nio.channels.NotYetBoundException; -import java.nio.channels.NotYetConnectedException; -import java.nio.channels.spi.SelectorProvider; -import com.sun.nio.sctp.AbstractNotificationHandler; -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.AssociationChangeNotification; -import com.sun.nio.sctp.HandlerResult; -import com.sun.nio.sctp.IllegalReceiveException; -import com.sun.nio.sctp.InvalidStreamException; -import com.sun.nio.sctp.IllegalUnbindException; -import com.sun.nio.sctp.MessageInfo; -import com.sun.nio.sctp.NotificationHandler; -import com.sun.nio.sctp.SctpChannel; -import com.sun.nio.sctp.SctpSocketOption; -import static com.sun.nio.sctp.SctpStandardSocketOptions.*; -import static sun.nio.ch.SctpResultContainer.SEND_FAILED; -import static sun.nio.ch.SctpResultContainer.ASSOCIATION_CHANGED; -import static sun.nio.ch.SctpResultContainer.PEER_ADDRESS_CHANGED; -import static sun.nio.ch.SctpResultContainer.SHUTDOWN; - -/** - * An implementation of an SctpChannel - */ -public class SctpChannelImpl extends SctpChannel - implements SelChImpl -{ - private final FileDescriptor fd; - - private final int fdVal; - - /* IDs of native threads doing send and receivess, for signalling */ - private volatile long receiverThread = 0; - private volatile long senderThread = 0; - - /* Lock held by current receiving or connecting thread */ - private final Object receiveLock = new Object(); - - /* Lock held by current sending or connecting thread */ - private final Object sendLock = new Object(); - - private final ThreadLocal<Boolean> receiveInvoked = - new ThreadLocal<Boolean>() { - @Override protected Boolean initialValue() { - return Boolean.FALSE; - } - }; - - /* Lock held by any thread that modifies the state fields declared below - DO NOT invoke a blocking I/O operation while holding this lock! */ - private final Object stateLock = new Object(); - - private enum ChannelState { - UNINITIALIZED, - UNCONNECTED, - PENDING, - CONNECTED, - KILLPENDING, - KILLED, - } - /* -- The following fields are protected by stateLock -- */ - private ChannelState state = ChannelState.UNINITIALIZED; - - /* Binding; Once bound the port will remain constant. */ - int port = -1; - private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>(); - /* Has the channel been bound to the wildcard address */ - private boolean wildcard; /* false */ - //private InetSocketAddress remoteAddress = null; - - /* Input/Output open */ - private boolean readyToConnect; - - /* Shutdown */ - private boolean isShutdown; - - private Association association; - - private Set<SocketAddress> remoteAddresses = Collections.emptySet(); - - /* -- End of fields protected by stateLock -- */ - - /** - * Constructor for normal connecting sockets - */ - public SctpChannelImpl(SelectorProvider provider) throws IOException { - //TODO: update provider remove public modifier - super(provider); - this.fd = SctpNet.socket(true); - this.fdVal = IOUtil.fdVal(fd); - this.state = ChannelState.UNCONNECTED; - } - - /** - * Constructor for sockets obtained from server sockets - */ - public SctpChannelImpl(SelectorProvider provider, FileDescriptor fd) - throws IOException { - this(provider, fd, null); - } - - /** - * Constructor for sockets obtained from branching - */ - public SctpChannelImpl(SelectorProvider provider, - FileDescriptor fd, - Association association) - throws IOException { - super(provider); - this.fd = fd; - this.fdVal = IOUtil.fdVal(fd); - this.state = ChannelState.CONNECTED; - port = (Net.localAddress(fd)).getPort(); - - if (association != null) { /* branched */ - this.association = association; - } else { /* obtained from server channel */ - /* Receive COMM_UP */ - ByteBuffer buf = Util.getTemporaryDirectBuffer(50); - try { - receive(buf, null, null, true); - } finally { - Util.releaseTemporaryDirectBuffer(buf); - } - } - } - - /** - * Binds the channel's socket to a local address. - */ - @Override - public SctpChannel bind(SocketAddress local) throws IOException { - synchronized (receiveLock) { - synchronized (sendLock) { - synchronized (stateLock) { - ensureOpenAndUnconnected(); - if (isBound()) - SctpNet.throwAlreadyBoundException(); - InetSocketAddress isa = (local == null) ? - new InetSocketAddress(0) : Net.checkAddress(local); - Net.bind(fd, isa.getAddress(), isa.getPort()); - InetSocketAddress boundIsa = Net.localAddress(fd); - port = boundIsa.getPort(); - localAddresses.add(isa); - if (isa.getAddress().isAnyLocalAddress()) - wildcard = true; - } - } - } - return this; - } - - @Override - public SctpChannel bindAddress(InetAddress address) - throws IOException { - bindUnbindAddress(address, true); - localAddresses.add(new InetSocketAddress(address, port)); - return this; - } - - @Override - public SctpChannel unbindAddress(InetAddress address) - throws IOException { - bindUnbindAddress(address, false); - localAddresses.remove(new InetSocketAddress(address, port)); - return this; - } - - private SctpChannel bindUnbindAddress(InetAddress address, boolean add) - throws IOException { - if (address == null) - throw new IllegalArgumentException(); - - synchronized (receiveLock) { - synchronized (sendLock) { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - throw new NotYetBoundException(); - if (wildcard) - throw new IllegalStateException( - "Cannot add or remove addresses from a channel that is bound to the wildcard address"); - if (address.isAnyLocalAddress()) - throw new IllegalArgumentException( - "Cannot add or remove the wildcard address"); - if (add) { - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - SctpNet.throwAlreadyBoundException(); - } - } - } else { /*removing */ - /* Verify that there is more than one address - * and that address is already bound */ - if (localAddresses.size() <= 1) - throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound"); - boolean foundAddress = false; - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - foundAddress = true; - break; - } - } - if (!foundAddress ) - throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address"); - } - - SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add); - - /* Update our internal Set to reflect the addition/removal */ - if (add) - localAddresses.add(new InetSocketAddress(address, port)); - else { - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - localAddresses.remove(addr); - break; - } - } - } - } - } - } - return this; - } - - private boolean isBound() { - synchronized (stateLock) { - return port == -1 ? false : true; - } - } - - private boolean isConnected() { - synchronized (stateLock) { - return (state == ChannelState.CONNECTED); - } - } - - private void ensureOpenAndUnconnected() throws IOException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (isConnected()) - throw new AlreadyConnectedException(); - if (state == ChannelState.PENDING) - throw new ConnectionPendingException(); - } - } - - private boolean ensureReceiveOpen() throws ClosedChannelException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isConnected()) - throw new NotYetConnectedException(); - else - return true; - } - } - - private void ensureSendOpen() throws ClosedChannelException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (isShutdown) - throw new ClosedChannelException(); - if (!isConnected()) - throw new NotYetConnectedException(); - } - } - - private void receiverCleanup() throws IOException { - synchronized (stateLock) { - receiverThread = 0; - if (state == ChannelState.KILLPENDING) - kill(); - } - } - - private void senderCleanup() throws IOException { - synchronized (stateLock) { - senderThread = 0; - if (state == ChannelState.KILLPENDING) - kill(); - } - } - - @Override - public Association association() throws ClosedChannelException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isConnected()) - return null; - - return association; - } - } - - @Override - public boolean connect(SocketAddress endpoint) throws IOException { - synchronized (receiveLock) { - synchronized (sendLock) { - ensureOpenAndUnconnected(); - InetSocketAddress isa = Net.checkAddress(endpoint); - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkConnect(isa.getAddress().getHostAddress(), - isa.getPort()); - synchronized (blockingLock()) { - int n = 0; - try { - try { - begin(); - synchronized (stateLock) { - if (!isOpen()) { - return false; - } - receiverThread = NativeThread.current(); - } - for (;;) { - InetAddress ia = isa.getAddress(); - if (ia.isAnyLocalAddress()) - ia = InetAddress.getLocalHost(); - n = SctpNet.connect(fdVal, ia, isa.getPort()); - if ( (n == IOStatus.INTERRUPTED) - && isOpen()) - continue; - break; - } - } finally { - receiverCleanup(); - end((n > 0) || (n == IOStatus.UNAVAILABLE)); - assert IOStatus.check(n); - } - } catch (IOException x) { - /* If an exception was thrown, close the channel after - * invoking end() so as to avoid bogus - * AsynchronousCloseExceptions */ - close(); - throw x; - } - - if (n > 0) { - synchronized (stateLock) { - /* Connection succeeded */ - state = ChannelState.CONNECTED; - if (!isBound()) { - InetSocketAddress boundIsa = - Net.localAddress(fd); - port = boundIsa.getPort(); - } - - /* Receive COMM_UP */ - ByteBuffer buf = Util.getTemporaryDirectBuffer(50); - try { - receive(buf, null, null, true); - } finally { - Util.releaseTemporaryDirectBuffer(buf); - } - - /* cache remote addresses */ - try { - remoteAddresses = getRemoteAddresses(); - } catch (IOException unused) { /* swallow exception */ } - - return true; - } - } else { - synchronized (stateLock) { - /* If nonblocking and no exception then connection - * pending; disallow another invocation */ - if (!isBlocking()) - state = ChannelState.PENDING; - else - assert false; - } - } - } - return false; - } - } - } - - @Override - public boolean connect(SocketAddress endpoint, - int maxOutStreams, - int maxInStreams) - throws IOException { - ensureOpenAndUnconnected(); - return setOption(SCTP_INIT_MAXSTREAMS, InitMaxStreams. - create(maxInStreams, maxOutStreams)).connect(endpoint); - - } - - @Override - public boolean isConnectionPending() { - synchronized (stateLock) { - return (state == ChannelState.PENDING); - } - } - - @Override - public boolean finishConnect() throws IOException { - synchronized (receiveLock) { - synchronized (sendLock) { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (isConnected()) - return true; - if (state != ChannelState.PENDING) - throw new NoConnectionPendingException(); - } - int n = 0; - try { - try { - begin(); - synchronized (blockingLock()) { - synchronized (stateLock) { - if (!isOpen()) { - return false; - } - receiverThread = NativeThread.current(); - } - if (!isBlocking()) { - for (;;) { - n = checkConnect(fd, false, readyToConnect); - if ( (n == IOStatus.INTERRUPTED) - && isOpen()) - continue; - break; - } - } else { - for (;;) { - n = checkConnect(fd, true, readyToConnect); - if (n == 0) { - // Loop in case of - // spurious notifications - continue; - } - if ( (n == IOStatus.INTERRUPTED) - && isOpen()) - continue; - break; - } - } - } - } finally { - synchronized (stateLock) { - receiverThread = 0; - if (state == ChannelState.KILLPENDING) { - kill(); - /* poll()/getsockopt() does not report - * error (throws exception, with n = 0) - * on Linux platform after dup2 and - * signal-wakeup. Force n to 0 so the - * end() can throw appropriate exception */ - n = 0; - } - } - end((n > 0) || (n == IOStatus.UNAVAILABLE)); - assert IOStatus.check(n); - } - } catch (IOException x) { - /* If an exception was thrown, close the channel after - * invoking end() so as to avoid bogus - * AsynchronousCloseExceptions */ - close(); - throw x; - } - - if (n > 0) { - synchronized (stateLock) { - state = ChannelState.CONNECTED; - if (!isBound()) { - InetSocketAddress boundIsa = - Net.localAddress(fd); - port = boundIsa.getPort(); - } - - /* Receive COMM_UP */ - ByteBuffer buf = Util.getTemporaryDirectBuffer(50); - try { - receive(buf, null, null, true); - } finally { - Util.releaseTemporaryDirectBuffer(buf); - } - - /* cache remote addresses */ - try { - remoteAddresses = getRemoteAddresses(); - } catch (IOException unused) { /* swallow exception */ } - - return true; - } - } - } - } - return false; - } - - @Override - protected void implConfigureBlocking(boolean block) throws IOException { - IOUtil.configureBlocking(fd, block); - } - - @Override - public void implCloseSelectableChannel() throws IOException { - synchronized (stateLock) { - SctpNet.preClose(fdVal); - - if (receiverThread != 0) - NativeThread.signal(receiverThread); - - if (senderThread != 0) - NativeThread.signal(senderThread); - - if (!isRegistered()) - kill(); - } - } - - @Override - public FileDescriptor getFD() { - return fd; - } - - @Override - public int getFDVal() { - return fdVal; - } - - /** - * Translates native poll revent ops into a ready operation ops - */ - private boolean translateReadyOps(int ops, int initialOps, SelectionKeyImpl sk) { - int intOps = sk.nioInterestOps(); - int oldOps = sk.nioReadyOps(); - int newOps = initialOps; - - if ((ops & PollArrayWrapper.POLLNVAL) != 0) { - /* This should only happen if this channel is pre-closed while a - * selection operation is in progress - * ## Throw an error if this channel has not been pre-closed */ - return false; - } - - if ((ops & (PollArrayWrapper.POLLERR - | PollArrayWrapper.POLLHUP)) != 0) { - newOps = intOps; - sk.nioReadyOps(newOps); - /* No need to poll again in checkConnect, - * the error will be detected there */ - readyToConnect = true; - return (newOps & ~oldOps) != 0; - } - - if (((ops & PollArrayWrapper.POLLIN) != 0) && - ((intOps & SelectionKey.OP_READ) != 0) && - isConnected()) - newOps |= SelectionKey.OP_READ; - - if (((ops & PollArrayWrapper.POLLCONN) != 0) && - ((intOps & SelectionKey.OP_CONNECT) != 0) && - ((state == ChannelState.UNCONNECTED) || (state == ChannelState.PENDING))) { - newOps |= SelectionKey.OP_CONNECT; - readyToConnect = true; - } - - if (((ops & PollArrayWrapper.POLLOUT) != 0) && - ((intOps & SelectionKey.OP_WRITE) != 0) && - isConnected()) - newOps |= SelectionKey.OP_WRITE; - - sk.nioReadyOps(newOps); - return (newOps & ~oldOps) != 0; - } - - @Override - public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) { - return translateReadyOps(ops, sk.nioReadyOps(), sk); - } - - @Override - @SuppressWarnings("all") - public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) { - return translateReadyOps(ops, 0, sk); - } - - @Override - public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) { - int newOps = 0; - if ((ops & SelectionKey.OP_READ) != 0) - newOps |= PollArrayWrapper.POLLIN; - if ((ops & SelectionKey.OP_WRITE) != 0) - newOps |= PollArrayWrapper.POLLOUT; - if ((ops & SelectionKey.OP_CONNECT) != 0) - newOps |= PollArrayWrapper.POLLCONN; - sk.selector.putEventOps(sk, newOps); - } - - @Override - public void kill() throws IOException { - synchronized (stateLock) { - if (state == ChannelState.KILLED) - return; - if (state == ChannelState.UNINITIALIZED) { - state = ChannelState.KILLED; - return; - } - assert !isOpen() && !isRegistered(); - - /* Postpone the kill if there is a waiting reader - * or writer thread. */ - if (receiverThread == 0 && senderThread == 0) { - SctpNet.close(fdVal); - state = ChannelState.KILLED; - } else { - state = ChannelState.KILLPENDING; - } - } - } - - @Override - public <T> SctpChannel setOption(SctpSocketOption<T> name, T value) - throws IOException { - if (name == null) - throw new NullPointerException(); - if (!supportedOptions().contains(name)) - throw new UnsupportedOperationException("'" + name + "' not supported"); - - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - - SctpNet.setSocketOption(fdVal, name, value, 0 /*oneToOne*/); - } - return this; - } - - @Override - @SuppressWarnings("unchecked") - public <T> T getOption(SctpSocketOption<T> name) throws IOException { - if (name == null) - throw new NullPointerException(); - if (!supportedOptions().contains(name)) - throw new UnsupportedOperationException("'" + name + "' not supported"); - - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - - return (T)SctpNet.getSocketOption(fdVal, name, 0 /*oneToOne*/); - } - } - - private static class DefaultOptionsHolder { - static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions(); - - private static Set<SctpSocketOption<?>> defaultOptions() { - HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(10); - set.add(SCTP_DISABLE_FRAGMENTS); - set.add(SCTP_EXPLICIT_COMPLETE); - set.add(SCTP_FRAGMENT_INTERLEAVE); - set.add(SCTP_INIT_MAXSTREAMS); - set.add(SCTP_NODELAY); - set.add(SCTP_PRIMARY_ADDR); - set.add(SCTP_SET_PEER_PRIMARY_ADDR); - set.add(SO_SNDBUF); - set.add(SO_RCVBUF); - set.add(SO_LINGER); - return Collections.unmodifiableSet(set); - } - } - - @Override - public final Set<SctpSocketOption<?>> supportedOptions() { - return DefaultOptionsHolder.defaultOptions; - } - - @Override - public <T> MessageInfo receive(ByteBuffer buffer, - T attachment, - NotificationHandler<T> handler) - throws IOException { - return receive(buffer, attachment, handler, false); - } - - private <T> MessageInfo receive(ByteBuffer buffer, - T attachment, - NotificationHandler<T> handler, - boolean fromConnect) - throws IOException { - if (buffer == null) - throw new IllegalArgumentException("buffer cannot be null"); - - if (buffer.isReadOnly()) - throw new IllegalArgumentException("Read-only buffer"); - - if (receiveInvoked.get()) - throw new IllegalReceiveException( - "cannot invoke receive from handler"); - receiveInvoked.set(Boolean.TRUE); - - try { - SctpResultContainer resultContainer = new SctpResultContainer(); - do { - resultContainer.clear(); - synchronized (receiveLock) { - if (!ensureReceiveOpen()) - return null; - - int n = 0; - try { - begin(); - - synchronized (stateLock) { - if(!isOpen()) - return null; - receiverThread = NativeThread.current(); - } - - do { - n = receive(fdVal, buffer, resultContainer, fromConnect); - } while ((n == IOStatus.INTERRUPTED) && isOpen()); - } finally { - receiverCleanup(); - end((n > 0) || (n == IOStatus.UNAVAILABLE)); - assert IOStatus.check(n); - } - - if (!resultContainer.isNotification()) { - /* message or nothing */ - if (resultContainer.hasSomething()) { - /* Set the association before returning */ - SctpMessageInfoImpl info = - resultContainer.getMessageInfo(); - synchronized (stateLock) { - assert association != null; - info.setAssociation(association); - } - return info; - } else - /* Non-blocking may return null if nothing available*/ - return null; - } else { /* notification */ - synchronized (stateLock) { - handleNotificationInternal( - resultContainer); - } - } - - if (fromConnect) { - /* If we reach here, then it was connect that invoked - * receive and received the COMM_UP. We have already - * handled the COMM_UP with the internal notification - * handler. Simply return. */ - return null; - } - } /* receiveLock */ - } while (handler == null ? true : - (invokeNotificationHandler(resultContainer, handler, attachment) - == HandlerResult.CONTINUE)); - - return null; - } finally { - receiveInvoked.set(Boolean.FALSE); - } - } - - private int receive(int fd, - ByteBuffer dst, - SctpResultContainer resultContainer, - boolean peek) - throws IOException { - int pos = dst.position(); - int lim = dst.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (dst instanceof DirectBuffer && rem > 0) - return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos, peek); - - /* Substitute a native buffer */ - int newSize = Math.max(rem, 1); - ByteBuffer bb = Util.getTemporaryDirectBuffer(newSize); - try { - int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0, peek); - bb.flip(); - if (n > 0 && rem > 0) - dst.put(bb); - return n; - } finally { - Util.releaseTemporaryDirectBuffer(bb); - } - } - - private int receiveIntoNativeBuffer(int fd, - SctpResultContainer resultContainer, - ByteBuffer bb, - int rem, - int pos, - boolean peek) - throws IOException - { - int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem, peek); - - if (n > 0) - bb.position(pos + n); - return n; - } - - private InternalNotificationHandler internalNotificationHandler = - new InternalNotificationHandler(); - - private void handleNotificationInternal(SctpResultContainer resultContainer) - { - invokeNotificationHandler(resultContainer, - internalNotificationHandler, null); - } - - private class InternalNotificationHandler - extends AbstractNotificationHandler<Object> - { - @Override - public HandlerResult handleNotification( - AssociationChangeNotification not, Object unused) { - if (not.event().equals( - AssociationChangeNotification.AssocChangeEvent.COMM_UP) && - association == null) { - SctpAssocChange sac = (SctpAssocChange) not; - association = new SctpAssociationImpl - (sac.assocId(), sac.maxInStreams(), sac.maxOutStreams()); - } - return HandlerResult.CONTINUE; - } - } - - private <T> HandlerResult invokeNotificationHandler - (SctpResultContainer resultContainer, - NotificationHandler<T> handler, - T attachment) { - SctpNotification notification = resultContainer.notification(); - synchronized (stateLock) { - notification.setAssociation(association); - } - - if (!(handler instanceof AbstractNotificationHandler)) { - return handler.handleNotification(notification, attachment); - } - - /* AbstractNotificationHandler */ - AbstractNotificationHandler<T> absHandler = - (AbstractNotificationHandler<T>)handler; - switch(resultContainer.type()) { - case ASSOCIATION_CHANGED : - return absHandler.handleNotification( - resultContainer.getAssociationChanged(), attachment); - case PEER_ADDRESS_CHANGED : - return absHandler.handleNotification( - resultContainer.getPeerAddressChanged(), attachment); - case SEND_FAILED : - return absHandler.handleNotification( - resultContainer.getSendFailed(), attachment); - case SHUTDOWN : - return absHandler.handleNotification( - resultContainer.getShutdown(), attachment); - default : - /* implementation specific handlers */ - return absHandler.handleNotification( - resultContainer.notification(), attachment); - } - } - - private void checkAssociation(Association sendAssociation) { - synchronized (stateLock) { - if (sendAssociation != null && !sendAssociation.equals(association)) { - throw new IllegalArgumentException( - "Cannot send to another association"); - } - } - } - - private void checkStreamNumber(int streamNumber) { - synchronized (stateLock) { - if (association != null) { - if (streamNumber < 0 || - streamNumber >= association.maxOutboundStreams()) - throw new InvalidStreamException(); - } - } - } - - /* TODO: Add support for ttl and isComplete to both 121 12M - * SCTP_EOR not yet supported on reference platforms - * TTL support limited... - */ - @Override - public int send(ByteBuffer buffer, MessageInfo messageInfo) - throws IOException { - if (buffer == null) - throw new IllegalArgumentException("buffer cannot be null"); - - if (messageInfo == null) - throw new IllegalArgumentException("messageInfo cannot be null"); - - checkAssociation(messageInfo.association()); - checkStreamNumber(messageInfo.streamNumber()); - - synchronized (sendLock) { - ensureSendOpen(); - - int n = 0; - try { - begin(); - - synchronized (stateLock) { - if(!isOpen()) - return 0; - senderThread = NativeThread.current(); - } - - do { - n = send(fdVal, buffer, messageInfo); - } while ((n == IOStatus.INTERRUPTED) && isOpen()); - - return IOStatus.normalize(n); - } finally { - senderCleanup(); - end((n > 0) || (n == IOStatus.UNAVAILABLE)); - assert IOStatus.check(n); - } - } - } - - private int send(int fd, ByteBuffer src, MessageInfo messageInfo) - throws IOException { - int streamNumber = messageInfo.streamNumber(); - SocketAddress target = messageInfo.address(); - boolean unordered = messageInfo.isUnordered(); - int ppid = messageInfo.payloadProtocolID(); - - if (src instanceof DirectBuffer) - return sendFromNativeBuffer(fd, src, target, streamNumber, - unordered, ppid); - - /* Substitute a native buffer */ - int pos = src.position(); - int lim = src.limit(); - assert (pos <= lim && streamNumber >= 0); - - int rem = (pos <= lim ? lim - pos : 0); - ByteBuffer bb = Util.getTemporaryDirectBuffer(rem); - try { - bb.put(src); - bb.flip(); - /* Do not update src until we see how many bytes were written */ - src.position(pos); - - int n = sendFromNativeBuffer(fd, bb, target, streamNumber, - unordered, ppid); - if (n > 0) { - /* now update src */ - src.position(pos + n); - } - return n; - } finally { - Util.releaseTemporaryDirectBuffer(bb); - } - } - - private int sendFromNativeBuffer(int fd, - ByteBuffer bb, - SocketAddress target, - int streamNumber, - boolean unordered, - int ppid) - throws IOException { - int pos = bb.position(); - int lim = bb.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - int written = send0(fd, ((DirectBuffer)bb).address() + pos, - rem, target, -1 /*121*/, streamNumber, unordered, ppid); - if (written > 0) - bb.position(pos + written); - return written; - } - - @Override - public SctpChannel shutdown() throws IOException { - synchronized(stateLock) { - if (isShutdown) - return this; - - ensureSendOpen(); - SctpNet.shutdown(fdVal, -1); - if (senderThread != 0) - NativeThread.signal(senderThread); - isShutdown = true; - } - return this; - } - - @Override - public Set<SocketAddress> getAllLocalAddresses() - throws IOException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - return Collections.emptySet(); - - return SctpNet.getLocalAddresses(fdVal); - } - } - - @Override - public Set<SocketAddress> getRemoteAddresses() - throws IOException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isConnected() || isShutdown) - return Collections.emptySet(); - - try { - return SctpNet.getRemoteAddresses(fdVal, 0/*unused*/); - } catch (SocketException unused) { - /* an open connected channel should always have remote addresses */ - return remoteAddresses; - } - } - } - - /* Native */ - private static native void initIDs(); - - static native int receive0(int fd, SctpResultContainer resultContainer, - long address, int length, boolean peek) throws IOException; - - static native int send0(int fd, long address, int length, - SocketAddress target, int assocId, int streamNumber, - boolean unordered, int ppid) throws IOException; - - private static native int checkConnect(FileDescriptor fd, boolean block, - boolean ready) throws IOException; - - static { - Util.load(); /* loads nio & net native libraries */ - java.security.AccessController.doPrivileged( - new sun.security.action.LoadLibraryAction("sctp")); - initIDs(); - } -}
--- a/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,985 +0,0 @@ -/* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.InetAddress; -import java.net.SocketAddress; -import java.net.SocketException; -import java.net.InetSocketAddress; -import java.io.FileDescriptor; -import java.io.IOException; -import java.util.Collections; -import java.util.Map.Entry; -import java.util.Iterator; -import java.util.Set; -import java.util.HashSet; -import java.util.HashMap; -import java.nio.ByteBuffer; -import java.nio.channels.SelectionKey; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.NotYetBoundException; -import java.nio.channels.spi.SelectorProvider; -import com.sun.nio.sctp.AbstractNotificationHandler; -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.AssociationChangeNotification; -import com.sun.nio.sctp.HandlerResult; -import com.sun.nio.sctp.IllegalReceiveException; -import com.sun.nio.sctp.InvalidStreamException; -import com.sun.nio.sctp.IllegalUnbindException; -import com.sun.nio.sctp.NotificationHandler; -import com.sun.nio.sctp.MessageInfo; -import com.sun.nio.sctp.SctpChannel; -import com.sun.nio.sctp.SctpMultiChannel; -import com.sun.nio.sctp.SctpSocketOption; -import static com.sun.nio.sctp.SctpStandardSocketOptions.*; -import static sun.nio.ch.SctpResultContainer.*; - -/** - * An implementation of SctpMultiChannel - */ -public class SctpMultiChannelImpl extends SctpMultiChannel - implements SelChImpl -{ - private final FileDescriptor fd; - - private final int fdVal; - - /* IDs of native threads doing send and receives, for signalling */ - private volatile long receiverThread = 0; - private volatile long senderThread = 0; - - /* Lock held by current receiving thread */ - private final Object receiveLock = new Object(); - - /* Lock held by current sending thread */ - private final Object sendLock = new Object(); - - /* Lock held by any thread that modifies the state fields declared below - * DO NOT invoke a blocking I/O operation while holding this lock! */ - private final Object stateLock = new Object(); - - private enum ChannelState { - UNINITIALIZED, - KILLPENDING, - KILLED, - } - - /* -- The following fields are protected by stateLock -- */ - private ChannelState state = ChannelState.UNINITIALIZED; - - /* Binding: Once bound the port will remain constant. */ - int port = -1; - private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>(); - /* Has the channel been bound to the wildcard address */ - private boolean wildcard; /* false */ - - /* Keeps a map of addresses to association, and visa versa */ - private HashMap<SocketAddress, Association> addressMap = - new HashMap<SocketAddress, Association>(); - private HashMap<Association, Set<SocketAddress>> associationMap = - new HashMap<Association, Set<SocketAddress>>(); - - /* -- End of fields protected by stateLock -- */ - - /* If an association has been shutdown mark it for removal after - * the user handler has been invoked */ - private final ThreadLocal<Association> associationToRemove = - new ThreadLocal<Association>() { - @Override protected Association initialValue() { - return null; - } - }; - - /* A notification handler cannot invoke receive */ - private final ThreadLocal<Boolean> receiveInvoked = - new ThreadLocal<Boolean>() { - @Override protected Boolean initialValue() { - return Boolean.FALSE; - } - }; - - public SctpMultiChannelImpl(SelectorProvider provider) - throws IOException { - //TODO: update provider, remove public modifier - super(provider); - this.fd = SctpNet.socket(false /*one-to-many*/); - this.fdVal = IOUtil.fdVal(fd); - } - - @Override - public SctpMultiChannel bind(SocketAddress local, int backlog) - throws IOException { - synchronized (receiveLock) { - synchronized (sendLock) { - synchronized (stateLock) { - ensureOpen(); - if (isBound()) - SctpNet.throwAlreadyBoundException(); - InetSocketAddress isa = (local == null) ? - new InetSocketAddress(0) : Net.checkAddress(local); - - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkListen(isa.getPort()); - Net.bind(fd, isa.getAddress(), isa.getPort()); - - InetSocketAddress boundIsa = Net.localAddress(fd); - port = boundIsa.getPort(); - localAddresses.add(isa); - if (isa.getAddress().isAnyLocalAddress()) - wildcard = true; - - SctpNet.listen(fdVal, backlog < 1 ? 50 : backlog); - } - } - } - return this; - } - - @Override - public SctpMultiChannel bindAddress(InetAddress address) - throws IOException { - return bindUnbindAddress(address, true); - } - - @Override - public SctpMultiChannel unbindAddress(InetAddress address) - throws IOException { - return bindUnbindAddress(address, false); - } - - private SctpMultiChannel bindUnbindAddress(InetAddress address, - boolean add) - throws IOException { - if (address == null) - throw new IllegalArgumentException(); - - synchronized (receiveLock) { - synchronized (sendLock) { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - throw new NotYetBoundException(); - if (wildcard) - throw new IllegalStateException( - "Cannot add or remove addresses from a channel that is bound to the wildcard address"); - if (address.isAnyLocalAddress()) - throw new IllegalArgumentException( - "Cannot add or remove the wildcard address"); - if (add) { - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - SctpNet.throwAlreadyBoundException(); - } - } - } else { /*removing */ - /* Verify that there is more than one address - * and that address is already bound */ - if (localAddresses.size() <= 1) - throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound"); - boolean foundAddress = false; - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - foundAddress = true; - break; - } - } - if (!foundAddress ) - throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address"); - } - - SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add); - - /* Update our internal Set to reflect the addition/removal */ - if (add) - localAddresses.add(new InetSocketAddress(address, port)); - else { - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - localAddresses.remove(addr); - break; - } - } - } - } - } - } - return this; - } - - @Override - public Set<Association> associations() - throws ClosedChannelException, NotYetBoundException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - throw new NotYetBoundException(); - - return Collections.unmodifiableSet(associationMap.keySet()); - } - } - - private boolean isBound() { - synchronized (stateLock) { - return port == -1 ? false : true; - } - } - - private void ensureOpen() throws IOException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - } - } - - private void receiverCleanup() throws IOException { - synchronized (stateLock) { - receiverThread = 0; - if (state == ChannelState.KILLPENDING) - kill(); - } - } - - private void senderCleanup() throws IOException { - synchronized (stateLock) { - senderThread = 0; - if (state == ChannelState.KILLPENDING) - kill(); - } - } - - @Override - protected void implConfigureBlocking(boolean block) throws IOException { - IOUtil.configureBlocking(fd, block); - } - - @Override - public void implCloseSelectableChannel() throws IOException { - synchronized (stateLock) { - SctpNet.preClose(fdVal); - - if (receiverThread != 0) - NativeThread.signal(receiverThread); - - if (senderThread != 0) - NativeThread.signal(senderThread); - - if (!isRegistered()) - kill(); - } - } - - @Override - public FileDescriptor getFD() { - return fd; - } - - @Override - public int getFDVal() { - return fdVal; - } - - /** - * Translates native poll revent ops into a ready operation ops - */ - private boolean translateReadyOps(int ops, int initialOps, - SelectionKeyImpl sk) { - int intOps = sk.nioInterestOps(); - int oldOps = sk.nioReadyOps(); - int newOps = initialOps; - - if ((ops & PollArrayWrapper.POLLNVAL) != 0) { - /* This should only happen if this channel is pre-closed while a - * selection operation is in progress - * ## Throw an error if this channel has not been pre-closed */ - return false; - } - - if ((ops & (PollArrayWrapper.POLLERR - | PollArrayWrapper.POLLHUP)) != 0) { - newOps = intOps; - sk.nioReadyOps(newOps); - return (newOps & ~oldOps) != 0; - } - - if (((ops & PollArrayWrapper.POLLIN) != 0) && - ((intOps & SelectionKey.OP_READ) != 0)) - newOps |= SelectionKey.OP_READ; - - if (((ops & PollArrayWrapper.POLLOUT) != 0) && - ((intOps & SelectionKey.OP_WRITE) != 0)) - newOps |= SelectionKey.OP_WRITE; - - sk.nioReadyOps(newOps); - return (newOps & ~oldOps) != 0; - } - - @Override - public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) { - return translateReadyOps(ops, sk.nioReadyOps(), sk); - } - - @Override - public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) { - return translateReadyOps(ops, 0, sk); - } - - @Override - public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) { - int newOps = 0; - if ((ops & SelectionKey.OP_READ) != 0) - newOps |= PollArrayWrapper.POLLIN; - if ((ops & SelectionKey.OP_WRITE) != 0) - newOps |= PollArrayWrapper.POLLOUT; - sk.selector.putEventOps(sk, newOps); - } - - @Override - public void kill() throws IOException { - synchronized (stateLock) { - if (state == ChannelState.KILLED) - return; - if (state == ChannelState.UNINITIALIZED) { - state = ChannelState.KILLED; - return; - } - assert !isOpen() && !isRegistered(); - - /* Postpone the kill if there is a thread sending or receiving. */ - if (receiverThread == 0 && senderThread == 0) { - SctpNet.close(fdVal); - state = ChannelState.KILLED; - } else { - state = ChannelState.KILLPENDING; - } - } - } - - @Override - public <T> SctpMultiChannel setOption(SctpSocketOption<T> name, - T value, - Association association) - throws IOException { - if (name == null) - throw new NullPointerException(); - if (!(supportedOptions().contains(name))) - throw new UnsupportedOperationException("'" + name + "' not supported"); - - synchronized (stateLock) { - if (association != null && (name.equals(SCTP_PRIMARY_ADDR) || - name.equals(SCTP_SET_PEER_PRIMARY_ADDR))) { - checkAssociation(association); - } - if (!isOpen()) - throw new ClosedChannelException(); - - int assocId = association == null ? 0 : association.associationID(); - SctpNet.setSocketOption(fdVal, name, value, assocId); - } - return this; - } - - @Override - @SuppressWarnings("unchecked") - public <T> T getOption(SctpSocketOption<T> name, Association association) - throws IOException { - if (name == null) - throw new NullPointerException(); - if (!supportedOptions().contains(name)) - throw new UnsupportedOperationException("'" + name + "' not supported"); - - synchronized (stateLock) { - if (association != null && (name.equals(SCTP_PRIMARY_ADDR) || - name.equals(SCTP_SET_PEER_PRIMARY_ADDR))) { - checkAssociation(association); - } - if (!isOpen()) - throw new ClosedChannelException(); - - int assocId = association == null ? 0 : association.associationID(); - return (T)SctpNet.getSocketOption(fdVal, name, assocId); - } - } - - private static class DefaultOptionsHolder { - static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions(); - - private static Set<SctpSocketOption<?>> defaultOptions() { - HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(10); - set.add(SCTP_DISABLE_FRAGMENTS); - set.add(SCTP_EXPLICIT_COMPLETE); - set.add(SCTP_FRAGMENT_INTERLEAVE); - set.add(SCTP_INIT_MAXSTREAMS); - set.add(SCTP_NODELAY); - set.add(SCTP_PRIMARY_ADDR); - set.add(SCTP_SET_PEER_PRIMARY_ADDR); - set.add(SO_SNDBUF); - set.add(SO_RCVBUF); - set.add(SO_LINGER); - return Collections.unmodifiableSet(set); - } - } - - @Override - public final Set<SctpSocketOption<?>> supportedOptions() { - return DefaultOptionsHolder.defaultOptions; - } - - @Override - public <T> MessageInfo receive(ByteBuffer buffer, - T attachment, - NotificationHandler<T> handler) - throws IOException { - if (buffer == null) - throw new IllegalArgumentException("buffer cannot be null"); - - if (buffer.isReadOnly()) - throw new IllegalArgumentException("Read-only buffer"); - - if (receiveInvoked.get()) - throw new IllegalReceiveException( - "cannot invoke receive from handler"); - receiveInvoked.set(Boolean.TRUE); - - try { - SctpResultContainer resultContainer = new SctpResultContainer(); - do { - resultContainer.clear(); - synchronized (receiveLock) { - ensureOpen(); - if (!isBound()) - throw new NotYetBoundException(); - - int n = 0; - try { - begin(); - - synchronized (stateLock) { - if(!isOpen()) - return null; - receiverThread = NativeThread.current(); - } - - do { - n = receive(fdVal, buffer, resultContainer); - } while ((n == IOStatus.INTERRUPTED) && isOpen()); - - } finally { - receiverCleanup(); - end((n > 0) || (n == IOStatus.UNAVAILABLE)); - assert IOStatus.check(n); - } - - if (!resultContainer.isNotification()) { - /* message or nothing */ - if (resultContainer.hasSomething()) { - /* Set the association before returning */ - SctpMessageInfoImpl info = - resultContainer.getMessageInfo(); - info.setAssociation(lookupAssociation(info. - associationID())); - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - InetSocketAddress isa = (InetSocketAddress)info.address(); - if (!addressMap.containsKey(isa)) { - /* must be a new association */ - try { - sm.checkAccept(isa.getAddress().getHostAddress(), - isa.getPort()); - } catch (SecurityException se) { - buffer.clear(); - throw se; - } - } - } - - assert info.association() != null; - return info; - } else { - /* Non-blocking may return null if nothing available*/ - return null; - } - } else { /* notification */ - synchronized (stateLock) { - handleNotificationInternal( - resultContainer); - } - } - } /* receiveLock */ - } while (handler == null ? true : - (invokeNotificationHandler(resultContainer, handler, attachment) - == HandlerResult.CONTINUE)); - } finally { - receiveInvoked.set(Boolean.FALSE); - } - - return null; - } - - private int receive(int fd, - ByteBuffer dst, - SctpResultContainer resultContainer) - throws IOException { - int pos = dst.position(); - int lim = dst.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - if (dst instanceof DirectBuffer && rem > 0) - return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos); - - /* Substitute a native buffer. */ - int newSize = Math.max(rem, 1); - ByteBuffer bb = Util.getTemporaryDirectBuffer(newSize); - try { - int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0); - bb.flip(); - if (n > 0 && rem > 0) - dst.put(bb); - return n; - } finally { - Util.releaseTemporaryDirectBuffer(bb); - } - } - - private int receiveIntoNativeBuffer(int fd, - SctpResultContainer resultContainer, - ByteBuffer bb, - int rem, - int pos) - throws IOException { - int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem); - if (n > 0) - bb.position(pos + n); - return n; - } - - private InternalNotificationHandler internalNotificationHandler = - new InternalNotificationHandler(); - - private void handleNotificationInternal(SctpResultContainer resultContainer) - { - invokeNotificationHandler(resultContainer, - internalNotificationHandler, null); - } - - private class InternalNotificationHandler - extends AbstractNotificationHandler<Object> - { - @Override - public HandlerResult handleNotification( - AssociationChangeNotification not, Object unused) { - SctpAssocChange sac = (SctpAssocChange) not; - - /* Update map to reflect change in association */ - switch (not.event()) { - case COMM_UP : - Association newAssociation = new SctpAssociationImpl - (sac.assocId(), sac.maxInStreams(), sac.maxOutStreams()); - addAssociation(newAssociation); - break; - case SHUTDOWN : - case COMM_LOST : - //case RESTART: ??? - /* mark association for removal after user handler invoked*/ - associationToRemove.set(lookupAssociation(sac.assocId())); - } - return HandlerResult.CONTINUE; - } - } - - private <T> HandlerResult invokeNotificationHandler( - SctpResultContainer resultContainer, - NotificationHandler<T> handler, - T attachment) { - HandlerResult result; - SctpNotification notification = resultContainer.notification(); - notification.setAssociation(lookupAssociation(notification.assocId())); - - if (!(handler instanceof AbstractNotificationHandler)) { - result = handler.handleNotification(notification, attachment); - } else { /* AbstractNotificationHandler */ - AbstractNotificationHandler<T> absHandler = - (AbstractNotificationHandler<T>)handler; - switch(resultContainer.type()) { - case ASSOCIATION_CHANGED : - result = absHandler.handleNotification( - resultContainer.getAssociationChanged(), attachment); - break; - case PEER_ADDRESS_CHANGED : - result = absHandler.handleNotification( - resultContainer.getPeerAddressChanged(), attachment); - break; - case SEND_FAILED : - result = absHandler.handleNotification( - resultContainer.getSendFailed(), attachment); - break; - case SHUTDOWN : - result = absHandler.handleNotification( - resultContainer.getShutdown(), attachment); - break; - default : - /* implementation specific handlers */ - result = absHandler.handleNotification( - resultContainer.notification(), attachment); - } - } - - if (!(handler instanceof InternalNotificationHandler)) { - /* Only remove associations after user handler - * has finished with them */ - Association assoc = associationToRemove.get(); - if (assoc != null) { - removeAssociation(assoc); - associationToRemove.set(null); - } - - } - - return result; - } - - private Association lookupAssociation(int assocId) { - /* Lookup the association in our internal map */ - synchronized (stateLock) { - Set<Association> assocs = associationMap.keySet(); - for (Association a : assocs) { - if (a.associationID() == assocId) { - return a; - } - } - } - return null; - } - - private void addAssociation(Association association) { - synchronized (stateLock) { - int assocId = association.associationID(); - Set<SocketAddress> addresses = null; - - try { - addresses = SctpNet.getRemoteAddresses(fdVal, assocId); - } catch (IOException unused) { - /* OK, determining connected addresses may not be possible - * shutdown, connection lost, etc */ - } - - associationMap.put(association, addresses); - if (addresses != null) { - for (SocketAddress addr : addresses) - addressMap.put(addr, association); - } - } - } - - private void removeAssociation(Association association) { - synchronized (stateLock) { - int assocId = association.associationID(); - Set<SocketAddress> addresses = null; - - try { - addresses = SctpNet.getRemoteAddresses(fdVal, assocId); - } catch (IOException unused) { - /* OK, determining connected addresses may not be possible - * shutdown, connection lost, etc */ - } - - Set<Association> assocs = associationMap.keySet(); - for (Association a : assocs) { - if (a.associationID() == assocId) { - associationMap.remove(a); - break; - } - } - if (addresses != null) { - for (SocketAddress addr : addresses) - addressMap.remove(addr); - } else { - /* We cannot determine the connected addresses */ - Set<java.util.Map.Entry<SocketAddress, Association>> addrAssocs = - addressMap.entrySet(); - Iterator<Entry<SocketAddress, Association>> iterator = addrAssocs.iterator(); - while (iterator.hasNext()) { - Entry<SocketAddress, Association> entry = iterator.next(); - if (entry.getValue().equals(association)) { - iterator.remove(); - } - } - } - } - } - - /** - * @throws IllegalArgumentException - * If the given association is not controlled by this channel - * - * @return {@code true} if, and only if, the given association is one - * of the current associations controlled by this channel - */ - private boolean checkAssociation(Association messageAssoc) { - synchronized (stateLock) { - for (Association association : associationMap.keySet()) { - if (messageAssoc.equals(association)) { - return true; - } - } - } - throw new IllegalArgumentException( - "Given Association is not controlled by this channel"); - } - - private void checkStreamNumber(Association assoc, int streamNumber) { - synchronized (stateLock) { - if (streamNumber < 0 || streamNumber >= assoc.maxOutboundStreams()) - throw new InvalidStreamException(); - } - } - - /* TODO: Add support for ttl and isComplete to both 121 12M - * SCTP_EOR not yet supported on reference platforms - * TTL support limited... - */ - @Override - public int send(ByteBuffer buffer, MessageInfo messageInfo) - throws IOException { - if (buffer == null) - throw new IllegalArgumentException("buffer cannot be null"); - - if (messageInfo == null) - throw new IllegalArgumentException("messageInfo cannot be null"); - - synchronized (sendLock) { - ensureOpen(); - - if (!isBound()) - bind(null, 0); - - int n = 0; - try { - int assocId = -1; - SocketAddress address = null; - begin(); - - synchronized (stateLock) { - if(!isOpen()) - return 0; - senderThread = NativeThread.current(); - - /* Determine what address or association to send to */ - Association assoc = messageInfo.association(); - InetSocketAddress addr = (InetSocketAddress)messageInfo.address(); - if (assoc != null) { - checkAssociation(assoc); - checkStreamNumber(assoc, messageInfo.streamNumber()); - assocId = assoc.associationID(); - /* have we also got a preferred address */ - if (addr != null) { - if (!assoc.equals(addressMap.get(addr))) - throw new IllegalArgumentException("given preferred address is not part of this association"); - address = addr; - } - } else if (addr != null) { - address = addr; - Association association = addressMap.get(addr); - if (association != null) { - checkStreamNumber(association, messageInfo.streamNumber()); - assocId = association.associationID(); - - } else { /* must be new association */ - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkConnect(addr.getAddress().getHostAddress(), - addr.getPort()); - } - } else { - throw new AssertionError( - "Both association and address cannot be null"); - } - } - - do { - n = send(fdVal, buffer, assocId, address, messageInfo); - } while ((n == IOStatus.INTERRUPTED) && isOpen()); - - return IOStatus.normalize(n); - } finally { - senderCleanup(); - end((n > 0) || (n == IOStatus.UNAVAILABLE)); - assert IOStatus.check(n); - } - } - } - - private int send(int fd, - ByteBuffer src, - int assocId, - SocketAddress target, - MessageInfo messageInfo) - throws IOException { - int streamNumber = messageInfo.streamNumber(); - boolean unordered = messageInfo.isUnordered(); - int ppid = messageInfo.payloadProtocolID(); - - if (src instanceof DirectBuffer) - return sendFromNativeBuffer(fd, src, target, assocId, - streamNumber, unordered, ppid); - - /* Substitute a native buffer */ - int pos = src.position(); - int lim = src.limit(); - assert (pos <= lim && streamNumber >= 0); - - int rem = (pos <= lim ? lim - pos : 0); - ByteBuffer bb = Util.getTemporaryDirectBuffer(rem); - try { - bb.put(src); - bb.flip(); - /* Do not update src until we see how many bytes were written */ - src.position(pos); - - int n = sendFromNativeBuffer(fd, bb, target, assocId, - streamNumber, unordered, ppid); - if (n > 0) { - /* now update src */ - src.position(pos + n); - } - return n; - } finally { - Util.releaseTemporaryDirectBuffer(bb); - } - } - - private int sendFromNativeBuffer(int fd, - ByteBuffer bb, - SocketAddress target, - int assocId, - int streamNumber, - boolean unordered, - int ppid) - throws IOException { - int pos = bb.position(); - int lim = bb.limit(); - assert (pos <= lim); - int rem = (pos <= lim ? lim - pos : 0); - - int written = send0(fd, ((DirectBuffer)bb).address() + pos, - rem, target, assocId, streamNumber, unordered, ppid); - if (written > 0) - bb.position(pos + written); - return written; - } - - @Override - public SctpMultiChannel shutdown(Association association) - throws IOException { - synchronized (stateLock) { - checkAssociation(association); - if (!isOpen()) - throw new ClosedChannelException(); - - SctpNet.shutdown(fdVal, association.associationID()); - } - return this; - } - - @Override - public Set<SocketAddress> getAllLocalAddresses() - throws IOException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - return Collections.emptySet(); - - return SctpNet.getLocalAddresses(fdVal); - } - } - - @Override - public Set<SocketAddress> getRemoteAddresses(Association association) - throws IOException { - synchronized (stateLock) { - checkAssociation(association); - if (!isOpen()) - throw new ClosedChannelException(); - - try { - return SctpNet.getRemoteAddresses(fdVal, association.associationID()); - } catch (SocketException se) { - /* a valid association should always have remote addresses */ - Set<SocketAddress> addrs = associationMap.get(association); - return addrs != null ? addrs : Collections.<SocketAddress>emptySet(); - } - } - } - - @Override - public SctpChannel branch(Association association) - throws IOException { - synchronized (stateLock) { - checkAssociation(association); - if (!isOpen()) - throw new ClosedChannelException(); - - FileDescriptor bFd = SctpNet.branch(fdVal, - association.associationID()); - /* successfully branched, we can now remove it from assoc list */ - removeAssociation(association); - - return new SctpChannelImpl(provider(), bFd, association); - } - } - - /* Use common native implementation shared between - * one-to-one and one-to-many */ - private static int receive0(int fd, - SctpResultContainer resultContainer, - long address, - int length) - throws IOException{ - return SctpChannelImpl.receive0(fd, resultContainer, address, - length, false /*peek */); - } - - private static int send0(int fd, - long address, - int length, - SocketAddress target, - int assocId, - int streamNumber, - boolean unordered, - int ppid) - throws IOException { - return SctpChannelImpl.send0(fd, address, length, target, assocId, - streamNumber, unordered, ppid); - } - - static { - Util.load(); /* loads nio & net native libraries */ - java.security.AccessController.doPrivileged( - new sun.security.action.LoadLibraryAction("sctp")); - } -}
--- a/src/solaris/classes/sun/nio/ch/SctpNet.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,313 +0,0 @@ -/* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.io.FileDescriptor; -import java.io.IOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.nio.channels.AlreadyBoundException; -import java.util.Set; -import java.util.HashSet; -import java.security.AccessController; -import sun.security.action.GetPropertyAction; -import com.sun.nio.sctp.SctpSocketOption; -import static com.sun.nio.sctp.SctpStandardSocketOptions.*; - -public class SctpNet { - static final String osName = AccessController.doPrivileged( - new GetPropertyAction("os.name")); - - /* -- Miscellaneous SCTP utilities -- */ - - private static boolean IPv4MappedAddresses() { - if ("SunOS".equals(osName)) { - /* Solaris supports IPv4Mapped Addresses with bindx */ - return true; - } /* else { //other OS/implementations */ - - /* lksctp/linux requires Ipv4 addresses */ - return false; - } - - static boolean throwAlreadyBoundException() throws IOException { - throw new AlreadyBoundException(); - } - - static void listen(int fd, int backlog) throws IOException { - listen0(fd, backlog); - } - - static int connect(int fd, InetAddress remote, int remotePort) - throws IOException { - return connect0(fd, remote, remotePort); - } - - static void close(int fd) throws IOException { - close0(fd); - } - - static void preClose(int fd) throws IOException { - preClose0(fd); - } - - /** - * @param oneToOne - * if {@code true} returns a one-to-one sctp socket, otherwise - * returns a one-to-many sctp socket - */ - static FileDescriptor socket(boolean oneToOne) throws IOException { - int nativefd = socket0(oneToOne); - return IOUtil.newFD(nativefd); - } - - static void bindx(int fd, InetAddress[] addrs, int port, boolean add) - throws IOException { - bindx(fd, addrs, port, addrs.length, add, - IPv4MappedAddresses()); - } - - static Set<SocketAddress> getLocalAddresses(int fd) - throws IOException { - HashSet<SocketAddress> set = null; - SocketAddress[] saa = getLocalAddresses0(fd); - - if (saa != null) { - set = new HashSet<SocketAddress>(saa.length); - for (SocketAddress sa : saa) - set.add(sa); - } - - return set; - } - - static Set<SocketAddress> getRemoteAddresses(int fd, int assocId) - throws IOException { - HashSet<SocketAddress> set = null; - SocketAddress[] saa = getRemoteAddresses0(fd, assocId); - - if (saa != null) { - set = new HashSet<SocketAddress>(saa.length); - for (SocketAddress sa : saa) - set.add(sa); - } - - return set; - } - - static <T> void setSocketOption(int fd, - SctpSocketOption<T> name, - T value, - int assocId) - throws IOException { - if (value == null) - throw new IllegalArgumentException("Invalid option value"); - - if (name.equals(SCTP_INIT_MAXSTREAMS)) { - InitMaxStreams maxStreamValue = (InitMaxStreams)value; - SctpNet.setInitMsgOption0(fd, - maxStreamValue.maxInStreams(), maxStreamValue.maxOutStreams()); - } else if (name.equals(SCTP_PRIMARY_ADDR) || - name.equals(SCTP_SET_PEER_PRIMARY_ADDR)) { - - SocketAddress addr = (SocketAddress) value; - if (addr == null) - throw new IllegalArgumentException("Invalid option value"); - - Net.checkAddress(addr); - InetSocketAddress netAddr = (InetSocketAddress)addr; - - if (name.equals(SCTP_PRIMARY_ADDR)) { - setPrimAddrOption0(fd, - assocId, - netAddr.getAddress(), - netAddr.getPort()); - } else { - setPeerPrimAddrOption0(fd, - assocId, - netAddr.getAddress(), - netAddr.getPort(), - IPv4MappedAddresses()); - } - } else if (name.equals(SCTP_DISABLE_FRAGMENTS) || - name.equals(SCTP_EXPLICIT_COMPLETE) || - name.equals(SCTP_FRAGMENT_INTERLEAVE) || - name.equals(SCTP_NODELAY) || - name.equals(SO_SNDBUF) || - name.equals(SO_RCVBUF) || - name.equals(SO_LINGER)) { - setIntOption(fd, name, value); - } else { - throw new AssertionError("Unknown socket option"); - } - } - - static Object getSocketOption(int fd, SctpSocketOption<?> name, int assocId) - throws IOException { - if (name.equals(SCTP_SET_PEER_PRIMARY_ADDR)) { - throw new IllegalArgumentException( - "SCTP_SET_PEER_PRIMARY_ADDR cannot be retrieved"); - } else if (name.equals(SCTP_INIT_MAXSTREAMS)) { - /* container for holding maxIn/Out streams */ - int[] values = new int[2]; - SctpNet.getInitMsgOption0(fd, values); - return InitMaxStreams.create(values[0], values[1]); - } else if (name.equals(SCTP_PRIMARY_ADDR)) { - return getPrimAddrOption0(fd, assocId); - } else if (name.equals(SCTP_DISABLE_FRAGMENTS) || - name.equals(SCTP_EXPLICIT_COMPLETE) || - name.equals(SCTP_FRAGMENT_INTERLEAVE) || - name.equals(SCTP_NODELAY) || - name.equals(SO_SNDBUF) || - name.equals(SO_RCVBUF) || - name.equals(SO_LINGER)) { - return getIntOption(fd, name); - } else { - throw new AssertionError("Unknown socket option"); - } - } - - static void setIntOption(int fd, SctpSocketOption<?> name, Object value) - throws IOException { - if (value == null) - throw new IllegalArgumentException("Invalid option value"); - - Class<?> type = name.type(); - if (type != Integer.class && type != Boolean.class) - throw new AssertionError("Should not reach here"); - - if (name == SO_RCVBUF || - name == SO_SNDBUF) - { - int i = ((Integer)value).intValue(); - if (i < 0) - throw new IllegalArgumentException( - "Invalid send/receive buffer size"); - } else if (name == SO_LINGER) { - int i = ((Integer)value).intValue(); - if (i < 0) - value = Integer.valueOf(-1); - if (i > 65535) - value = Integer.valueOf(65535); - } else if (name.equals(SCTP_FRAGMENT_INTERLEAVE)) { - int i = ((Integer)value).intValue(); - if (i < 0 || i > 2) - throw new IllegalArgumentException( - "Invalid value for SCTP_FRAGMENT_INTERLEAVE"); - } - - int arg; - if (type == Integer.class) { - arg = ((Integer)value).intValue(); - } else { - boolean b = ((Boolean)value).booleanValue(); - arg = (b) ? 1 : 0; - } - - setIntOption0(fd, ((SctpStdSocketOption)name).constValue(), arg); - } - - static Object getIntOption(int fd, SctpSocketOption<?> name) - throws IOException { - Class<?> type = name.type(); - - if (type != Integer.class && type != Boolean.class) - throw new AssertionError("Should not reach here"); - - if (!(name instanceof SctpStdSocketOption)) - throw new AssertionError("Should not reach here"); - - int value = getIntOption0(fd, - ((SctpStdSocketOption)name).constValue()); - - if (type == Integer.class) { - return Integer.valueOf(value); - } else { - return (value == 0) ? Boolean.FALSE : Boolean.TRUE; - } - } - - static void shutdown(int fd, int assocId) - throws IOException { - shutdown0(fd, assocId); - } - - static FileDescriptor branch(int fd, int assocId) throws IOException { - int nativefd = branch0(fd, assocId); - return IOUtil.newFD(nativefd); - } - - /* Native Methods */ - static native int socket0(boolean oneToOne) throws IOException; - - static native void listen0(int fd, int backlog) throws IOException; - - static native int connect0(int fd, InetAddress remote, int remotePort) - throws IOException; - - static native void close0(int fd) throws IOException; - - static native void preClose0(int fd) throws IOException; - - static native void bindx(int fd, InetAddress[] addrs, int port, int length, - boolean add, boolean preferIPv6) throws IOException; - - static native int getIntOption0(int fd, int opt) throws IOException; - - static native void setIntOption0(int fd, int opt, int arg) - throws IOException; - - static native SocketAddress[] getLocalAddresses0(int fd) throws IOException; - - static native SocketAddress[] getRemoteAddresses0(int fd, int assocId) - throws IOException; - - static native int branch0(int fd, int assocId) throws IOException; - - static native void setPrimAddrOption0(int fd, int assocId, InetAddress ia, - int port) throws IOException; - - static native void setPeerPrimAddrOption0(int fd, int assocId, - InetAddress ia, int port, boolean preferIPv6) throws IOException; - - static native SocketAddress getPrimAddrOption0(int fd, int assocId) - throws IOException; - - /* retVals [0] maxInStreams, [1] maxOutStreams */ - static native void getInitMsgOption0(int fd, int[] retVals) throws IOException; - - static native void setInitMsgOption0(int fd, int arg1, int arg2) - throws IOException; - - static native void shutdown0(int fd, int assocId); - - static native void init(); - - static { - init(); - } -} -
--- a/src/solaris/classes/sun/nio/ch/SctpNotification.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.Notification; - -/** - * All Notification implemenations MUST implement this interface to provide - * access to the native association identidier. - */ -interface SctpNotification extends Notification { - int assocId(); - void setAssociation(Association association); -}
--- a/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.SocketAddress; -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.PeerAddressChangeNotification; - -/** - * An implementation of PeerAddressChangeNotification - */ -public class SctpPeerAddrChange extends PeerAddressChangeNotification - implements SctpNotification -{ - /* static final ints so that they can be referenced from native */ - private final static int SCTP_ADDR_AVAILABLE = 1; - private final static int SCTP_ADDR_UNREACHABLE = 2; - private final static int SCTP_ADDR_REMOVED = 3; - private final static int SCTP_ADDR_ADDED = 4; - private final static int SCTP_ADDR_MADE_PRIM = 5; - private final static int SCTP_ADDR_CONFIRMED =6; - - private Association association; - - /* assocId is used to lookup the association before the notification is - * returned to user code */ - private int assocId; - private SocketAddress address; - private AddressChangeEvent event; - - /* Invoked from native */ - private SctpPeerAddrChange(int assocId, SocketAddress address, int intEvent) { - switch (intEvent) { - case SCTP_ADDR_AVAILABLE : - this.event = AddressChangeEvent.ADDR_AVAILABLE; - break; - case SCTP_ADDR_UNREACHABLE : - this.event = AddressChangeEvent.ADDR_UNREACHABLE; - break; - case SCTP_ADDR_REMOVED : - this.event = AddressChangeEvent.ADDR_REMOVED; - break; - case SCTP_ADDR_ADDED : - this.event = AddressChangeEvent.ADDR_ADDED; - break; - case SCTP_ADDR_MADE_PRIM : - this.event = AddressChangeEvent.ADDR_MADE_PRIMARY; - break; - case SCTP_ADDR_CONFIRMED : - this.event = AddressChangeEvent.ADDR_CONFIRMED; - break; - default: - throw new AssertionError("Unknown event type"); - } - this.assocId = assocId; - this.address = address; - } - - @Override - public int assocId() { - return assocId; - } - - @Override - public void setAssociation(Association association) { - this.association = association; - } - - @Override - public SocketAddress address() { - assert address != null; - return address; - } - - @Override - public Association association() { - assert association != null; - return association; - } - - @Override - public AddressChangeEvent event() { - assert event != null; - return event; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(super.toString()).append(" ["); - sb.append("Address: ").append(address); - sb.append(", Association:").append(association); - sb.append(", Event: ").append(event).append("]"); - return sb.toString(); - } -} -
--- a/src/solaris/classes/sun/nio/ch/SctpResultContainer.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -/** - * Wraps the actual message or notification so that it can be - * set and returned from the native receive implementation. - */ -public class SctpResultContainer { - /* static final ints so that they can be referenced from native */ - static final int NOTHING = 0; - static final int MESSAGE = 1; - static final int SEND_FAILED = 2; - static final int ASSOCIATION_CHANGED = 3; - static final int PEER_ADDRESS_CHANGED = 4; - static final int SHUTDOWN = 5; - - private Object value; - private int type; - - int type() { - return type; - } - - boolean hasSomething() { - return type() != NOTHING; - } - - boolean isNotification() { - return type() != MESSAGE && type() != NOTHING ? true : false; - } - - void clear() { - type = NOTHING; - value = null; - } - - SctpNotification notification() { - assert type() != MESSAGE && type() != NOTHING; - - return (SctpNotification) value; - } - - SctpMessageInfoImpl getMessageInfo() { - assert type() == MESSAGE; - - if (value instanceof SctpMessageInfoImpl) - return (SctpMessageInfoImpl) value; - - return null; - } - - SctpSendFailed getSendFailed() { - assert type() == SEND_FAILED; - - if (value instanceof SctpSendFailed) - return (SctpSendFailed) value; - - return null; - } - - SctpAssocChange getAssociationChanged() { - assert type() == ASSOCIATION_CHANGED; - - if (value instanceof SctpAssocChange) - return (SctpAssocChange) value; - - return null; - } - - SctpPeerAddrChange getPeerAddressChanged() { - assert type() == PEER_ADDRESS_CHANGED; - - if (value instanceof SctpPeerAddrChange) - return (SctpPeerAddrChange) value; - - return null; - } - - SctpShutdown getShutdown() { - assert type() == SHUTDOWN; - - if (value instanceof SctpShutdown) - return (SctpShutdown) value; - - return null; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("Type: "); - switch (type) { - case NOTHING: sb.append("NOTHING"); break; - case MESSAGE: sb.append("MESSAGE"); break; - case SEND_FAILED: sb.append("SEND FAILED"); break; - case ASSOCIATION_CHANGED: sb.append("ASSOCIATION CHANGE"); break; - case PEER_ADDRESS_CHANGED: sb.append("PEER ADDRESS CHANGE"); break; - case SHUTDOWN: sb.append("SHUTDOWN"); break; - default : sb.append("Unknown result type"); - } - sb.append(", Value: "); - sb.append((value == null) ? "null" : value.toString()); - return sb.toString(); - } -}
--- a/src/solaris/classes/sun/nio/ch/SctpSendFailed.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.nio.ByteBuffer; -import java.net.SocketAddress; -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.SendFailedNotification; - -/** - * An implementation of SendFailedNotification - */ -public class SctpSendFailed extends SendFailedNotification - implements SctpNotification -{ - private Association association; - /* assocId is used to lookup the association before the notification is - * returned to user code */ - private int assocId; - private SocketAddress address; - private ByteBuffer buffer; - private int errorCode; - private int streamNumber; - - /* Invoked from native */ - private SctpSendFailed(int assocId, - SocketAddress address, - ByteBuffer buffer, - int errorCode, - int streamNumber) { - this.assocId = assocId; - this.errorCode = errorCode; - this.streamNumber = streamNumber; - this.address = address; - this.buffer = buffer; - } - - @Override - public int assocId() { - return assocId; - } - - @Override - public void setAssociation(Association association) { - this.association = association; - } - - @Override - public Association association() { - /* may be null */ - return association; - } - - @Override - public SocketAddress address() { - assert address != null; - return address; - } - - @Override - public ByteBuffer buffer() { - assert buffer != null; - return buffer; - } - - @Override - public int errorCode() { - return errorCode; - } - - @Override - public int streamNumber() { - return streamNumber; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(super.toString()).append(" ["); - sb.append("Association:").append(association); - sb.append(", Address: ").append(address); - sb.append(", buffer: ").append(buffer); - sb.append(", errorCode: ").append(errorCode); - sb.append(", streamNumber: ").append(streamNumber); - sb.append("]"); - return sb.toString(); - } -}
--- a/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,425 +0,0 @@ -/* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.SocketAddress; -import java.net.InetSocketAddress; -import java.net.InetAddress; -import java.io.FileDescriptor; -import java.io.IOException; -import java.util.Collections; -import java.util.Set; -import java.util.HashSet; -import java.nio.channels.SelectionKey; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.NotYetBoundException; -import java.nio.channels.spi.SelectorProvider; -import com.sun.nio.sctp.IllegalUnbindException; -import com.sun.nio.sctp.SctpChannel; -import com.sun.nio.sctp.SctpServerChannel; -import com.sun.nio.sctp.SctpSocketOption; -import com.sun.nio.sctp.SctpStandardSocketOptions; - -/** - * An implementation of SctpServerChannel - */ -public class SctpServerChannelImpl extends SctpServerChannel - implements SelChImpl -{ - private final FileDescriptor fd; - - private final int fdVal; - - /* IDs of native thread doing accept, for signalling */ - private volatile long thread = 0; - - /* Lock held by thread currently blocked in this channel */ - private final Object lock = new Object(); - - /* Lock held by any thread that modifies the state fields declared below - * DO NOT invoke a blocking I/O operation while holding this lock! */ - private final Object stateLock = new Object(); - - private enum ChannelState { - UNINITIALIZED, - INUSE, - KILLPENDING, - KILLED, - } - /* -- The following fields are protected by stateLock -- */ - private ChannelState state = ChannelState.UNINITIALIZED; - - /* Binding: Once bound the port will remain constant. */ - int port = -1; - private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>(); - /* Has the channel been bound to the wildcard address */ - private boolean wildcard; /* false */ - - /* -- End of fields protected by stateLock -- */ - - /** - * Initializes a new instance of this class. - */ - public SctpServerChannelImpl(SelectorProvider provider) - throws IOException { - //TODO: update provider remove public modifier - super(provider); - this.fd = SctpNet.socket(true); - this.fdVal = IOUtil.fdVal(fd); - this.state = ChannelState.INUSE; - } - - @Override - public SctpServerChannel bind(SocketAddress local, int backlog) - throws IOException { - synchronized (lock) { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (isBound()) - SctpNet.throwAlreadyBoundException(); - - InetSocketAddress isa = (local == null) ? - new InetSocketAddress(0) : Net.checkAddress(local); - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkListen(isa.getPort()); - Net.bind(fd, isa.getAddress(), isa.getPort()); - - InetSocketAddress boundIsa = Net.localAddress(fd); - port = boundIsa.getPort(); - localAddresses.add(isa); - if (isa.getAddress().isAnyLocalAddress()) - wildcard = true; - - SctpNet.listen(fdVal, backlog < 1 ? 50 : backlog); - } - } - return this; - } - - @Override - public SctpServerChannel bindAddress(InetAddress address) - throws IOException { - return bindUnbindAddress(address, true); - } - - @Override - public SctpServerChannel unbindAddress(InetAddress address) - throws IOException { - return bindUnbindAddress(address, false); - } - - private SctpServerChannel bindUnbindAddress(InetAddress address, boolean add) - throws IOException { - if (address == null) - throw new IllegalArgumentException(); - - synchronized (lock) { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - throw new NotYetBoundException(); - if (wildcard) - throw new IllegalStateException( - "Cannot add or remove addresses from a channel that is bound to the wildcard address"); - if (address.isAnyLocalAddress()) - throw new IllegalArgumentException( - "Cannot add or remove the wildcard address"); - if (add) { - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - SctpNet.throwAlreadyBoundException(); - } - } - } else { /*removing */ - /* Verify that there is more than one address - * and that address is already bound */ - if (localAddresses.size() <= 1) - throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound"); - boolean foundAddress = false; - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - foundAddress = true; - break; - } - } - if (!foundAddress ) - throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address"); - } - - SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add); - - /* Update our internal Set to reflect the addition/removal */ - if (add) - localAddresses.add(new InetSocketAddress(address, port)); - else { - for (InetSocketAddress addr : localAddresses) { - if (addr.getAddress().equals(address)) { - localAddresses.remove(addr); - break; - } - } - } - } - } - return this; - } - - private boolean isBound() { - synchronized (stateLock) { - return port == -1 ? false : true; - } - } - - private void acceptCleanup() throws IOException { - synchronized (stateLock) { - thread = 0; - if (state == ChannelState.KILLPENDING) - kill(); - } - } - - @Override - public SctpChannel accept() throws IOException { - synchronized (lock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - throw new NotYetBoundException(); - SctpChannel sc = null; - - int n = 0; - FileDescriptor newfd = new FileDescriptor(); - InetSocketAddress[] isaa = new InetSocketAddress[1]; - - try { - begin(); - if (!isOpen()) - return null; - thread = NativeThread.current(); - for (;;) { - n = accept0(fd, newfd, isaa); - if ((n == IOStatus.INTERRUPTED) && isOpen()) - continue; - break; - } - } finally { - acceptCleanup(); - end(n > 0); - assert IOStatus.check(n); - } - - if (n < 1) - return null; - - IOUtil.configureBlocking(newfd, true); - InetSocketAddress isa = isaa[0]; - sc = new SctpChannelImpl(provider(), newfd); - - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkAccept(isa.getAddress().getHostAddress(), - isa.getPort()); - - return sc; - } - } - - @Override - protected void implConfigureBlocking(boolean block) throws IOException { - IOUtil.configureBlocking(fd, block); - } - - @Override - public void implCloseSelectableChannel() throws IOException { - synchronized (stateLock) { - SctpNet.preClose(fdVal); - if (thread != 0) - NativeThread.signal(thread); - if (!isRegistered()) - kill(); - } - } - - @Override - public void kill() throws IOException { - synchronized (stateLock) { - if (state == ChannelState.KILLED) - return; - if (state == ChannelState.UNINITIALIZED) { - state = ChannelState.KILLED; - return; - } - assert !isOpen() && !isRegistered(); - - // Postpone the kill if there is a thread in accept - if (thread == 0) { - SctpNet.close(fdVal); - state = ChannelState.KILLED; - } else { - state = ChannelState.KILLPENDING; - } - } - } - - @Override - public FileDescriptor getFD() { - return fd; - } - - @Override - public int getFDVal() { - return fdVal; - } - - /** - * Translates native poll revent ops into a ready operation ops - */ - private boolean translateReadyOps(int ops, int initialOps, - SelectionKeyImpl sk) { - int intOps = sk.nioInterestOps(); - int oldOps = sk.nioReadyOps(); - int newOps = initialOps; - - if ((ops & PollArrayWrapper.POLLNVAL) != 0) { - /* This should only happen if this channel is pre-closed while a - * selection operation is in progress - * ## Throw an error if this channel has not been pre-closed */ - return false; - } - - if ((ops & (PollArrayWrapper.POLLERR - | PollArrayWrapper.POLLHUP)) != 0) { - newOps = intOps; - sk.nioReadyOps(newOps); - return (newOps & ~oldOps) != 0; - } - - if (((ops & PollArrayWrapper.POLLIN) != 0) && - ((intOps & SelectionKey.OP_ACCEPT) != 0)) - newOps |= SelectionKey.OP_ACCEPT; - - sk.nioReadyOps(newOps); - return (newOps & ~oldOps) != 0; - } - - @Override - public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) { - return translateReadyOps(ops, sk.nioReadyOps(), sk); - } - - @Override - public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) { - return translateReadyOps(ops, 0, sk); - } - - @Override - public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) { - int newOps = 0; - - /* Translate ops */ - if ((ops & SelectionKey.OP_ACCEPT) != 0) - newOps |= PollArrayWrapper.POLLIN; - /* Place ops into pollfd array */ - sk.selector.putEventOps(sk, newOps); - - } - - @Override - public <T> SctpServerChannel setOption(SctpSocketOption<T> name, T value) - throws IOException { - if (name == null) - throw new NullPointerException(); - if (!supportedOptions().contains(name)) - throw new UnsupportedOperationException("'" + name + "' not supported"); - - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - - SctpNet.setSocketOption(fdVal, name, value, 0 /*oneToOne*/); - return this; - } - } - - @Override - @SuppressWarnings("unchecked") - public <T> T getOption(SctpSocketOption<T> name) throws IOException { - if (name == null) - throw new NullPointerException(); - if (!supportedOptions().contains(name)) - throw new UnsupportedOperationException("'" + name + "' not supported"); - - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - - return (T) SctpNet.getSocketOption(fdVal, name, 0 /*oneToOne*/); - } - } - - private static class DefaultOptionsHolder { - static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions(); - - private static Set<SctpSocketOption<?>> defaultOptions() { - HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(1); - set.add(SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS); - return Collections.unmodifiableSet(set); - } - } - - @Override - public final Set<SctpSocketOption<?>> supportedOptions() { - return DefaultOptionsHolder.defaultOptions; - } - - @Override - public Set<SocketAddress> getAllLocalAddresses() - throws IOException { - synchronized (stateLock) { - if (!isOpen()) - throw new ClosedChannelException(); - if (!isBound()) - return Collections.emptySet(); - - return SctpNet.getLocalAddresses(fdVal); - } - } - - /* Native */ - private static native void initIDs(); - - private static native int accept0(FileDescriptor ssfd, - FileDescriptor newfd, InetSocketAddress[] isaa) throws IOException; - - static { - Util.load(); // loads nio & net native libraries - java.security.AccessController.doPrivileged( - new sun.security.action.LoadLibraryAction("sctp")); - initIDs(); - } -}
--- a/src/solaris/classes/sun/nio/ch/SctpShutdown.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.ShutdownNotification; - -/** - * An implementation of ShutdownNotification - */ -public class SctpShutdown extends ShutdownNotification - implements SctpNotification -{ - private Association association; - /* assocId is used to lookup the association before the notification is - * returned to user code */ - private int assocId; - - /* Invoked from native */ - private SctpShutdown(int assocId) { - this.assocId = assocId; - } - - @Override - public int assocId() { - return assocId; - } - - @Override - public void setAssociation(Association association) { - this.association = association; - } - - @Override - public Association association() { - assert association != null; - return association; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(super.toString()).append(" ["); - sb.append("Association:").append(association).append("]"); - return sb.toString(); - } -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.AssociationChangeNotification; + +/** + * An implementation of AssociationChangeNotification + */ +public class AssociationChange extends AssociationChangeNotification + implements SctpNotification +{ + /* static final ints so that they can be referenced from native */ + private final static int SCTP_COMM_UP = 1; + private final static int SCTP_COMM_LOST = 2; + private final static int SCTP_RESTART = 3; + private final static int SCTP_SHUTDOWN = 4; + private final static int SCTP_CANT_START = 5; + + private Association association; + + /* assocId is used to lookup the association before the notification is + * returned to user code */ + private int assocId; + private AssocChangeEvent event; + private int maxOutStreams; + private int maxInStreams; + + /* Invoked from native */ + private AssociationChange(int assocId, + int intEvent, + int maxOutStreams, + int maxInStreams) { + switch (intEvent) { + case SCTP_COMM_UP : + this.event = AssocChangeEvent.COMM_UP; + break; + case SCTP_COMM_LOST : + this.event = AssocChangeEvent.COMM_LOST; + break; + case SCTP_RESTART : + this.event = AssocChangeEvent.RESTART; + break; + case SCTP_SHUTDOWN : + this.event = AssocChangeEvent.SHUTDOWN; + break; + case SCTP_CANT_START : + this.event = AssocChangeEvent.CANT_START; + break; + default : + throw new AssertionError( + "Unknown Association Change Event type: " + intEvent); + } + + this.assocId = assocId; + this.maxOutStreams = maxOutStreams; + this.maxInStreams = maxInStreams; + } + + @Override + public int assocId() { + return assocId; + } + + @Override + public void setAssociation(Association association) { + this.association = association; + } + + @Override + public Association association() { + assert association != null; + return association; + } + + @Override + public AssocChangeEvent event() { + return event; + } + + int maxOutStreams() { + return maxOutStreams; + } + + int maxInStreams() { + return maxInStreams; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(super.toString()).append(" ["); + sb.append("Association:").append(association); + sb.append(", Event: ").append(event).append("]"); + return sb.toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/AssociationImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import com.sun.nio.sctp.Association; + +/** + * An implementation of Association + */ +public class AssociationImpl extends Association { + public AssociationImpl(int associationID, + int maxInStreams, + int maxOutStreams) { + super(associationID, maxInStreams, maxOutStreams); + } + + @Override + public String toString() { + StringBuffer sb = new StringBuffer(super.toString()); + return sb.append("[associationID:") + .append(associationID()) + .append(", maxIn:") + .append(maxInboundStreams()) + .append(", maxOut:") + .append(maxOutboundStreams()) + .append("]") + .toString(); + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.SocketAddress; +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.PeerAddressChangeNotification; + +/** + * An implementation of PeerAddressChangeNotification + */ +public class PeerAddrChange extends PeerAddressChangeNotification + implements SctpNotification +{ + /* static final ints so that they can be referenced from native */ + private final static int SCTP_ADDR_AVAILABLE = 1; + private final static int SCTP_ADDR_UNREACHABLE = 2; + private final static int SCTP_ADDR_REMOVED = 3; + private final static int SCTP_ADDR_ADDED = 4; + private final static int SCTP_ADDR_MADE_PRIM = 5; + private final static int SCTP_ADDR_CONFIRMED =6; + + private Association association; + + /* assocId is used to lookup the association before the notification is + * returned to user code */ + private int assocId; + private SocketAddress address; + private AddressChangeEvent event; + + /* Invoked from native */ + private PeerAddrChange(int assocId, SocketAddress address, int intEvent) { + switch (intEvent) { + case SCTP_ADDR_AVAILABLE : + this.event = AddressChangeEvent.ADDR_AVAILABLE; + break; + case SCTP_ADDR_UNREACHABLE : + this.event = AddressChangeEvent.ADDR_UNREACHABLE; + break; + case SCTP_ADDR_REMOVED : + this.event = AddressChangeEvent.ADDR_REMOVED; + break; + case SCTP_ADDR_ADDED : + this.event = AddressChangeEvent.ADDR_ADDED; + break; + case SCTP_ADDR_MADE_PRIM : + this.event = AddressChangeEvent.ADDR_MADE_PRIMARY; + break; + case SCTP_ADDR_CONFIRMED : + this.event = AddressChangeEvent.ADDR_CONFIRMED; + break; + default: + throw new AssertionError("Unknown event type"); + } + this.assocId = assocId; + this.address = address; + } + + @Override + public int assocId() { + return assocId; + } + + @Override + public void setAssociation(Association association) { + this.association = association; + } + + @Override + public SocketAddress address() { + assert address != null; + return address; + } + + @Override + public Association association() { + assert association != null; + return association; + } + + @Override + public AddressChangeEvent event() { + assert event != null; + return event; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(super.toString()).append(" ["); + sb.append("Address: ").append(address); + sb.append(", Association:").append(association); + sb.append(", Event: ").append(event).append("]"); + return sb.toString(); + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +/** + * Wraps the actual message or notification so that it can be + * set and returned from the native receive implementation. + */ +public class ResultContainer { + /* static final ints so that they can be referenced from native */ + static final int NOTHING = 0; + static final int MESSAGE = 1; + static final int SEND_FAILED = 2; + static final int ASSOCIATION_CHANGED = 3; + static final int PEER_ADDRESS_CHANGED = 4; + static final int SHUTDOWN = 5; + + private Object value; + private int type; + + int type() { + return type; + } + + boolean hasSomething() { + return type() != NOTHING; + } + + boolean isNotification() { + return type() != MESSAGE && type() != NOTHING ? true : false; + } + + void clear() { + type = NOTHING; + value = null; + } + + SctpNotification notification() { + assert type() != MESSAGE && type() != NOTHING; + + return (SctpNotification) value; + } + + MessageInfoImpl getMessageInfo() { + assert type() == MESSAGE; + + if (value instanceof MessageInfoImpl) + return (MessageInfoImpl) value; + + return null; + } + + SendFailed getSendFailed() { + assert type() == SEND_FAILED; + + if (value instanceof SendFailed) + return (SendFailed) value; + + return null; + } + + AssociationChange getAssociationChanged() { + assert type() == ASSOCIATION_CHANGED; + + if (value instanceof AssociationChange) + return (AssociationChange) value; + + return null; + } + + PeerAddrChange getPeerAddressChanged() { + assert type() == PEER_ADDRESS_CHANGED; + + if (value instanceof PeerAddrChange) + return (PeerAddrChange) value; + + return null; + } + + Shutdown getShutdown() { + assert type() == SHUTDOWN; + + if (value instanceof Shutdown) + return (Shutdown) value; + + return null; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("Type: "); + switch (type) { + case NOTHING: sb.append("NOTHING"); break; + case MESSAGE: sb.append("MESSAGE"); break; + case SEND_FAILED: sb.append("SEND FAILED"); break; + case ASSOCIATION_CHANGED: sb.append("ASSOCIATION CHANGE"); break; + case PEER_ADDRESS_CHANGED: sb.append("PEER ADDRESS CHANGE"); break; + case SHUTDOWN: sb.append("SHUTDOWN"); break; + default : sb.append("Unknown result type"); + } + sb.append(", Value: "); + sb.append((value == null) ? "null" : value.toString()); + return sb.toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,1106 @@ +/* + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.InetAddress; +import java.net.SocketAddress; +import java.net.SocketException; +import java.net.InetSocketAddress; +import java.io.FileDescriptor; +import java.io.IOException; +import java.util.Collections; +import java.util.Set; +import java.util.HashSet; +import java.nio.ByteBuffer; +import java.nio.channels.SelectionKey; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.ConnectionPendingException; +import java.nio.channels.NoConnectionPendingException; +import java.nio.channels.AlreadyConnectedException; +import java.nio.channels.NotYetBoundException; +import java.nio.channels.NotYetConnectedException; +import java.nio.channels.spi.SelectorProvider; +import com.sun.nio.sctp.AbstractNotificationHandler; +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.AssociationChangeNotification; +import com.sun.nio.sctp.HandlerResult; +import com.sun.nio.sctp.IllegalReceiveException; +import com.sun.nio.sctp.InvalidStreamException; +import com.sun.nio.sctp.IllegalUnbindException; +import com.sun.nio.sctp.MessageInfo; +import com.sun.nio.sctp.NotificationHandler; +import com.sun.nio.sctp.SctpChannel; +import com.sun.nio.sctp.SctpSocketOption; +import sun.nio.ch.DirectBuffer; +import sun.nio.ch.IOStatus; +import sun.nio.ch.IOUtil; +import sun.nio.ch.NativeThread; +import sun.nio.ch.Net; +import sun.nio.ch.PollArrayWrapper; +import sun.nio.ch.SelChImpl; +import sun.nio.ch.SelectionKeyImpl; +import sun.nio.ch.Util; +import static com.sun.nio.sctp.SctpStandardSocketOptions.*; +import static sun.nio.ch.sctp.ResultContainer.SEND_FAILED; +import static sun.nio.ch.sctp.ResultContainer.ASSOCIATION_CHANGED; +import static sun.nio.ch.sctp.ResultContainer.PEER_ADDRESS_CHANGED; +import static sun.nio.ch.sctp.ResultContainer.SHUTDOWN; + +/** + * An implementation of an SctpChannel + */ +public class SctpChannelImpl extends SctpChannel + implements SelChImpl +{ + private final FileDescriptor fd; + + private final int fdVal; + + /* IDs of native threads doing send and receivess, for signalling */ + private volatile long receiverThread = 0; + private volatile long senderThread = 0; + + /* Lock held by current receiving or connecting thread */ + private final Object receiveLock = new Object(); + + /* Lock held by current sending or connecting thread */ + private final Object sendLock = new Object(); + + private final ThreadLocal<Boolean> receiveInvoked = + new ThreadLocal<Boolean>() { + @Override protected Boolean initialValue() { + return Boolean.FALSE; + } + }; + + /* Lock held by any thread that modifies the state fields declared below + DO NOT invoke a blocking I/O operation while holding this lock! */ + private final Object stateLock = new Object(); + + private enum ChannelState { + UNINITIALIZED, + UNCONNECTED, + PENDING, + CONNECTED, + KILLPENDING, + KILLED, + } + /* -- The following fields are protected by stateLock -- */ + private ChannelState state = ChannelState.UNINITIALIZED; + + /* Binding; Once bound the port will remain constant. */ + int port = -1; + private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>(); + /* Has the channel been bound to the wildcard address */ + private boolean wildcard; /* false */ + //private InetSocketAddress remoteAddress = null; + + /* Input/Output open */ + private boolean readyToConnect; + + /* Shutdown */ + private boolean isShutdown; + + private Association association; + + private Set<SocketAddress> remoteAddresses = Collections.emptySet(); + + /* -- End of fields protected by stateLock -- */ + + /** + * Constructor for normal connecting sockets + */ + public SctpChannelImpl(SelectorProvider provider) throws IOException { + //TODO: update provider remove public modifier + super(provider); + this.fd = SctpNet.socket(true); + this.fdVal = IOUtil.fdVal(fd); + this.state = ChannelState.UNCONNECTED; + } + + /** + * Constructor for sockets obtained from server sockets + */ + public SctpChannelImpl(SelectorProvider provider, FileDescriptor fd) + throws IOException { + this(provider, fd, null); + } + + /** + * Constructor for sockets obtained from branching + */ + public SctpChannelImpl(SelectorProvider provider, + FileDescriptor fd, + Association association) + throws IOException { + super(provider); + this.fd = fd; + this.fdVal = IOUtil.fdVal(fd); + this.state = ChannelState.CONNECTED; + port = (Net.localAddress(fd)).getPort(); + + if (association != null) { /* branched */ + this.association = association; + } else { /* obtained from server channel */ + /* Receive COMM_UP */ + ByteBuffer buf = Util.getTemporaryDirectBuffer(50); + try { + receive(buf, null, null, true); + } finally { + Util.releaseTemporaryDirectBuffer(buf); + } + } + } + + /** + * Binds the channel's socket to a local address. + */ + @Override + public SctpChannel bind(SocketAddress local) throws IOException { + synchronized (receiveLock) { + synchronized (sendLock) { + synchronized (stateLock) { + ensureOpenAndUnconnected(); + if (isBound()) + SctpNet.throwAlreadyBoundException(); + InetSocketAddress isa = (local == null) ? + new InetSocketAddress(0) : Net.checkAddress(local); + Net.bind(fd, isa.getAddress(), isa.getPort()); + InetSocketAddress boundIsa = Net.localAddress(fd); + port = boundIsa.getPort(); + localAddresses.add(isa); + if (isa.getAddress().isAnyLocalAddress()) + wildcard = true; + } + } + } + return this; + } + + @Override + public SctpChannel bindAddress(InetAddress address) + throws IOException { + bindUnbindAddress(address, true); + localAddresses.add(new InetSocketAddress(address, port)); + return this; + } + + @Override + public SctpChannel unbindAddress(InetAddress address) + throws IOException { + bindUnbindAddress(address, false); + localAddresses.remove(new InetSocketAddress(address, port)); + return this; + } + + private SctpChannel bindUnbindAddress(InetAddress address, boolean add) + throws IOException { + if (address == null) + throw new IllegalArgumentException(); + + synchronized (receiveLock) { + synchronized (sendLock) { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + throw new NotYetBoundException(); + if (wildcard) + throw new IllegalStateException( + "Cannot add or remove addresses from a channel that is bound to the wildcard address"); + if (address.isAnyLocalAddress()) + throw new IllegalArgumentException( + "Cannot add or remove the wildcard address"); + if (add) { + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + SctpNet.throwAlreadyBoundException(); + } + } + } else { /*removing */ + /* Verify that there is more than one address + * and that address is already bound */ + if (localAddresses.size() <= 1) + throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound"); + boolean foundAddress = false; + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + foundAddress = true; + break; + } + } + if (!foundAddress ) + throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address"); + } + + SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add); + + /* Update our internal Set to reflect the addition/removal */ + if (add) + localAddresses.add(new InetSocketAddress(address, port)); + else { + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + localAddresses.remove(addr); + break; + } + } + } + } + } + } + return this; + } + + private boolean isBound() { + synchronized (stateLock) { + return port == -1 ? false : true; + } + } + + private boolean isConnected() { + synchronized (stateLock) { + return (state == ChannelState.CONNECTED); + } + } + + private void ensureOpenAndUnconnected() throws IOException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (isConnected()) + throw new AlreadyConnectedException(); + if (state == ChannelState.PENDING) + throw new ConnectionPendingException(); + } + } + + private boolean ensureReceiveOpen() throws ClosedChannelException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isConnected()) + throw new NotYetConnectedException(); + else + return true; + } + } + + private void ensureSendOpen() throws ClosedChannelException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (isShutdown) + throw new ClosedChannelException(); + if (!isConnected()) + throw new NotYetConnectedException(); + } + } + + private void receiverCleanup() throws IOException { + synchronized (stateLock) { + receiverThread = 0; + if (state == ChannelState.KILLPENDING) + kill(); + } + } + + private void senderCleanup() throws IOException { + synchronized (stateLock) { + senderThread = 0; + if (state == ChannelState.KILLPENDING) + kill(); + } + } + + @Override + public Association association() throws ClosedChannelException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isConnected()) + return null; + + return association; + } + } + + @Override + public boolean connect(SocketAddress endpoint) throws IOException { + synchronized (receiveLock) { + synchronized (sendLock) { + ensureOpenAndUnconnected(); + InetSocketAddress isa = Net.checkAddress(endpoint); + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkConnect(isa.getAddress().getHostAddress(), + isa.getPort()); + synchronized (blockingLock()) { + int n = 0; + try { + try { + begin(); + synchronized (stateLock) { + if (!isOpen()) { + return false; + } + receiverThread = NativeThread.current(); + } + for (;;) { + InetAddress ia = isa.getAddress(); + if (ia.isAnyLocalAddress()) + ia = InetAddress.getLocalHost(); + n = SctpNet.connect(fdVal, ia, isa.getPort()); + if ( (n == IOStatus.INTERRUPTED) + && isOpen()) + continue; + break; + } + } finally { + receiverCleanup(); + end((n > 0) || (n == IOStatus.UNAVAILABLE)); + assert IOStatus.check(n); + } + } catch (IOException x) { + /* If an exception was thrown, close the channel after + * invoking end() so as to avoid bogus + * AsynchronousCloseExceptions */ + close(); + throw x; + } + + if (n > 0) { + synchronized (stateLock) { + /* Connection succeeded */ + state = ChannelState.CONNECTED; + if (!isBound()) { + InetSocketAddress boundIsa = + Net.localAddress(fd); + port = boundIsa.getPort(); + } + + /* Receive COMM_UP */ + ByteBuffer buf = Util.getTemporaryDirectBuffer(50); + try { + receive(buf, null, null, true); + } finally { + Util.releaseTemporaryDirectBuffer(buf); + } + + /* cache remote addresses */ + try { + remoteAddresses = getRemoteAddresses(); + } catch (IOException unused) { /* swallow exception */ } + + return true; + } + } else { + synchronized (stateLock) { + /* If nonblocking and no exception then connection + * pending; disallow another invocation */ + if (!isBlocking()) + state = ChannelState.PENDING; + else + assert false; + } + } + } + return false; + } + } + } + + @Override + public boolean connect(SocketAddress endpoint, + int maxOutStreams, + int maxInStreams) + throws IOException { + ensureOpenAndUnconnected(); + return setOption(SCTP_INIT_MAXSTREAMS, InitMaxStreams. + create(maxInStreams, maxOutStreams)).connect(endpoint); + + } + + @Override + public boolean isConnectionPending() { + synchronized (stateLock) { + return (state == ChannelState.PENDING); + } + } + + @Override + public boolean finishConnect() throws IOException { + synchronized (receiveLock) { + synchronized (sendLock) { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (isConnected()) + return true; + if (state != ChannelState.PENDING) + throw new NoConnectionPendingException(); + } + int n = 0; + try { + try { + begin(); + synchronized (blockingLock()) { + synchronized (stateLock) { + if (!isOpen()) { + return false; + } + receiverThread = NativeThread.current(); + } + if (!isBlocking()) { + for (;;) { + n = checkConnect(fd, false, readyToConnect); + if ( (n == IOStatus.INTERRUPTED) + && isOpen()) + continue; + break; + } + } else { + for (;;) { + n = checkConnect(fd, true, readyToConnect); + if (n == 0) { + // Loop in case of + // spurious notifications + continue; + } + if ( (n == IOStatus.INTERRUPTED) + && isOpen()) + continue; + break; + } + } + } + } finally { + synchronized (stateLock) { + receiverThread = 0; + if (state == ChannelState.KILLPENDING) { + kill(); + /* poll()/getsockopt() does not report + * error (throws exception, with n = 0) + * on Linux platform after dup2 and + * signal-wakeup. Force n to 0 so the + * end() can throw appropriate exception */ + n = 0; + } + } + end((n > 0) || (n == IOStatus.UNAVAILABLE)); + assert IOStatus.check(n); + } + } catch (IOException x) { + /* If an exception was thrown, close the channel after + * invoking end() so as to avoid bogus + * AsynchronousCloseExceptions */ + close(); + throw x; + } + + if (n > 0) { + synchronized (stateLock) { + state = ChannelState.CONNECTED; + if (!isBound()) { + InetSocketAddress boundIsa = + Net.localAddress(fd); + port = boundIsa.getPort(); + } + + /* Receive COMM_UP */ + ByteBuffer buf = Util.getTemporaryDirectBuffer(50); + try { + receive(buf, null, null, true); + } finally { + Util.releaseTemporaryDirectBuffer(buf); + } + + /* cache remote addresses */ + try { + remoteAddresses = getRemoteAddresses(); + } catch (IOException unused) { /* swallow exception */ } + + return true; + } + } + } + } + return false; + } + + @Override + protected void implConfigureBlocking(boolean block) throws IOException { + IOUtil.configureBlocking(fd, block); + } + + @Override + public void implCloseSelectableChannel() throws IOException { + synchronized (stateLock) { + SctpNet.preClose(fdVal); + + if (receiverThread != 0) + NativeThread.signal(receiverThread); + + if (senderThread != 0) + NativeThread.signal(senderThread); + + if (!isRegistered()) + kill(); + } + } + + @Override + public FileDescriptor getFD() { + return fd; + } + + @Override + public int getFDVal() { + return fdVal; + } + + /** + * Translates native poll revent ops into a ready operation ops + */ + private boolean translateReadyOps(int ops, int initialOps, SelectionKeyImpl sk) { + int intOps = sk.nioInterestOps(); + int oldOps = sk.nioReadyOps(); + int newOps = initialOps; + + if ((ops & PollArrayWrapper.POLLNVAL) != 0) { + /* This should only happen if this channel is pre-closed while a + * selection operation is in progress + * ## Throw an error if this channel has not been pre-closed */ + return false; + } + + if ((ops & (PollArrayWrapper.POLLERR + | PollArrayWrapper.POLLHUP)) != 0) { + newOps = intOps; + sk.nioReadyOps(newOps); + /* No need to poll again in checkConnect, + * the error will be detected there */ + readyToConnect = true; + return (newOps & ~oldOps) != 0; + } + + if (((ops & PollArrayWrapper.POLLIN) != 0) && + ((intOps & SelectionKey.OP_READ) != 0) && + isConnected()) + newOps |= SelectionKey.OP_READ; + + if (((ops & PollArrayWrapper.POLLCONN) != 0) && + ((intOps & SelectionKey.OP_CONNECT) != 0) && + ((state == ChannelState.UNCONNECTED) || (state == ChannelState.PENDING))) { + newOps |= SelectionKey.OP_CONNECT; + readyToConnect = true; + } + + if (((ops & PollArrayWrapper.POLLOUT) != 0) && + ((intOps & SelectionKey.OP_WRITE) != 0) && + isConnected()) + newOps |= SelectionKey.OP_WRITE; + + sk.nioReadyOps(newOps); + return (newOps & ~oldOps) != 0; + } + + @Override + public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) { + return translateReadyOps(ops, sk.nioReadyOps(), sk); + } + + @Override + @SuppressWarnings("all") + public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) { + return translateReadyOps(ops, 0, sk); + } + + @Override + public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) { + int newOps = 0; + if ((ops & SelectionKey.OP_READ) != 0) + newOps |= PollArrayWrapper.POLLIN; + if ((ops & SelectionKey.OP_WRITE) != 0) + newOps |= PollArrayWrapper.POLLOUT; + if ((ops & SelectionKey.OP_CONNECT) != 0) + newOps |= PollArrayWrapper.POLLCONN; + sk.selector.putEventOps(sk, newOps); + } + + @Override + public void kill() throws IOException { + synchronized (stateLock) { + if (state == ChannelState.KILLED) + return; + if (state == ChannelState.UNINITIALIZED) { + state = ChannelState.KILLED; + return; + } + assert !isOpen() && !isRegistered(); + + /* Postpone the kill if there is a waiting reader + * or writer thread. */ + if (receiverThread == 0 && senderThread == 0) { + SctpNet.close(fdVal); + state = ChannelState.KILLED; + } else { + state = ChannelState.KILLPENDING; + } + } + } + + @Override + public <T> SctpChannel setOption(SctpSocketOption<T> name, T value) + throws IOException { + if (name == null) + throw new NullPointerException(); + if (!supportedOptions().contains(name)) + throw new UnsupportedOperationException("'" + name + "' not supported"); + + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + + SctpNet.setSocketOption(fdVal, name, value, 0 /*oneToOne*/); + } + return this; + } + + @Override + @SuppressWarnings("unchecked") + public <T> T getOption(SctpSocketOption<T> name) throws IOException { + if (name == null) + throw new NullPointerException(); + if (!supportedOptions().contains(name)) + throw new UnsupportedOperationException("'" + name + "' not supported"); + + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + + return (T)SctpNet.getSocketOption(fdVal, name, 0 /*oneToOne*/); + } + } + + private static class DefaultOptionsHolder { + static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions(); + + private static Set<SctpSocketOption<?>> defaultOptions() { + HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(10); + set.add(SCTP_DISABLE_FRAGMENTS); + set.add(SCTP_EXPLICIT_COMPLETE); + set.add(SCTP_FRAGMENT_INTERLEAVE); + set.add(SCTP_INIT_MAXSTREAMS); + set.add(SCTP_NODELAY); + set.add(SCTP_PRIMARY_ADDR); + set.add(SCTP_SET_PEER_PRIMARY_ADDR); + set.add(SO_SNDBUF); + set.add(SO_RCVBUF); + set.add(SO_LINGER); + return Collections.unmodifiableSet(set); + } + } + + @Override + public final Set<SctpSocketOption<?>> supportedOptions() { + return DefaultOptionsHolder.defaultOptions; + } + + @Override + public <T> MessageInfo receive(ByteBuffer buffer, + T attachment, + NotificationHandler<T> handler) + throws IOException { + return receive(buffer, attachment, handler, false); + } + + private <T> MessageInfo receive(ByteBuffer buffer, + T attachment, + NotificationHandler<T> handler, + boolean fromConnect) + throws IOException { + if (buffer == null) + throw new IllegalArgumentException("buffer cannot be null"); + + if (buffer.isReadOnly()) + throw new IllegalArgumentException("Read-only buffer"); + + if (receiveInvoked.get()) + throw new IllegalReceiveException( + "cannot invoke receive from handler"); + receiveInvoked.set(Boolean.TRUE); + + try { + ResultContainer resultContainer = new ResultContainer(); + do { + resultContainer.clear(); + synchronized (receiveLock) { + if (!ensureReceiveOpen()) + return null; + + int n = 0; + try { + begin(); + + synchronized (stateLock) { + if(!isOpen()) + return null; + receiverThread = NativeThread.current(); + } + + do { + n = receive(fdVal, buffer, resultContainer, fromConnect); + } while ((n == IOStatus.INTERRUPTED) && isOpen()); + } finally { + receiverCleanup(); + end((n > 0) || (n == IOStatus.UNAVAILABLE)); + assert IOStatus.check(n); + } + + if (!resultContainer.isNotification()) { + /* message or nothing */ + if (resultContainer.hasSomething()) { + /* Set the association before returning */ + MessageInfoImpl info = + resultContainer.getMessageInfo(); + synchronized (stateLock) { + assert association != null; + info.setAssociation(association); + } + return info; + } else + /* Non-blocking may return null if nothing available*/ + return null; + } else { /* notification */ + synchronized (stateLock) { + handleNotificationInternal( + resultContainer); + } + } + + if (fromConnect) { + /* If we reach here, then it was connect that invoked + * receive and received the COMM_UP. We have already + * handled the COMM_UP with the internal notification + * handler. Simply return. */ + return null; + } + } /* receiveLock */ + } while (handler == null ? true : + (invokeNotificationHandler(resultContainer, handler, attachment) + == HandlerResult.CONTINUE)); + + return null; + } finally { + receiveInvoked.set(Boolean.FALSE); + } + } + + private int receive(int fd, + ByteBuffer dst, + ResultContainer resultContainer, + boolean peek) + throws IOException { + int pos = dst.position(); + int lim = dst.limit(); + assert (pos <= lim); + int rem = (pos <= lim ? lim - pos : 0); + if (dst instanceof DirectBuffer && rem > 0) + return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos, peek); + + /* Substitute a native buffer */ + int newSize = Math.max(rem, 1); + ByteBuffer bb = Util.getTemporaryDirectBuffer(newSize); + try { + int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0, peek); + bb.flip(); + if (n > 0 && rem > 0) + dst.put(bb); + return n; + } finally { + Util.releaseTemporaryDirectBuffer(bb); + } + } + + private int receiveIntoNativeBuffer(int fd, + ResultContainer resultContainer, + ByteBuffer bb, + int rem, + int pos, + boolean peek) + throws IOException + { + int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem, peek); + + if (n > 0) + bb.position(pos + n); + return n; + } + + private InternalNotificationHandler internalNotificationHandler = + new InternalNotificationHandler(); + + private void handleNotificationInternal(ResultContainer resultContainer) + { + invokeNotificationHandler(resultContainer, + internalNotificationHandler, null); + } + + private class InternalNotificationHandler + extends AbstractNotificationHandler<Object> + { + @Override + public HandlerResult handleNotification( + AssociationChangeNotification not, Object unused) { + if (not.event().equals( + AssociationChangeNotification.AssocChangeEvent.COMM_UP) && + association == null) { + AssociationChange sac = (AssociationChange) not; + association = new AssociationImpl + (sac.assocId(), sac.maxInStreams(), sac.maxOutStreams()); + } + return HandlerResult.CONTINUE; + } + } + + private <T> HandlerResult invokeNotificationHandler + (ResultContainer resultContainer, + NotificationHandler<T> handler, + T attachment) { + SctpNotification notification = resultContainer.notification(); + synchronized (stateLock) { + notification.setAssociation(association); + } + + if (!(handler instanceof AbstractNotificationHandler)) { + return handler.handleNotification(notification, attachment); + } + + /* AbstractNotificationHandler */ + AbstractNotificationHandler<T> absHandler = + (AbstractNotificationHandler<T>)handler; + switch(resultContainer.type()) { + case ASSOCIATION_CHANGED : + return absHandler.handleNotification( + resultContainer.getAssociationChanged(), attachment); + case PEER_ADDRESS_CHANGED : + return absHandler.handleNotification( + resultContainer.getPeerAddressChanged(), attachment); + case SEND_FAILED : + return absHandler.handleNotification( + resultContainer.getSendFailed(), attachment); + case SHUTDOWN : + return absHandler.handleNotification( + resultContainer.getShutdown(), attachment); + default : + /* implementation specific handlers */ + return absHandler.handleNotification( + resultContainer.notification(), attachment); + } + } + + private void checkAssociation(Association sendAssociation) { + synchronized (stateLock) { + if (sendAssociation != null && !sendAssociation.equals(association)) { + throw new IllegalArgumentException( + "Cannot send to another association"); + } + } + } + + private void checkStreamNumber(int streamNumber) { + synchronized (stateLock) { + if (association != null) { + if (streamNumber < 0 || + streamNumber >= association.maxOutboundStreams()) + throw new InvalidStreamException(); + } + } + } + + /* TODO: Add support for ttl and isComplete to both 121 12M + * SCTP_EOR not yet supported on reference platforms + * TTL support limited... + */ + @Override + public int send(ByteBuffer buffer, MessageInfo messageInfo) + throws IOException { + if (buffer == null) + throw new IllegalArgumentException("buffer cannot be null"); + + if (messageInfo == null) + throw new IllegalArgumentException("messageInfo cannot be null"); + + checkAssociation(messageInfo.association()); + checkStreamNumber(messageInfo.streamNumber()); + + synchronized (sendLock) { + ensureSendOpen(); + + int n = 0; + try { + begin(); + + synchronized (stateLock) { + if(!isOpen()) + return 0; + senderThread = NativeThread.current(); + } + + do { + n = send(fdVal, buffer, messageInfo); + } while ((n == IOStatus.INTERRUPTED) && isOpen()); + + return IOStatus.normalize(n); + } finally { + senderCleanup(); + end((n > 0) || (n == IOStatus.UNAVAILABLE)); + assert IOStatus.check(n); + } + } + } + + private int send(int fd, ByteBuffer src, MessageInfo messageInfo) + throws IOException { + int streamNumber = messageInfo.streamNumber(); + SocketAddress target = messageInfo.address(); + boolean unordered = messageInfo.isUnordered(); + int ppid = messageInfo.payloadProtocolID(); + + if (src instanceof DirectBuffer) + return sendFromNativeBuffer(fd, src, target, streamNumber, + unordered, ppid); + + /* Substitute a native buffer */ + int pos = src.position(); + int lim = src.limit(); + assert (pos <= lim && streamNumber >= 0); + + int rem = (pos <= lim ? lim - pos : 0); + ByteBuffer bb = Util.getTemporaryDirectBuffer(rem); + try { + bb.put(src); + bb.flip(); + /* Do not update src until we see how many bytes were written */ + src.position(pos); + + int n = sendFromNativeBuffer(fd, bb, target, streamNumber, + unordered, ppid); + if (n > 0) { + /* now update src */ + src.position(pos + n); + } + return n; + } finally { + Util.releaseTemporaryDirectBuffer(bb); + } + } + + private int sendFromNativeBuffer(int fd, + ByteBuffer bb, + SocketAddress target, + int streamNumber, + boolean unordered, + int ppid) + throws IOException { + int pos = bb.position(); + int lim = bb.limit(); + assert (pos <= lim); + int rem = (pos <= lim ? lim - pos : 0); + + int written = send0(fd, ((DirectBuffer)bb).address() + pos, + rem, target, -1 /*121*/, streamNumber, unordered, ppid); + if (written > 0) + bb.position(pos + written); + return written; + } + + @Override + public SctpChannel shutdown() throws IOException { + synchronized(stateLock) { + if (isShutdown) + return this; + + ensureSendOpen(); + SctpNet.shutdown(fdVal, -1); + if (senderThread != 0) + NativeThread.signal(senderThread); + isShutdown = true; + } + return this; + } + + @Override + public Set<SocketAddress> getAllLocalAddresses() + throws IOException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + return Collections.emptySet(); + + return SctpNet.getLocalAddresses(fdVal); + } + } + + @Override + public Set<SocketAddress> getRemoteAddresses() + throws IOException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isConnected() || isShutdown) + return Collections.emptySet(); + + try { + return SctpNet.getRemoteAddresses(fdVal, 0/*unused*/); + } catch (SocketException unused) { + /* an open connected channel should always have remote addresses */ + return remoteAddresses; + } + } + } + + /* Native */ + private static native void initIDs(); + + static native int receive0(int fd, ResultContainer resultContainer, + long address, int length, boolean peek) throws IOException; + + static native int send0(int fd, long address, int length, + SocketAddress target, int assocId, int streamNumber, + boolean unordered, int ppid) throws IOException; + + private static native int checkConnect(FileDescriptor fd, boolean block, + boolean ready) throws IOException; + + static { + Util.load(); /* loads nio & net native libraries */ + java.security.AccessController.doPrivileged( + new sun.security.action.LoadLibraryAction("sctp")); + initIDs(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,994 @@ +/* + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.InetAddress; +import java.net.SocketAddress; +import java.net.SocketException; +import java.net.InetSocketAddress; +import java.io.FileDescriptor; +import java.io.IOException; +import java.util.Collections; +import java.util.Map.Entry; +import java.util.Iterator; +import java.util.Set; +import java.util.HashSet; +import java.util.HashMap; +import java.nio.ByteBuffer; +import java.nio.channels.SelectionKey; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.NotYetBoundException; +import java.nio.channels.spi.SelectorProvider; +import com.sun.nio.sctp.AbstractNotificationHandler; +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.AssociationChangeNotification; +import com.sun.nio.sctp.HandlerResult; +import com.sun.nio.sctp.IllegalReceiveException; +import com.sun.nio.sctp.InvalidStreamException; +import com.sun.nio.sctp.IllegalUnbindException; +import com.sun.nio.sctp.NotificationHandler; +import com.sun.nio.sctp.MessageInfo; +import com.sun.nio.sctp.SctpChannel; +import com.sun.nio.sctp.SctpMultiChannel; +import com.sun.nio.sctp.SctpSocketOption; +import sun.nio.ch.DirectBuffer; +import sun.nio.ch.NativeThread; +import sun.nio.ch.IOStatus; +import sun.nio.ch.IOUtil; +import sun.nio.ch.Net; +import sun.nio.ch.PollArrayWrapper; +import sun.nio.ch.SelChImpl; +import sun.nio.ch.SelectionKeyImpl; +import sun.nio.ch.Util; +import static com.sun.nio.sctp.SctpStandardSocketOptions.*; +import static sun.nio.ch.sctp.ResultContainer.*; + +/** + * An implementation of SctpMultiChannel + */ +public class SctpMultiChannelImpl extends SctpMultiChannel + implements SelChImpl +{ + private final FileDescriptor fd; + + private final int fdVal; + + /* IDs of native threads doing send and receives, for signalling */ + private volatile long receiverThread = 0; + private volatile long senderThread = 0; + + /* Lock held by current receiving thread */ + private final Object receiveLock = new Object(); + + /* Lock held by current sending thread */ + private final Object sendLock = new Object(); + + /* Lock held by any thread that modifies the state fields declared below + * DO NOT invoke a blocking I/O operation while holding this lock! */ + private final Object stateLock = new Object(); + + private enum ChannelState { + UNINITIALIZED, + KILLPENDING, + KILLED, + } + + /* -- The following fields are protected by stateLock -- */ + private ChannelState state = ChannelState.UNINITIALIZED; + + /* Binding: Once bound the port will remain constant. */ + int port = -1; + private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>(); + /* Has the channel been bound to the wildcard address */ + private boolean wildcard; /* false */ + + /* Keeps a map of addresses to association, and visa versa */ + private HashMap<SocketAddress, Association> addressMap = + new HashMap<SocketAddress, Association>(); + private HashMap<Association, Set<SocketAddress>> associationMap = + new HashMap<Association, Set<SocketAddress>>(); + + /* -- End of fields protected by stateLock -- */ + + /* If an association has been shutdown mark it for removal after + * the user handler has been invoked */ + private final ThreadLocal<Association> associationToRemove = + new ThreadLocal<Association>() { + @Override protected Association initialValue() { + return null; + } + }; + + /* A notification handler cannot invoke receive */ + private final ThreadLocal<Boolean> receiveInvoked = + new ThreadLocal<Boolean>() { + @Override protected Boolean initialValue() { + return Boolean.FALSE; + } + }; + + public SctpMultiChannelImpl(SelectorProvider provider) + throws IOException { + //TODO: update provider, remove public modifier + super(provider); + this.fd = SctpNet.socket(false /*one-to-many*/); + this.fdVal = IOUtil.fdVal(fd); + } + + @Override + public SctpMultiChannel bind(SocketAddress local, int backlog) + throws IOException { + synchronized (receiveLock) { + synchronized (sendLock) { + synchronized (stateLock) { + ensureOpen(); + if (isBound()) + SctpNet.throwAlreadyBoundException(); + InetSocketAddress isa = (local == null) ? + new InetSocketAddress(0) : Net.checkAddress(local); + + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkListen(isa.getPort()); + Net.bind(fd, isa.getAddress(), isa.getPort()); + + InetSocketAddress boundIsa = Net.localAddress(fd); + port = boundIsa.getPort(); + localAddresses.add(isa); + if (isa.getAddress().isAnyLocalAddress()) + wildcard = true; + + SctpNet.listen(fdVal, backlog < 1 ? 50 : backlog); + } + } + } + return this; + } + + @Override + public SctpMultiChannel bindAddress(InetAddress address) + throws IOException { + return bindUnbindAddress(address, true); + } + + @Override + public SctpMultiChannel unbindAddress(InetAddress address) + throws IOException { + return bindUnbindAddress(address, false); + } + + private SctpMultiChannel bindUnbindAddress(InetAddress address, + boolean add) + throws IOException { + if (address == null) + throw new IllegalArgumentException(); + + synchronized (receiveLock) { + synchronized (sendLock) { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + throw new NotYetBoundException(); + if (wildcard) + throw new IllegalStateException( + "Cannot add or remove addresses from a channel that is bound to the wildcard address"); + if (address.isAnyLocalAddress()) + throw new IllegalArgumentException( + "Cannot add or remove the wildcard address"); + if (add) { + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + SctpNet.throwAlreadyBoundException(); + } + } + } else { /*removing */ + /* Verify that there is more than one address + * and that address is already bound */ + if (localAddresses.size() <= 1) + throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound"); + boolean foundAddress = false; + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + foundAddress = true; + break; + } + } + if (!foundAddress ) + throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address"); + } + + SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add); + + /* Update our internal Set to reflect the addition/removal */ + if (add) + localAddresses.add(new InetSocketAddress(address, port)); + else { + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + localAddresses.remove(addr); + break; + } + } + } + } + } + } + return this; + } + + @Override + public Set<Association> associations() + throws ClosedChannelException, NotYetBoundException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + throw new NotYetBoundException(); + + return Collections.unmodifiableSet(associationMap.keySet()); + } + } + + private boolean isBound() { + synchronized (stateLock) { + return port == -1 ? false : true; + } + } + + private void ensureOpen() throws IOException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + } + } + + private void receiverCleanup() throws IOException { + synchronized (stateLock) { + receiverThread = 0; + if (state == ChannelState.KILLPENDING) + kill(); + } + } + + private void senderCleanup() throws IOException { + synchronized (stateLock) { + senderThread = 0; + if (state == ChannelState.KILLPENDING) + kill(); + } + } + + @Override + protected void implConfigureBlocking(boolean block) throws IOException { + IOUtil.configureBlocking(fd, block); + } + + @Override + public void implCloseSelectableChannel() throws IOException { + synchronized (stateLock) { + SctpNet.preClose(fdVal); + + if (receiverThread != 0) + NativeThread.signal(receiverThread); + + if (senderThread != 0) + NativeThread.signal(senderThread); + + if (!isRegistered()) + kill(); + } + } + + @Override + public FileDescriptor getFD() { + return fd; + } + + @Override + public int getFDVal() { + return fdVal; + } + + /** + * Translates native poll revent ops into a ready operation ops + */ + private boolean translateReadyOps(int ops, int initialOps, + SelectionKeyImpl sk) { + int intOps = sk.nioInterestOps(); + int oldOps = sk.nioReadyOps(); + int newOps = initialOps; + + if ((ops & PollArrayWrapper.POLLNVAL) != 0) { + /* This should only happen if this channel is pre-closed while a + * selection operation is in progress + * ## Throw an error if this channel has not been pre-closed */ + return false; + } + + if ((ops & (PollArrayWrapper.POLLERR + | PollArrayWrapper.POLLHUP)) != 0) { + newOps = intOps; + sk.nioReadyOps(newOps); + return (newOps & ~oldOps) != 0; + } + + if (((ops & PollArrayWrapper.POLLIN) != 0) && + ((intOps & SelectionKey.OP_READ) != 0)) + newOps |= SelectionKey.OP_READ; + + if (((ops & PollArrayWrapper.POLLOUT) != 0) && + ((intOps & SelectionKey.OP_WRITE) != 0)) + newOps |= SelectionKey.OP_WRITE; + + sk.nioReadyOps(newOps); + return (newOps & ~oldOps) != 0; + } + + @Override + public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) { + return translateReadyOps(ops, sk.nioReadyOps(), sk); + } + + @Override + public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) { + return translateReadyOps(ops, 0, sk); + } + + @Override + public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) { + int newOps = 0; + if ((ops & SelectionKey.OP_READ) != 0) + newOps |= PollArrayWrapper.POLLIN; + if ((ops & SelectionKey.OP_WRITE) != 0) + newOps |= PollArrayWrapper.POLLOUT; + sk.selector.putEventOps(sk, newOps); + } + + @Override + public void kill() throws IOException { + synchronized (stateLock) { + if (state == ChannelState.KILLED) + return; + if (state == ChannelState.UNINITIALIZED) { + state = ChannelState.KILLED; + return; + } + assert !isOpen() && !isRegistered(); + + /* Postpone the kill if there is a thread sending or receiving. */ + if (receiverThread == 0 && senderThread == 0) { + SctpNet.close(fdVal); + state = ChannelState.KILLED; + } else { + state = ChannelState.KILLPENDING; + } + } + } + + @Override + public <T> SctpMultiChannel setOption(SctpSocketOption<T> name, + T value, + Association association) + throws IOException { + if (name == null) + throw new NullPointerException(); + if (!(supportedOptions().contains(name))) + throw new UnsupportedOperationException("'" + name + "' not supported"); + + synchronized (stateLock) { + if (association != null && (name.equals(SCTP_PRIMARY_ADDR) || + name.equals(SCTP_SET_PEER_PRIMARY_ADDR))) { + checkAssociation(association); + } + if (!isOpen()) + throw new ClosedChannelException(); + + int assocId = association == null ? 0 : association.associationID(); + SctpNet.setSocketOption(fdVal, name, value, assocId); + } + return this; + } + + @Override + @SuppressWarnings("unchecked") + public <T> T getOption(SctpSocketOption<T> name, Association association) + throws IOException { + if (name == null) + throw new NullPointerException(); + if (!supportedOptions().contains(name)) + throw new UnsupportedOperationException("'" + name + "' not supported"); + + synchronized (stateLock) { + if (association != null && (name.equals(SCTP_PRIMARY_ADDR) || + name.equals(SCTP_SET_PEER_PRIMARY_ADDR))) { + checkAssociation(association); + } + if (!isOpen()) + throw new ClosedChannelException(); + + int assocId = association == null ? 0 : association.associationID(); + return (T)SctpNet.getSocketOption(fdVal, name, assocId); + } + } + + private static class DefaultOptionsHolder { + static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions(); + + private static Set<SctpSocketOption<?>> defaultOptions() { + HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(10); + set.add(SCTP_DISABLE_FRAGMENTS); + set.add(SCTP_EXPLICIT_COMPLETE); + set.add(SCTP_FRAGMENT_INTERLEAVE); + set.add(SCTP_INIT_MAXSTREAMS); + set.add(SCTP_NODELAY); + set.add(SCTP_PRIMARY_ADDR); + set.add(SCTP_SET_PEER_PRIMARY_ADDR); + set.add(SO_SNDBUF); + set.add(SO_RCVBUF); + set.add(SO_LINGER); + return Collections.unmodifiableSet(set); + } + } + + @Override + public final Set<SctpSocketOption<?>> supportedOptions() { + return DefaultOptionsHolder.defaultOptions; + } + + @Override + public <T> MessageInfo receive(ByteBuffer buffer, + T attachment, + NotificationHandler<T> handler) + throws IOException { + if (buffer == null) + throw new IllegalArgumentException("buffer cannot be null"); + + if (buffer.isReadOnly()) + throw new IllegalArgumentException("Read-only buffer"); + + if (receiveInvoked.get()) + throw new IllegalReceiveException( + "cannot invoke receive from handler"); + receiveInvoked.set(Boolean.TRUE); + + try { + ResultContainer resultContainer = new ResultContainer(); + do { + resultContainer.clear(); + synchronized (receiveLock) { + ensureOpen(); + if (!isBound()) + throw new NotYetBoundException(); + + int n = 0; + try { + begin(); + + synchronized (stateLock) { + if(!isOpen()) + return null; + receiverThread = NativeThread.current(); + } + + do { + n = receive(fdVal, buffer, resultContainer); + } while ((n == IOStatus.INTERRUPTED) && isOpen()); + + } finally { + receiverCleanup(); + end((n > 0) || (n == IOStatus.UNAVAILABLE)); + assert IOStatus.check(n); + } + + if (!resultContainer.isNotification()) { + /* message or nothing */ + if (resultContainer.hasSomething()) { + /* Set the association before returning */ + MessageInfoImpl info = + resultContainer.getMessageInfo(); + info.setAssociation(lookupAssociation(info. + associationID())); + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + InetSocketAddress isa = (InetSocketAddress)info.address(); + if (!addressMap.containsKey(isa)) { + /* must be a new association */ + try { + sm.checkAccept(isa.getAddress().getHostAddress(), + isa.getPort()); + } catch (SecurityException se) { + buffer.clear(); + throw se; + } + } + } + + assert info.association() != null; + return info; + } else { + /* Non-blocking may return null if nothing available*/ + return null; + } + } else { /* notification */ + synchronized (stateLock) { + handleNotificationInternal( + resultContainer); + } + } + } /* receiveLock */ + } while (handler == null ? true : + (invokeNotificationHandler(resultContainer, handler, attachment) + == HandlerResult.CONTINUE)); + } finally { + receiveInvoked.set(Boolean.FALSE); + } + + return null; + } + + private int receive(int fd, + ByteBuffer dst, + ResultContainer resultContainer) + throws IOException { + int pos = dst.position(); + int lim = dst.limit(); + assert (pos <= lim); + int rem = (pos <= lim ? lim - pos : 0); + if (dst instanceof DirectBuffer && rem > 0) + return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos); + + /* Substitute a native buffer. */ + int newSize = Math.max(rem, 1); + ByteBuffer bb = Util.getTemporaryDirectBuffer(newSize); + try { + int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0); + bb.flip(); + if (n > 0 && rem > 0) + dst.put(bb); + return n; + } finally { + Util.releaseTemporaryDirectBuffer(bb); + } + } + + private int receiveIntoNativeBuffer(int fd, + ResultContainer resultContainer, + ByteBuffer bb, + int rem, + int pos) + throws IOException { + int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem); + if (n > 0) + bb.position(pos + n); + return n; + } + + private InternalNotificationHandler internalNotificationHandler = + new InternalNotificationHandler(); + + private void handleNotificationInternal(ResultContainer resultContainer) + { + invokeNotificationHandler(resultContainer, + internalNotificationHandler, null); + } + + private class InternalNotificationHandler + extends AbstractNotificationHandler<Object> + { + @Override + public HandlerResult handleNotification( + AssociationChangeNotification not, Object unused) { + AssociationChange sac = (AssociationChange) not; + + /* Update map to reflect change in association */ + switch (not.event()) { + case COMM_UP : + Association newAssociation = new AssociationImpl + (sac.assocId(), sac.maxInStreams(), sac.maxOutStreams()); + addAssociation(newAssociation); + break; + case SHUTDOWN : + case COMM_LOST : + //case RESTART: ??? + /* mark association for removal after user handler invoked*/ + associationToRemove.set(lookupAssociation(sac.assocId())); + } + return HandlerResult.CONTINUE; + } + } + + private <T> HandlerResult invokeNotificationHandler( + ResultContainer resultContainer, + NotificationHandler<T> handler, + T attachment) { + HandlerResult result; + SctpNotification notification = resultContainer.notification(); + notification.setAssociation(lookupAssociation(notification.assocId())); + + if (!(handler instanceof AbstractNotificationHandler)) { + result = handler.handleNotification(notification, attachment); + } else { /* AbstractNotificationHandler */ + AbstractNotificationHandler<T> absHandler = + (AbstractNotificationHandler<T>)handler; + switch(resultContainer.type()) { + case ASSOCIATION_CHANGED : + result = absHandler.handleNotification( + resultContainer.getAssociationChanged(), attachment); + break; + case PEER_ADDRESS_CHANGED : + result = absHandler.handleNotification( + resultContainer.getPeerAddressChanged(), attachment); + break; + case SEND_FAILED : + result = absHandler.handleNotification( + resultContainer.getSendFailed(), attachment); + break; + case SHUTDOWN : + result = absHandler.handleNotification( + resultContainer.getShutdown(), attachment); + break; + default : + /* implementation specific handlers */ + result = absHandler.handleNotification( + resultContainer.notification(), attachment); + } + } + + if (!(handler instanceof InternalNotificationHandler)) { + /* Only remove associations after user handler + * has finished with them */ + Association assoc = associationToRemove.get(); + if (assoc != null) { + removeAssociation(assoc); + associationToRemove.set(null); + } + + } + + return result; + } + + private Association lookupAssociation(int assocId) { + /* Lookup the association in our internal map */ + synchronized (stateLock) { + Set<Association> assocs = associationMap.keySet(); + for (Association a : assocs) { + if (a.associationID() == assocId) { + return a; + } + } + } + return null; + } + + private void addAssociation(Association association) { + synchronized (stateLock) { + int assocId = association.associationID(); + Set<SocketAddress> addresses = null; + + try { + addresses = SctpNet.getRemoteAddresses(fdVal, assocId); + } catch (IOException unused) { + /* OK, determining connected addresses may not be possible + * shutdown, connection lost, etc */ + } + + associationMap.put(association, addresses); + if (addresses != null) { + for (SocketAddress addr : addresses) + addressMap.put(addr, association); + } + } + } + + private void removeAssociation(Association association) { + synchronized (stateLock) { + int assocId = association.associationID(); + Set<SocketAddress> addresses = null; + + try { + addresses = SctpNet.getRemoteAddresses(fdVal, assocId); + } catch (IOException unused) { + /* OK, determining connected addresses may not be possible + * shutdown, connection lost, etc */ + } + + Set<Association> assocs = associationMap.keySet(); + for (Association a : assocs) { + if (a.associationID() == assocId) { + associationMap.remove(a); + break; + } + } + if (addresses != null) { + for (SocketAddress addr : addresses) + addressMap.remove(addr); + } else { + /* We cannot determine the connected addresses */ + Set<java.util.Map.Entry<SocketAddress, Association>> addrAssocs = + addressMap.entrySet(); + Iterator<Entry<SocketAddress, Association>> iterator = addrAssocs.iterator(); + while (iterator.hasNext()) { + Entry<SocketAddress, Association> entry = iterator.next(); + if (entry.getValue().equals(association)) { + iterator.remove(); + } + } + } + } + } + + /** + * @throws IllegalArgumentException + * If the given association is not controlled by this channel + * + * @return {@code true} if, and only if, the given association is one + * of the current associations controlled by this channel + */ + private boolean checkAssociation(Association messageAssoc) { + synchronized (stateLock) { + for (Association association : associationMap.keySet()) { + if (messageAssoc.equals(association)) { + return true; + } + } + } + throw new IllegalArgumentException( + "Given Association is not controlled by this channel"); + } + + private void checkStreamNumber(Association assoc, int streamNumber) { + synchronized (stateLock) { + if (streamNumber < 0 || streamNumber >= assoc.maxOutboundStreams()) + throw new InvalidStreamException(); + } + } + + /* TODO: Add support for ttl and isComplete to both 121 12M + * SCTP_EOR not yet supported on reference platforms + * TTL support limited... + */ + @Override + public int send(ByteBuffer buffer, MessageInfo messageInfo) + throws IOException { + if (buffer == null) + throw new IllegalArgumentException("buffer cannot be null"); + + if (messageInfo == null) + throw new IllegalArgumentException("messageInfo cannot be null"); + + synchronized (sendLock) { + ensureOpen(); + + if (!isBound()) + bind(null, 0); + + int n = 0; + try { + int assocId = -1; + SocketAddress address = null; + begin(); + + synchronized (stateLock) { + if(!isOpen()) + return 0; + senderThread = NativeThread.current(); + + /* Determine what address or association to send to */ + Association assoc = messageInfo.association(); + InetSocketAddress addr = (InetSocketAddress)messageInfo.address(); + if (assoc != null) { + checkAssociation(assoc); + checkStreamNumber(assoc, messageInfo.streamNumber()); + assocId = assoc.associationID(); + /* have we also got a preferred address */ + if (addr != null) { + if (!assoc.equals(addressMap.get(addr))) + throw new IllegalArgumentException("given preferred address is not part of this association"); + address = addr; + } + } else if (addr != null) { + address = addr; + Association association = addressMap.get(addr); + if (association != null) { + checkStreamNumber(association, messageInfo.streamNumber()); + assocId = association.associationID(); + + } else { /* must be new association */ + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkConnect(addr.getAddress().getHostAddress(), + addr.getPort()); + } + } else { + throw new AssertionError( + "Both association and address cannot be null"); + } + } + + do { + n = send(fdVal, buffer, assocId, address, messageInfo); + } while ((n == IOStatus.INTERRUPTED) && isOpen()); + + return IOStatus.normalize(n); + } finally { + senderCleanup(); + end((n > 0) || (n == IOStatus.UNAVAILABLE)); + assert IOStatus.check(n); + } + } + } + + private int send(int fd, + ByteBuffer src, + int assocId, + SocketAddress target, + MessageInfo messageInfo) + throws IOException { + int streamNumber = messageInfo.streamNumber(); + boolean unordered = messageInfo.isUnordered(); + int ppid = messageInfo.payloadProtocolID(); + + if (src instanceof DirectBuffer) + return sendFromNativeBuffer(fd, src, target, assocId, + streamNumber, unordered, ppid); + + /* Substitute a native buffer */ + int pos = src.position(); + int lim = src.limit(); + assert (pos <= lim && streamNumber >= 0); + + int rem = (pos <= lim ? lim - pos : 0); + ByteBuffer bb = Util.getTemporaryDirectBuffer(rem); + try { + bb.put(src); + bb.flip(); + /* Do not update src until we see how many bytes were written */ + src.position(pos); + + int n = sendFromNativeBuffer(fd, bb, target, assocId, + streamNumber, unordered, ppid); + if (n > 0) { + /* now update src */ + src.position(pos + n); + } + return n; + } finally { + Util.releaseTemporaryDirectBuffer(bb); + } + } + + private int sendFromNativeBuffer(int fd, + ByteBuffer bb, + SocketAddress target, + int assocId, + int streamNumber, + boolean unordered, + int ppid) + throws IOException { + int pos = bb.position(); + int lim = bb.limit(); + assert (pos <= lim); + int rem = (pos <= lim ? lim - pos : 0); + + int written = send0(fd, ((DirectBuffer)bb).address() + pos, + rem, target, assocId, streamNumber, unordered, ppid); + if (written > 0) + bb.position(pos + written); + return written; + } + + @Override + public SctpMultiChannel shutdown(Association association) + throws IOException { + synchronized (stateLock) { + checkAssociation(association); + if (!isOpen()) + throw new ClosedChannelException(); + + SctpNet.shutdown(fdVal, association.associationID()); + } + return this; + } + + @Override + public Set<SocketAddress> getAllLocalAddresses() + throws IOException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + return Collections.emptySet(); + + return SctpNet.getLocalAddresses(fdVal); + } + } + + @Override + public Set<SocketAddress> getRemoteAddresses(Association association) + throws IOException { + synchronized (stateLock) { + checkAssociation(association); + if (!isOpen()) + throw new ClosedChannelException(); + + try { + return SctpNet.getRemoteAddresses(fdVal, association.associationID()); + } catch (SocketException se) { + /* a valid association should always have remote addresses */ + Set<SocketAddress> addrs = associationMap.get(association); + return addrs != null ? addrs : Collections.<SocketAddress>emptySet(); + } + } + } + + @Override + public SctpChannel branch(Association association) + throws IOException { + synchronized (stateLock) { + checkAssociation(association); + if (!isOpen()) + throw new ClosedChannelException(); + + FileDescriptor bFd = SctpNet.branch(fdVal, + association.associationID()); + /* successfully branched, we can now remove it from assoc list */ + removeAssociation(association); + + return new SctpChannelImpl(provider(), bFd, association); + } + } + + /* Use common native implementation shared between + * one-to-one and one-to-many */ + private static int receive0(int fd, + ResultContainer resultContainer, + long address, + int length) + throws IOException{ + return SctpChannelImpl.receive0(fd, resultContainer, address, + length, false /*peek */); + } + + private static int send0(int fd, + long address, + int length, + SocketAddress target, + int assocId, + int streamNumber, + boolean unordered, + int ppid) + throws IOException { + return SctpChannelImpl.send0(fd, address, length, target, assocId, + streamNumber, unordered, ppid); + } + + static { + Util.load(); /* loads nio & net native libraries */ + java.security.AccessController.doPrivileged( + new sun.security.action.LoadLibraryAction("sctp")); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/SctpNet.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,315 @@ +/* + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.io.FileDescriptor; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.nio.channels.AlreadyBoundException; +import java.util.Set; +import java.util.HashSet; +import java.security.AccessController; +import sun.security.action.GetPropertyAction; +import sun.nio.ch.IOUtil; +import sun.nio.ch.Net; +import com.sun.nio.sctp.SctpSocketOption; +import static com.sun.nio.sctp.SctpStandardSocketOptions.*; + +public class SctpNet { + static final String osName = AccessController.doPrivileged( + new GetPropertyAction("os.name")); + + /* -- Miscellaneous SCTP utilities -- */ + + private static boolean IPv4MappedAddresses() { + if ("SunOS".equals(osName)) { + /* Solaris supports IPv4Mapped Addresses with bindx */ + return true; + } /* else { //other OS/implementations */ + + /* lksctp/linux requires Ipv4 addresses */ + return false; + } + + static boolean throwAlreadyBoundException() throws IOException { + throw new AlreadyBoundException(); + } + + static void listen(int fd, int backlog) throws IOException { + listen0(fd, backlog); + } + + static int connect(int fd, InetAddress remote, int remotePort) + throws IOException { + return connect0(fd, remote, remotePort); + } + + static void close(int fd) throws IOException { + close0(fd); + } + + static void preClose(int fd) throws IOException { + preClose0(fd); + } + + /** + * @param oneToOne + * if {@code true} returns a one-to-one sctp socket, otherwise + * returns a one-to-many sctp socket + */ + static FileDescriptor socket(boolean oneToOne) throws IOException { + int nativefd = socket0(oneToOne); + return IOUtil.newFD(nativefd); + } + + static void bindx(int fd, InetAddress[] addrs, int port, boolean add) + throws IOException { + bindx(fd, addrs, port, addrs.length, add, + IPv4MappedAddresses()); + } + + static Set<SocketAddress> getLocalAddresses(int fd) + throws IOException { + HashSet<SocketAddress> set = null; + SocketAddress[] saa = getLocalAddresses0(fd); + + if (saa != null) { + set = new HashSet<SocketAddress>(saa.length); + for (SocketAddress sa : saa) + set.add(sa); + } + + return set; + } + + static Set<SocketAddress> getRemoteAddresses(int fd, int assocId) + throws IOException { + HashSet<SocketAddress> set = null; + SocketAddress[] saa = getRemoteAddresses0(fd, assocId); + + if (saa != null) { + set = new HashSet<SocketAddress>(saa.length); + for (SocketAddress sa : saa) + set.add(sa); + } + + return set; + } + + static <T> void setSocketOption(int fd, + SctpSocketOption<T> name, + T value, + int assocId) + throws IOException { + if (value == null) + throw new IllegalArgumentException("Invalid option value"); + + if (name.equals(SCTP_INIT_MAXSTREAMS)) { + InitMaxStreams maxStreamValue = (InitMaxStreams)value; + SctpNet.setInitMsgOption0(fd, + maxStreamValue.maxInStreams(), maxStreamValue.maxOutStreams()); + } else if (name.equals(SCTP_PRIMARY_ADDR) || + name.equals(SCTP_SET_PEER_PRIMARY_ADDR)) { + + SocketAddress addr = (SocketAddress) value; + if (addr == null) + throw new IllegalArgumentException("Invalid option value"); + + Net.checkAddress(addr); + InetSocketAddress netAddr = (InetSocketAddress)addr; + + if (name.equals(SCTP_PRIMARY_ADDR)) { + setPrimAddrOption0(fd, + assocId, + netAddr.getAddress(), + netAddr.getPort()); + } else { + setPeerPrimAddrOption0(fd, + assocId, + netAddr.getAddress(), + netAddr.getPort(), + IPv4MappedAddresses()); + } + } else if (name.equals(SCTP_DISABLE_FRAGMENTS) || + name.equals(SCTP_EXPLICIT_COMPLETE) || + name.equals(SCTP_FRAGMENT_INTERLEAVE) || + name.equals(SCTP_NODELAY) || + name.equals(SO_SNDBUF) || + name.equals(SO_RCVBUF) || + name.equals(SO_LINGER)) { + setIntOption(fd, name, value); + } else { + throw new AssertionError("Unknown socket option"); + } + } + + static Object getSocketOption(int fd, SctpSocketOption<?> name, int assocId) + throws IOException { + if (name.equals(SCTP_SET_PEER_PRIMARY_ADDR)) { + throw new IllegalArgumentException( + "SCTP_SET_PEER_PRIMARY_ADDR cannot be retrieved"); + } else if (name.equals(SCTP_INIT_MAXSTREAMS)) { + /* container for holding maxIn/Out streams */ + int[] values = new int[2]; + SctpNet.getInitMsgOption0(fd, values); + return InitMaxStreams.create(values[0], values[1]); + } else if (name.equals(SCTP_PRIMARY_ADDR)) { + return getPrimAddrOption0(fd, assocId); + } else if (name.equals(SCTP_DISABLE_FRAGMENTS) || + name.equals(SCTP_EXPLICIT_COMPLETE) || + name.equals(SCTP_FRAGMENT_INTERLEAVE) || + name.equals(SCTP_NODELAY) || + name.equals(SO_SNDBUF) || + name.equals(SO_RCVBUF) || + name.equals(SO_LINGER)) { + return getIntOption(fd, name); + } else { + throw new AssertionError("Unknown socket option"); + } + } + + static void setIntOption(int fd, SctpSocketOption<?> name, Object value) + throws IOException { + if (value == null) + throw new IllegalArgumentException("Invalid option value"); + + Class<?> type = name.type(); + if (type != Integer.class && type != Boolean.class) + throw new AssertionError("Should not reach here"); + + if (name == SO_RCVBUF || + name == SO_SNDBUF) + { + int i = ((Integer)value).intValue(); + if (i < 0) + throw new IllegalArgumentException( + "Invalid send/receive buffer size"); + } else if (name == SO_LINGER) { + int i = ((Integer)value).intValue(); + if (i < 0) + value = Integer.valueOf(-1); + if (i > 65535) + value = Integer.valueOf(65535); + } else if (name.equals(SCTP_FRAGMENT_INTERLEAVE)) { + int i = ((Integer)value).intValue(); + if (i < 0 || i > 2) + throw new IllegalArgumentException( + "Invalid value for SCTP_FRAGMENT_INTERLEAVE"); + } + + int arg; + if (type == Integer.class) { + arg = ((Integer)value).intValue(); + } else { + boolean b = ((Boolean)value).booleanValue(); + arg = (b) ? 1 : 0; + } + + setIntOption0(fd, ((SctpStdSocketOption)name).constValue(), arg); + } + + static Object getIntOption(int fd, SctpSocketOption<?> name) + throws IOException { + Class<?> type = name.type(); + + if (type != Integer.class && type != Boolean.class) + throw new AssertionError("Should not reach here"); + + if (!(name instanceof SctpStdSocketOption)) + throw new AssertionError("Should not reach here"); + + int value = getIntOption0(fd, + ((SctpStdSocketOption)name).constValue()); + + if (type == Integer.class) { + return Integer.valueOf(value); + } else { + return (value == 0) ? Boolean.FALSE : Boolean.TRUE; + } + } + + static void shutdown(int fd, int assocId) + throws IOException { + shutdown0(fd, assocId); + } + + static FileDescriptor branch(int fd, int assocId) throws IOException { + int nativefd = branch0(fd, assocId); + return IOUtil.newFD(nativefd); + } + + /* Native Methods */ + static native int socket0(boolean oneToOne) throws IOException; + + static native void listen0(int fd, int backlog) throws IOException; + + static native int connect0(int fd, InetAddress remote, int remotePort) + throws IOException; + + static native void close0(int fd) throws IOException; + + static native void preClose0(int fd) throws IOException; + + static native void bindx(int fd, InetAddress[] addrs, int port, int length, + boolean add, boolean preferIPv6) throws IOException; + + static native int getIntOption0(int fd, int opt) throws IOException; + + static native void setIntOption0(int fd, int opt, int arg) + throws IOException; + + static native SocketAddress[] getLocalAddresses0(int fd) throws IOException; + + static native SocketAddress[] getRemoteAddresses0(int fd, int assocId) + throws IOException; + + static native int branch0(int fd, int assocId) throws IOException; + + static native void setPrimAddrOption0(int fd, int assocId, InetAddress ia, + int port) throws IOException; + + static native void setPeerPrimAddrOption0(int fd, int assocId, + InetAddress ia, int port, boolean preferIPv6) throws IOException; + + static native SocketAddress getPrimAddrOption0(int fd, int assocId) + throws IOException; + + /* retVals [0] maxInStreams, [1] maxOutStreams */ + static native void getInitMsgOption0(int fd, int[] retVals) throws IOException; + + static native void setInitMsgOption0(int fd, int arg1, int arg2) + throws IOException; + + static native void shutdown0(int fd, int assocId); + + static native void init(); + + static { + init(); + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/SctpNotification.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.Notification; + +/** + * All Notification implemenations MUST implement this interface to provide + * access to the native association identidier. + */ +interface SctpNotification extends Notification { + int assocId(); + void setAssociation(Association association); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,434 @@ +/* + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.SocketAddress; +import java.net.InetSocketAddress; +import java.net.InetAddress; +import java.io.FileDescriptor; +import java.io.IOException; +import java.util.Collections; +import java.util.Set; +import java.util.HashSet; +import java.nio.channels.SelectionKey; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.NotYetBoundException; +import java.nio.channels.spi.SelectorProvider; +import com.sun.nio.sctp.IllegalUnbindException; +import com.sun.nio.sctp.SctpChannel; +import com.sun.nio.sctp.SctpServerChannel; +import com.sun.nio.sctp.SctpSocketOption; +import com.sun.nio.sctp.SctpStandardSocketOptions; +import sun.nio.ch.DirectBuffer; +import sun.nio.ch.NativeThread; +import sun.nio.ch.IOStatus; +import sun.nio.ch.IOUtil; +import sun.nio.ch.Net; +import sun.nio.ch.PollArrayWrapper; +import sun.nio.ch.SelChImpl; +import sun.nio.ch.SelectionKeyImpl; +import sun.nio.ch.Util; + +/** + * An implementation of SctpServerChannel + */ +public class SctpServerChannelImpl extends SctpServerChannel + implements SelChImpl +{ + private final FileDescriptor fd; + + private final int fdVal; + + /* IDs of native thread doing accept, for signalling */ + private volatile long thread = 0; + + /* Lock held by thread currently blocked in this channel */ + private final Object lock = new Object(); + + /* Lock held by any thread that modifies the state fields declared below + * DO NOT invoke a blocking I/O operation while holding this lock! */ + private final Object stateLock = new Object(); + + private enum ChannelState { + UNINITIALIZED, + INUSE, + KILLPENDING, + KILLED, + } + /* -- The following fields are protected by stateLock -- */ + private ChannelState state = ChannelState.UNINITIALIZED; + + /* Binding: Once bound the port will remain constant. */ + int port = -1; + private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>(); + /* Has the channel been bound to the wildcard address */ + private boolean wildcard; /* false */ + + /* -- End of fields protected by stateLock -- */ + + /** + * Initializes a new instance of this class. + */ + public SctpServerChannelImpl(SelectorProvider provider) + throws IOException { + //TODO: update provider remove public modifier + super(provider); + this.fd = SctpNet.socket(true); + this.fdVal = IOUtil.fdVal(fd); + this.state = ChannelState.INUSE; + } + + @Override + public SctpServerChannel bind(SocketAddress local, int backlog) + throws IOException { + synchronized (lock) { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (isBound()) + SctpNet.throwAlreadyBoundException(); + + InetSocketAddress isa = (local == null) ? + new InetSocketAddress(0) : Net.checkAddress(local); + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkListen(isa.getPort()); + Net.bind(fd, isa.getAddress(), isa.getPort()); + + InetSocketAddress boundIsa = Net.localAddress(fd); + port = boundIsa.getPort(); + localAddresses.add(isa); + if (isa.getAddress().isAnyLocalAddress()) + wildcard = true; + + SctpNet.listen(fdVal, backlog < 1 ? 50 : backlog); + } + } + return this; + } + + @Override + public SctpServerChannel bindAddress(InetAddress address) + throws IOException { + return bindUnbindAddress(address, true); + } + + @Override + public SctpServerChannel unbindAddress(InetAddress address) + throws IOException { + return bindUnbindAddress(address, false); + } + + private SctpServerChannel bindUnbindAddress(InetAddress address, boolean add) + throws IOException { + if (address == null) + throw new IllegalArgumentException(); + + synchronized (lock) { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + throw new NotYetBoundException(); + if (wildcard) + throw new IllegalStateException( + "Cannot add or remove addresses from a channel that is bound to the wildcard address"); + if (address.isAnyLocalAddress()) + throw new IllegalArgumentException( + "Cannot add or remove the wildcard address"); + if (add) { + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + SctpNet.throwAlreadyBoundException(); + } + } + } else { /*removing */ + /* Verify that there is more than one address + * and that address is already bound */ + if (localAddresses.size() <= 1) + throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound"); + boolean foundAddress = false; + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + foundAddress = true; + break; + } + } + if (!foundAddress ) + throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address"); + } + + SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add); + + /* Update our internal Set to reflect the addition/removal */ + if (add) + localAddresses.add(new InetSocketAddress(address, port)); + else { + for (InetSocketAddress addr : localAddresses) { + if (addr.getAddress().equals(address)) { + localAddresses.remove(addr); + break; + } + } + } + } + } + return this; + } + + private boolean isBound() { + synchronized (stateLock) { + return port == -1 ? false : true; + } + } + + private void acceptCleanup() throws IOException { + synchronized (stateLock) { + thread = 0; + if (state == ChannelState.KILLPENDING) + kill(); + } + } + + @Override + public SctpChannel accept() throws IOException { + synchronized (lock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + throw new NotYetBoundException(); + SctpChannel sc = null; + + int n = 0; + FileDescriptor newfd = new FileDescriptor(); + InetSocketAddress[] isaa = new InetSocketAddress[1]; + + try { + begin(); + if (!isOpen()) + return null; + thread = NativeThread.current(); + for (;;) { + n = accept0(fd, newfd, isaa); + if ((n == IOStatus.INTERRUPTED) && isOpen()) + continue; + break; + } + } finally { + acceptCleanup(); + end(n > 0); + assert IOStatus.check(n); + } + + if (n < 1) + return null; + + IOUtil.configureBlocking(newfd, true); + InetSocketAddress isa = isaa[0]; + sc = new SctpChannelImpl(provider(), newfd); + + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkAccept(isa.getAddress().getHostAddress(), + isa.getPort()); + + return sc; + } + } + + @Override + protected void implConfigureBlocking(boolean block) throws IOException { + IOUtil.configureBlocking(fd, block); + } + + @Override + public void implCloseSelectableChannel() throws IOException { + synchronized (stateLock) { + SctpNet.preClose(fdVal); + if (thread != 0) + NativeThread.signal(thread); + if (!isRegistered()) + kill(); + } + } + + @Override + public void kill() throws IOException { + synchronized (stateLock) { + if (state == ChannelState.KILLED) + return; + if (state == ChannelState.UNINITIALIZED) { + state = ChannelState.KILLED; + return; + } + assert !isOpen() && !isRegistered(); + + // Postpone the kill if there is a thread in accept + if (thread == 0) { + SctpNet.close(fdVal); + state = ChannelState.KILLED; + } else { + state = ChannelState.KILLPENDING; + } + } + } + + @Override + public FileDescriptor getFD() { + return fd; + } + + @Override + public int getFDVal() { + return fdVal; + } + + /** + * Translates native poll revent ops into a ready operation ops + */ + private boolean translateReadyOps(int ops, int initialOps, + SelectionKeyImpl sk) { + int intOps = sk.nioInterestOps(); + int oldOps = sk.nioReadyOps(); + int newOps = initialOps; + + if ((ops & PollArrayWrapper.POLLNVAL) != 0) { + /* This should only happen if this channel is pre-closed while a + * selection operation is in progress + * ## Throw an error if this channel has not been pre-closed */ + return false; + } + + if ((ops & (PollArrayWrapper.POLLERR + | PollArrayWrapper.POLLHUP)) != 0) { + newOps = intOps; + sk.nioReadyOps(newOps); + return (newOps & ~oldOps) != 0; + } + + if (((ops & PollArrayWrapper.POLLIN) != 0) && + ((intOps & SelectionKey.OP_ACCEPT) != 0)) + newOps |= SelectionKey.OP_ACCEPT; + + sk.nioReadyOps(newOps); + return (newOps & ~oldOps) != 0; + } + + @Override + public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) { + return translateReadyOps(ops, sk.nioReadyOps(), sk); + } + + @Override + public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) { + return translateReadyOps(ops, 0, sk); + } + + @Override + public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) { + int newOps = 0; + + /* Translate ops */ + if ((ops & SelectionKey.OP_ACCEPT) != 0) + newOps |= PollArrayWrapper.POLLIN; + /* Place ops into pollfd array */ + sk.selector.putEventOps(sk, newOps); + + } + + @Override + public <T> SctpServerChannel setOption(SctpSocketOption<T> name, T value) + throws IOException { + if (name == null) + throw new NullPointerException(); + if (!supportedOptions().contains(name)) + throw new UnsupportedOperationException("'" + name + "' not supported"); + + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + + SctpNet.setSocketOption(fdVal, name, value, 0 /*oneToOne*/); + return this; + } + } + + @Override + @SuppressWarnings("unchecked") + public <T> T getOption(SctpSocketOption<T> name) throws IOException { + if (name == null) + throw new NullPointerException(); + if (!supportedOptions().contains(name)) + throw new UnsupportedOperationException("'" + name + "' not supported"); + + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + + return (T) SctpNet.getSocketOption(fdVal, name, 0 /*oneToOne*/); + } + } + + private static class DefaultOptionsHolder { + static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions(); + + private static Set<SctpSocketOption<?>> defaultOptions() { + HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(1); + set.add(SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS); + return Collections.unmodifiableSet(set); + } + } + + @Override + public final Set<SctpSocketOption<?>> supportedOptions() { + return DefaultOptionsHolder.defaultOptions; + } + + @Override + public Set<SocketAddress> getAllLocalAddresses() + throws IOException { + synchronized (stateLock) { + if (!isOpen()) + throw new ClosedChannelException(); + if (!isBound()) + return Collections.emptySet(); + + return SctpNet.getLocalAddresses(fdVal); + } + } + + /* Native */ + private static native void initIDs(); + + private static native int accept0(FileDescriptor ssfd, + FileDescriptor newfd, InetSocketAddress[] isaa) throws IOException; + + static { + Util.load(); // loads nio & net native libraries + java.security.AccessController.doPrivileged( + new sun.security.action.LoadLibraryAction("sctp")); + initIDs(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/SendFailed.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.nio.ByteBuffer; +import java.net.SocketAddress; +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.SendFailedNotification; + +/** + * An implementation of SendFailedNotification + */ +public class SendFailed extends SendFailedNotification + implements SctpNotification +{ + private Association association; + /* assocId is used to lookup the association before the notification is + * returned to user code */ + private int assocId; + private SocketAddress address; + private ByteBuffer buffer; + private int errorCode; + private int streamNumber; + + /* Invoked from native */ + private SendFailed(int assocId, + SocketAddress address, + ByteBuffer buffer, + int errorCode, + int streamNumber) { + this.assocId = assocId; + this.errorCode = errorCode; + this.streamNumber = streamNumber; + this.address = address; + this.buffer = buffer; + } + + @Override + public int assocId() { + return assocId; + } + + @Override + public void setAssociation(Association association) { + this.association = association; + } + + @Override + public Association association() { + /* may be null */ + return association; + } + + @Override + public SocketAddress address() { + assert address != null; + return address; + } + + @Override + public ByteBuffer buffer() { + assert buffer != null; + return buffer; + } + + @Override + public int errorCode() { + return errorCode; + } + + @Override + public int streamNumber() { + return streamNumber; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(super.toString()).append(" ["); + sb.append("Association:").append(association); + sb.append(", Address: ").append(address); + sb.append(", buffer: ").append(buffer); + sb.append(", errorCode: ").append(errorCode); + sb.append(", streamNumber: ").append(streamNumber); + sb.append("]"); + return sb.toString(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/sun/nio/ch/sctp/Shutdown.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.ShutdownNotification; + +/** + * An implementation of ShutdownNotification + */ +public class Shutdown extends ShutdownNotification + implements SctpNotification +{ + private Association association; + /* assocId is used to lookup the association before the notification is + * returned to user code */ + private int assocId; + + /* Invoked from native */ + private Shutdown(int assocId) { + this.assocId = assocId; + } + + @Override + public int assocId() { + return assocId; + } + + @Override + public void setAssociation(Association association) { + this.association = association; + } + + @Override + public Association association() { + assert association != null; + return association; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(super.toString()).append(" ["); + sb.append("Association:").append(association).append("]"); + return sb.toString(); + } +}
--- a/src/solaris/doc/sun/man/man1/apt.1 Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH apt 1 "10 May 2011" - -.LP -.SH "NAME" -.LP -.LP -\f2apt\fP \- annotation processing tool -.LP -.SH "SYNOPSIS" -.LP -.LP -\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files] -.LP -.SH "PARAMETERS" -.LP -.LP -Options may be in any order. For a discussion of parameters which apply to a specific option, see OPTIONS below. -.LP -.RS 3 -.TP 3 -sourcefiles -Zero or more source files to be processed. -.TP 3 -@files -One or more files that list source files or other options -.RE - -.LP -.SH "DESCRIPTION" -.LP -.LP -\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. -.LP -.LP -The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. -.LP -.LP -A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in -.na -\f4Getting Started with \fP\f4apt\fP. @ -.fi -http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html -.LP -.SH "OPTIONS" -.LP -.SS -apt specific options -.LP -.RS 3 -.TP 3 -\-s dir -Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace. -.TP 3 -\-nocompile -Do not compile source files to class files. -.TP 3 -\-print -Print out textual representation of specified types; perform no annotation processing or compilation. -.TP 3 -\-A[key[=val]] -Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors -.TP 3 -\-factorypath path -Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories. -.TP 3 -\-factory classname -Name of annotation processor factory to use; bypasses default discovery process -.TP 3 -\-version -Print version information. -.TP 3 -\-X -Display information about non\-standard options. -.RE - -.LP -.SS -Options shared with javac -.LP -.RS 3 -.TP 3 -\-d dir -Specify where to place processor and javac generated class files -.TP 3 -\-cp path or \-classpath path -Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories. -.RE - -.LP -.LP -Consult the javac(1) man page for information on \f2javac\fP options. -.LP -.SS -Non\-Standard Options -.LP -.RS 3 -.TP 3 -\-XListAnnotationTypes -List found annotation types. -.TP 3 -\-XListDeclarations -List specified and included declarations. -.TP 3 -\-XPrintAptRounds -Print information about initial and recursive \f2apt\fP rounds. -.TP 3 -\-XPrintFactoryInfo -Print information about which annotations a factory is asked to process. -.TP 3 -\-XclassesAsDecls -Treat both class and source files as declarations to process. -.RE - -.LP -.LP -\f3Note\fP: Because these options are non\-standard, they are subject to change without notice. -.LP -.SH "NOTES" -.LP -.LP -The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. -.LP -.SH "SEE ALSO" -.LP -.RS 3 -.TP 2 -o -javac(1), java(1) -.RE - -.LP -
--- a/src/solaris/doc/sun/man/man1/ja/apt.1 Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH apt 1 "07 May 2011" - -.LP -.SH "NAME" -.LP -.LP -\f2apt\fP \- Ãí¼á½èÍý¥Ä¡¼¥ë -.LP -.SH "·Á¼°" -.LP -.LP -\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files] -.LP -.SH "¥Ñ¥é¥á¡¼¥¿" -.LP -.LP -¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£ÆÃÄê¤Î¥ª¥×¥·¥ç¥ó¤ËŬÍѤµ¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢²¼µ¤Î¡Ö¥ª¥×¥·¥ç¥ó¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.RS 3 -.TP 3 -sourcefiles -¥¼¥í¡¢1 ¤Ä¡¢¤Þ¤¿¤ÏÊ£¿ô¤Î½èÍýÂоݤΥ½¡¼¥¹¥Õ¥¡¥¤¥ë -.TP 3 -@files -¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¾¤Î¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë 1 ¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë -.RE - -.LP -.SH "ÀâÌÀ" -.LP -.LP -\f3Ãí\fP: \f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.LP -Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£ -.LP -.LP -¥Ä¡¼¥ë¤Îµ¡Ç½¤Ë´Ø¤¹¤ë¾ÜºÙ¤È¡¢\f2apt\fP ¤ò»ÈÍѤ·¤¿³«È¯ÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢ -.na -\f4¡Öapt ÆþÌç¡×\fP @ -.fi -http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.SH "¥ª¥×¥·¥ç¥ó" -.LP -.SS -apt ¸ÇͤΥª¥×¥·¥ç¥ó -.LP -.RS 3 -.TP 3 -\-s dir -¥×¥í¥»¥Ã¥µ¤ÎÀ¸À®¤¹¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¥Ç¥£¥ì¥¯¥È¥ê¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¶õ´Ö¤Ë´ð¤Å¤¤¤Æ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹¡£ -.TP 3 -\-nocompile -¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤»¤ó¡£ -.TP 3 -\-print -»ØÄꤷ¤¿¥¿¥¤¥×¤Î¥Æ¥¥¹¥Èɽ¸½¤ò½ÐÎϤ·¤Þ¤¹¡£ Ãí¼á½èÍý¤Þ¤¿¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ï¹Ô¤¤¤Þ¤»¤ó¡£ -.TP 3 -\-A[key[=val]] -Ãí¼á¥×¥í¥»¥Ã¥µ¤ØÅϤ¹¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2apt\fP ¤¬Ä¾Àܲò¼á¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢¤½¤ì¤¾¤ì¤Î¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ»ÈÍѤǤ¤ë¤è¤¦¤ËÊѤ¨¤é¤ì¤Þ¤¹¡£ -.TP 3 -\-factorypath path -Ãí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£ -.TP 3 -\-factory classname -»ÈÍѤ¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤Î̾Á°¤Ç¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Î¸¡½Ð¥×¥í¥»¥¹¤ò¾Êά¤·¤Þ¤¹¡£ -.TP 3 -\-version -¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£ -.TP 3 -\-X -Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ -.RE - -.LP -.SS -javac ¤È¶¦ÍѤ¹¤ë¥ª¥×¥·¥ç¥ó -.LP -.RS 3 -.TP 3 -\-d dir -¥×¥í¥»¥Ã¥µ¤È javac À¸À®¤Î¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ -.TP 3 -\-cp path ¤Þ¤¿¤Ï \-classpath path -¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤ÈÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£\f2\-factorypath\fP ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£ -.RE - -.LP -.LP -\f2javac\fP ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢javac(1) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.SS -Èóɸ½à¥ª¥×¥·¥ç¥ó -.LP -.RS 3 -.TP 3 -\-XListAnnotationTypes -Ãí¼á¤Î·¿¤Ë¸¡½Ð¤µ¤ì¤ë¥ê¥¹¥È. -.TP 3 -\-XListDeclarations -»ØÄꤪ¤è¤ÓÀë¸À¤¬¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤ë¥ê¥¹¥È. -.TP 3 -\-XPrintAptRounds -½é´ü¤ª¤è¤ÓºÆµ¢Åª¤Ê \f2apt\fP ¥é¥¦¥ó¥É¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë. -.TP 3 -\-XPrintFactoryInfo -½èÍý¤òÍ׵᤹¤ë¥Õ¥¡¥¯¥È¥ê¤ÎÃí¼á¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë. -.TP 3 -\-XclassesAsDecls -¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¡¢½èÍýÂоݤÎÀë¸À¤È¤·¤Æ½èÍý¤·¤Þ¤¹¡£ -.RE - -.LP -.LP -\f3Ãí\fP: ¤³¤ì¤é¤ÏÈóɸ½à¥ª¥×¥·¥ç¥ó¤Ê¤Î¤Ç¡¢Í½¹ð¤Ê¤¯Êѹ¹¤µ¤ì¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£ -.LP -.SH "Ãí" -.LP -.LP -\f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£ -.LP -.SH "´ØÏ¢¹àÌÜ" -.LP -.RS 3 -.TP 2 -o -javac(1), java(1) -.RE - -.LP -
--- a/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c Thu Feb 16 13:01:36 2012 -0800 +++ b/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c Sat Feb 18 16:11:47 2012 -0800 @@ -171,6 +171,53 @@ return array; } +/** + * Convert a GSList to an array of filenames (with the parent folder) + */ +static jobjectArray toPathAndFilenamesArray(JNIEnv *env, GSList* list) +{ + jstring str; + jclass stringCls; + GSList *iterator; + jobjectArray array; + int i; + char* entry; + + + if (list == NULL) { + return NULL; + } + + stringCls = (*env)->FindClass(env, "java/lang/String"); + if (stringCls == NULL) { + JNU_ThrowInternalError(env, "Could not get java.lang.String class"); + return NULL; + } + + array = (*env)->NewObjectArray(env, fp_gtk_g_slist_length(list), stringCls, + NULL); + if (array == NULL) { + JNU_ThrowInternalError(env, "Could not instantiate array files array"); + return NULL; + } + + i = 0; + for (iterator = list; iterator; iterator = iterator->next) { + entry = (char*) iterator->data; + + //check for leading slash. + if (entry[0] == '/') { + entry++; + } + + str = (*env)->NewStringUTF(env, entry); + (*env)->SetObjectArrayElement(env, array, i, str); + i++; + } + + return array; +} + static void handle_response(GtkWidget* aDialog, gint responseId, gpointer obj) { JNIEnv *env; @@ -183,16 +230,25 @@ env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2); current_folder = NULL; filenames = NULL; + gboolean full_path_names = FALSE; if (responseId == GTK_RESPONSE_ACCEPT) { current_folder = fp_gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(aDialog)); + if (current_folder == NULL) { + full_path_names = TRUE; + } filenames = fp_gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(aDialog)); } - - jcurrent_folder = (*env)->NewStringUTF(env, current_folder); - jfilenames = toFilenamesArray(env, filenames); - + if (full_path_names) { + //This is a hack for use with "Recent Folders" in gtk where each + //file could have its own directory. + jcurrent_folder = (*env)->NewStringUTF(env, "/"); + jfilenames = toPathAndFilenamesArray(env, filenames); + } else { + jcurrent_folder = (*env)->NewStringUTF(env, current_folder); + jfilenames = toFilenamesArray(env, filenames); + } (*env)->CallVoidMethod(env, obj, setFileInternalMethodID, jcurrent_folder, jfilenames); fp_g_free(current_folder);
--- a/src/solaris/native/sun/nio/ch/Sctp.h Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,334 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#ifndef SUN_NIO_CH_SCTP_H -#define SUN_NIO_CH_SCTP_H - -#ifdef __solaris__ - -#define _XPG4_2 -#define __EXTENSIONS__ -#include <sys/socket.h> -#include <netinet/sctp.h> -#include "jni.h" - -/* Current Solaris headers don't comply with draft rfc */ -#ifndef SCTP_EOF -#define SCTP_EOF MSG_EOF -#endif - -#ifndef SCTP_UNORDERED -#define SCTP_UNORDERED MSG_UNORDERED -#endif - -/* The current version of the socket API extension shipped with Solaris does - * not define the following options that the Java API (optionally) supports */ -#ifndef SCTP_EXPLICIT_EOR -#define SCTP_EXPLICIT_EOR -1 -#endif -#ifndef SCTP_FRAGMENT_INTERLEAVE -#define SCTP_FRAGMENT_INTERLEAVE -1 -#endif -#ifndef SCTP_SET_PEER_PRIMARY_ADDR -#define SCTP_SET_PEER_PRIMARY_ADDR -1 -#endif - -/* Function types to support dynamic linking of socket API extension functions - * for SCTP. This is so that there is no linkage depandancy during build or - * runtime for libsctp.*/ -typedef int sctp_getladdrs_func(int sock, sctp_assoc_t id, void **addrs); -typedef int sctp_freeladdrs_func(void* addrs); -typedef int sctp_getpaddrs_func(int sock, sctp_assoc_t id, void **addrs); -typedef int sctp_freepaddrs_func(void *addrs); -typedef int sctp_bindx_func(int sock, void *addrs, int addrcnt, int flags); -typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); - - - -#else /* __linux__ */ -#include <stdint.h> -#include <linux/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include "jni.h" - -//Causes compiler error if not found, should make warning and uncomment -/*#include <netinet/sctp.h>*/ - -#ifndef IPPROTO_SCTP -#define IPPROTO_SCTP 132 -#endif - -/* The current version of lksctp does - * not define the following option that the Java API (optionally) supports */ -#ifndef SCTP_EXPLICIT_EOR -#define SCTP_EXPLICIT_EOR -1 -#endif - -/* Definitions taken from lksctp-tools-1.0.8/src/include/netinet/sctp.h */ -#ifndef SCTP_INITMSG - -enum sctp_optname { - SCTP_RTOINFO, -#define SCTP_RTOINFO SCTP_RTOINFO - SCTP_ASSOCINFO, -#define SCTP_ASSOCINFO SCTP_ASSOCINFO - SCTP_INITMSG, -#define SCTP_INITMSG SCTP_INITMSG - SCTP_NODELAY, /* Get/set nodelay option. */ -#define SCTP_NODELAY SCTP_NODELAY - SCTP_AUTOCLOSE, -#define SCTP_AUTOCLOSE SCTP_AUTOCLOSE - SCTP_SET_PEER_PRIMARY_ADDR, -#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR - SCTP_PRIMARY_ADDR, -#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR - SCTP_ADAPTATION_LAYER, -#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER - SCTP_DISABLE_FRAGMENTS, -#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS - SCTP_PEER_ADDR_PARAMS, -#define SCTP_PEER_ADDR_PARAMS SCTP_PEER_ADDR_PARAMS - SCTP_DEFAULT_SEND_PARAM, -#define SCTP_DEFAULT_SEND_PARAM SCTP_DEFAULT_SEND_PARAM - SCTP_EVENTS, -#define SCTP_EVENTS SCTP_EVENTS - SCTP_I_WANT_MAPPED_V4_ADDR, /* Turn on/off mapped v4 addresses */ -#define SCTP_I_WANT_MAPPED_V4_ADDR SCTP_I_WANT_MAPPED_V4_ADDR - SCTP_MAXSEG, /* Get/set maximum fragment. */ -#define SCTP_MAXSEG SCTP_MAXSEG - SCTP_STATUS, -#define SCTP_STATUS SCTP_STATUS - SCTP_GET_PEER_ADDR_INFO, -#define SCTP_GET_PEER_ADDR_INFO SCTP_GET_PEER_ADDR_INFO - SCTP_DELAYED_ACK_TIME, -#define SCTP_DELAYED_ACK_TIME SCTP_DELAYED_ACK_TIME - SCTP_CONTEXT, /* Receive Context */ -#define SCTP_CONTEXT SCTP_CONTEXT - SCTP_FRAGMENT_INTERLEAVE, -#define SCTP_FRAGMENT_INTERLEAVE SCTP_FRAGMENT_INTERLEAVE - SCTP_PARTIAL_DELIVERY_POINT, /* Set/Get partial delivery point */ -#define SCTP_PARTIAL_DELIVERY_POINT SCTP_PARTIAL_DELIVERY_POINT - SCTP_MAX_BURST, /* Set/Get max burst */ -#define SCTP_MAX_BURST SCTP_MAX_BURST -}; - -enum sctp_sac_state { - SCTP_COMM_UP, - SCTP_COMM_LOST, - SCTP_RESTART, - SCTP_SHUTDOWN_COMP, - SCTP_CANT_STR_ASSOC, -}; - -enum sctp_spc_state { - SCTP_ADDR_AVAILABLE, - SCTP_ADDR_UNREACHABLE, - SCTP_ADDR_REMOVED, - SCTP_ADDR_ADDED, - SCTP_ADDR_MADE_PRIM, - SCTP_ADDR_CONFIRMED, -}; - -enum sctp_sinfo_flags { - SCTP_UNORDERED = 1, /* Send/receive message unordered. */ - SCTP_ADDR_OVER = 2, /* Override the primary destination. */ - SCTP_ABORT=4, /* Send an ABORT message to the peer. */ - SCTP_EOF=MSG_FIN, /* Initiate graceful shutdown process. */ -}; - -enum sctp_sn_type { - SCTP_SN_TYPE_BASE = (1<<15), - SCTP_ASSOC_CHANGE, - SCTP_PEER_ADDR_CHANGE, - SCTP_SEND_FAILED, - SCTP_REMOTE_ERROR, - SCTP_SHUTDOWN_EVENT, - SCTP_PARTIAL_DELIVERY_EVENT, - SCTP_ADAPTATION_INDICATION, -}; - -typedef enum sctp_cmsg_type { - SCTP_INIT, /* 5.2.1 SCTP Initiation Structure */ -#define SCTP_INIT SCTP_INIT - SCTP_SNDRCV, /* 5.2.2 SCTP Header Information Structure */ -#define SCTP_SNDRCV SCTP_SNDRCV -} sctp_cmsg_t; - -enum sctp_msg_flags { - MSG_NOTIFICATION = 0x8000, -#define MSG_NOTIFICATION MSG_NOTIFICATION -}; - -#define SCTP_BINDX_ADD_ADDR 0x01 -#define SCTP_BINDX_REM_ADDR 0x02 - -typedef __s32 sctp_assoc_t; - -struct sctp_initmsg { - __u16 sinit_num_ostreams; - __u16 sinit_max_instreams; - __u16 sinit_max_attempts; - __u16 sinit_max_init_timeo; -}; - -struct sctp_sndrcvinfo { - __u16 sinfo_stream; - __u16 sinfo_ssn; - __u16 sinfo_flags; - __u32 sinfo_ppid; - __u32 sinfo_context; - __u32 sinfo_timetolive; - __u32 sinfo_tsn; - __u32 sinfo_cumtsn; - sctp_assoc_t sinfo_assoc_id; -}; - -struct sctp_event_subscribe { - __u8 sctp_data_io_event; - __u8 sctp_association_event; - __u8 sctp_address_event; - __u8 sctp_send_failure_event; - __u8 sctp_peer_error_event; - __u8 sctp_shutdown_event; - __u8 sctp_partial_delivery_event; - __u8 sctp_adaptation_layer_event; -}; - -struct sctp_send_failed { - __u16 ssf_type; - __u16 ssf_flags; - __u32 ssf_length; - __u32 ssf_error; - struct sctp_sndrcvinfo ssf_info; - sctp_assoc_t ssf_assoc_id; - __u8 ssf_data[0]; -}; - -struct sctp_assoc_change { - __u16 sac_type; - __u16 sac_flags; - __u32 sac_length; - __u16 sac_state; - __u16 sac_error; - __u16 sac_outbound_streams; - __u16 sac_inbound_streams; - sctp_assoc_t sac_assoc_id; - __u8 sac_info[0]; -}; - -struct sctp_shutdown_event { - __u16 sse_type; - __u16 sse_flags; - __u32 sse_length; - sctp_assoc_t sse_assoc_id; -}; - -struct sctp_paddr_change { - __u16 spc_type; - __u16 spc_flags; - __u32 spc_length; - struct sockaddr_storage spc_aaddr; - int spc_state; - int spc_error; - sctp_assoc_t spc_assoc_id; -} __attribute__((packed, aligned(4))); - -struct sctp_remote_error { - __u16 sre_type; - __u16 sre_flags; - __u32 sre_length; - __u16 sre_error; - sctp_assoc_t sre_assoc_id; - __u8 sre_data[0]; -}; - -struct sctp_adaptation_event { - __u16 sai_type; - __u16 sai_flags; - __u32 sai_length; - __u32 sai_adaptation_ind; - sctp_assoc_t sai_assoc_id; -}; - -struct sctp_setprim { - sctp_assoc_t ssp_assoc_id; - struct sockaddr_storage ssp_addr; -} __attribute__((packed, aligned(4))); - -struct sctp_setpeerprim { - sctp_assoc_t sspp_assoc_id; - struct sockaddr_storage sspp_addr; -} __attribute__((packed, aligned(4))); - - -struct sctp_pdapi_event { - __u16 pdapi_type; - __u16 pdapi_flags; - __u32 pdapi_length; - __u32 pdapi_indication; - sctp_assoc_t pdapi_assoc_id; -}; - -union sctp_notification { - struct { - __u16 sn_type; /* Notification type. */ - __u16 sn_flags; - __u32 sn_length; - } sn_header; - struct sctp_assoc_change sn_assoc_change; - struct sctp_paddr_change sn_paddr_change; - struct sctp_remote_error sn_remote_error; - struct sctp_send_failed sn_send_failed; - struct sctp_shutdown_event sn_shutdown_event; - struct sctp_adaptation_event sn_adaptation_event; - struct sctp_pdapi_event sn_pdapi_event; -}; - -#endif /* SCTP_INITMSG */ - -/* Function types to support dynamic linking of socket API extension functions - * for SCTP. This is so that there is no linkage depandancy during build or - * runtime for libsctp.*/ -typedef int sctp_getladdrs_func(int sd, sctp_assoc_t id, struct sockaddr **addrs); -typedef int sctp_freeladdrs_func(struct sockaddr *addrs); -typedef int sctp_getpaddrs_func(int sd, sctp_assoc_t id, struct sockaddr **addrs); -typedef int sctp_freepaddrs_func(struct sockaddr *addrs); -typedef int sctp_bindx_func(int sd, struct sockaddr *addrs, int addrcnt, int flags); -typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); - - -#endif /* __linux__ */ - -sctp_getladdrs_func* nio_sctp_getladdrs; -sctp_freeladdrs_func* nio_sctp_freeladdrs; -sctp_getpaddrs_func* nio_sctp_getpaddrs; -sctp_freepaddrs_func* nio_sctp_freepaddrs; -sctp_bindx_func* nio_sctp_bindx; -sctp_peeloff_func* nio_sctp_peeloff; - -jboolean loadSocketExtensionFuncs(JNIEnv* env); - -#endif /* !SUN_NIO_CH_SCTP_H */
--- a/src/solaris/native/sun/nio/ch/SctpChannelImpl.c Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,594 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#include <stdlib.h> -#include <string.h> -#include "Sctp.h" - -#include "jni.h" -#include "nio_util.h" -#include "nio.h" -#include "net_util.h" -#include "net_util_md.h" -#include "sun_nio_ch_SctpNet.h" -#include "sun_nio_ch_SctpChannelImpl.h" -#include "sun_nio_ch_SctpAssocChange.h" -#include "sun_nio_ch_SctpResultContainer.h" -#include "sun_nio_ch_SctpPeerAddrChange.h" - -/* sizeof(union sctp_notification */ -#define NOTIFICATION_BUFFER_SIZE 280 - -#define MESSAGE_IMPL_CLASS "sun/nio/ch/SctpMessageInfoImpl" -#define RESULT_CONTAINER_CLASS "sun/nio/ch/SctpResultContainer" -#define SEND_FAILED_CLASS "sun/nio/ch/SctpSendFailed" -#define ASSOC_CHANGE_CLASS "sun/nio/ch/SctpAssocChange" -#define PEER_CHANGE_CLASS "sun/nio/ch/SctpPeerAddrChange" -#define SHUTDOWN_CLASS "sun/nio/ch/SctpShutdown" - -struct controlData { - int assocId; - unsigned short streamNumber; - jboolean unordered; - unsigned int ppid; -}; - -static jclass smi_class; /* sun.nio.ch.SctpMessageInfoImpl */ -static jmethodID smi_ctrID; /* sun.nio.ch.SctpMessageInfoImpl.<init> */ -static jfieldID src_valueID; /* sun.nio.ch.SctpResultContainer.value */ -static jfieldID src_typeID; /* sun.nio.ch.SctpResultContainer.type */ -static jclass ssf_class; /* sun.nio.ch.SctpSendFailed */ -static jmethodID ssf_ctrID; /* sun.nio.ch.SctpSendFailed.<init> */ -static jclass sac_class; /* sun.nio.ch.SctpAssociationChanged */ -static jmethodID sac_ctrID; /* sun.nio.ch.SctpAssociationChanged.<init> */ -static jclass spc_class; /* sun.nio.ch.SctpPeerAddressChanged */ -static jmethodID spc_ctrID; /* sun.nio.ch.SctpPeerAddressChanged.<init> */ -static jclass ss_class; /* sun.nio.ch.SctpShutdown */ -static jmethodID ss_ctrID; /* sun.nio.ch.SctpShutdown.<init> */ -static jfieldID isa_addrID; /* java.net.InetSocketAddress.addr */ -static jfieldID isa_portID; /* java.net.InetSocketAddress.port */ - -/* defined in SctpNet.c */ -jobject SockAddrToInetSocketAddress(JNIEnv* env, struct sockaddr* addr); - -/* use SocketChannelImpl's checkConnect implementation */ -extern jint Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv* env, - jobject this, jobject fdo, jboolean block, jboolean ready); - -/* - * Class: sun_nio_ch_SctpChannelImpl - * Method: initIDs - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpChannelImpl_initIDs - (JNIEnv *env, jclass klass) { - jclass cls; - - /* SctpMessageInfoImpl */ - cls = (*env)->FindClass(env, MESSAGE_IMPL_CLASS); - CHECK_NULL(cls); - smi_class = (*env)->NewGlobalRef(env, cls); - CHECK_NULL(smi_class); - smi_ctrID = (*env)->GetMethodID(env, cls, "<init>", - "(ILjava/net/SocketAddress;IIZZI)V"); - CHECK_NULL(smi_ctrID); - - /* SctpResultContainer */ - cls = (*env)->FindClass(env, RESULT_CONTAINER_CLASS); - CHECK_NULL(cls); - src_valueID = (*env)->GetFieldID(env, cls, "value", "Ljava/lang/Object;"); - CHECK_NULL(src_valueID); - src_typeID = (*env)->GetFieldID(env, cls, "type", "I"); - CHECK_NULL(src_typeID); - - /* SctpSendFailed */ - cls = (*env)->FindClass(env, SEND_FAILED_CLASS); - CHECK_NULL(cls); - ssf_class = (*env)->NewGlobalRef(env, cls); - CHECK_NULL(ssf_class); - ssf_ctrID = (*env)->GetMethodID(env, cls, "<init>", - "(ILjava/net/SocketAddress;Ljava/nio/ByteBuffer;II)V"); - CHECK_NULL(ssf_ctrID); - - /* SctpAssocChange */ - cls = (*env)->FindClass(env, ASSOC_CHANGE_CLASS); - CHECK_NULL(cls); - sac_class = (*env)->NewGlobalRef(env, cls); - CHECK_NULL(sac_class); - sac_ctrID = (*env)->GetMethodID(env, cls, "<init>", "(IIII)V"); - CHECK_NULL(sac_ctrID); - - /* SctpPeerAddrChange */ - cls = (*env)->FindClass(env, PEER_CHANGE_CLASS); - CHECK_NULL(cls); - spc_class = (*env)->NewGlobalRef(env, cls); - CHECK_NULL(spc_class); - spc_ctrID = (*env)->GetMethodID(env, cls, "<init>", - "(ILjava/net/SocketAddress;I)V"); - CHECK_NULL(spc_ctrID); - - /* sun.nio.ch.SctpShutdown */ - cls = (*env)->FindClass(env, SHUTDOWN_CLASS); - CHECK_NULL(cls); - ss_class = (*env)->NewGlobalRef(env, cls); - CHECK_NULL(ss_class); - ss_ctrID = (*env)->GetMethodID(env, cls, "<init>", "(I)V"); - CHECK_NULL(ss_ctrID); - - /* InetSocketAddress */ - cls = (*env)->FindClass(env, "java/net/InetSocketAddress"); - CHECK_NULL(cls); - isa_addrID = (*env)->GetFieldID(env, cls, "addr", "Ljava/net/InetAddress;"); - CHECK_NULL(isa_addrID); - isa_portID = (*env)->GetFieldID(env, cls, "port", "I"); -} - -void getControlData - (struct msghdr* msg, struct controlData* cdata) { - struct cmsghdr* cmsg; - - for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) { - if (cmsg->cmsg_level == IPPROTO_SCTP && cmsg->cmsg_type == SCTP_SNDRCV) { - struct sctp_sndrcvinfo *sri; - - sri = (struct sctp_sndrcvinfo *) CMSG_DATA(cmsg); - cdata->assocId = sri->sinfo_assoc_id; - cdata->streamNumber = sri->sinfo_stream; - cdata->unordered = (sri->sinfo_flags & SCTP_UNORDERED) ? JNI_TRUE : - JNI_FALSE; - cdata->ppid = ntohl(sri->sinfo_ppid); - - return; - } - } - return; -} - -void setControlData - (struct msghdr* msg, struct controlData* cdata) { - struct cmsghdr* cmsg; - struct sctp_sndrcvinfo *sri; - - cmsg = CMSG_FIRSTHDR(msg); - cmsg->cmsg_level = IPPROTO_SCTP; - cmsg->cmsg_type = SCTP_SNDRCV; - cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo)); - - /* Initialize the payload */ - sri = (struct sctp_sndrcvinfo*) CMSG_DATA(cmsg); - memset(sri, 0, sizeof (*sri)); - - if (cdata->streamNumber > 0) { - sri->sinfo_stream = cdata->streamNumber; - } - if (cdata->assocId > 0) { - sri->sinfo_assoc_id = cdata->assocId; - } - if (cdata->unordered == JNI_TRUE) { - sri->sinfo_flags = sri->sinfo_flags | SCTP_UNORDERED; - } - - if (cdata->ppid > 0) { - sri->sinfo_ppid = htonl(cdata->ppid); - } - - /* Sum of the length of all control messages in the buffer. */ - msg->msg_controllen = cmsg->cmsg_len; -} - -// TODO: test: can create send failed without any data? if so need to -// update API so that buffer can be null if no data. -void handleSendFailed - (JNIEnv* env, int fd, jobject resultContainerObj, struct sctp_send_failed *ssf, - int read, jboolean isEOR, struct sockaddr* sap) { - jobject bufferObj = NULL, resultObj, isaObj; - char *addressP; - struct sctp_sndrcvinfo *sri; - int remaining, dataLength; - - /* the actual undelivered message data is directly after the ssf */ - int dataOffset = sizeof(struct sctp_send_failed); - - sri = (struct sctp_sndrcvinfo*) &ssf->ssf_info; - - /* the number of bytes remaining to be read in the sctp_send_failed notif*/ - remaining = ssf->ssf_length - read; - - /* the size of the actual undelivered message */ - dataLength = ssf->ssf_length - dataOffset; - - /* retrieved address from sockaddr */ - isaObj = SockAddrToInetSocketAddress(env, sap); - - /* data retrieved from sff_data */ - if (dataLength > 0) { - struct iovec iov[1]; - struct msghdr msg[1]; - int rv, alreadyRead; - char *dataP = (char*) ssf; - dataP += dataOffset; - - if ((addressP = malloc(dataLength)) == NULL) { - JNU_ThrowOutOfMemoryError(env, "handleSendFailed"); - return; - } - - memset(msg, 0, sizeof (*msg)); - msg->msg_iov = iov; - msg->msg_iovlen = 1; - - bufferObj = (*env)->NewDirectByteBuffer(env, addressP, dataLength); - CHECK_NULL(bufferObj); - - alreadyRead = read - dataOffset; - if (alreadyRead > 0) { - memcpy(addressP, /*ssf->ssf_data*/ dataP, alreadyRead); - iov->iov_base = addressP + alreadyRead; - iov->iov_len = dataLength - alreadyRead; - } else { - iov->iov_base = addressP; - iov->iov_len = dataLength; - } - - if (remaining > 0) { - if ((rv = recvmsg(fd, msg, 0)) < 0) { - handleSocketError(env, errno); - return; - } - - if (rv != (dataLength - alreadyRead) || !(msg->msg_flags & MSG_EOR)) { - //TODO: assert false: "should not reach here"; - return; - } - // TODO: Set and document (in API) buffers position. - } - } - - /* create SctpSendFailed */ - resultObj = (*env)->NewObject(env, ssf_class, ssf_ctrID, ssf->ssf_assoc_id, - isaObj, bufferObj, ssf->ssf_error, sri->sinfo_stream); - CHECK_NULL(resultObj); - (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); - (*env)->SetIntField(env, resultContainerObj, src_typeID, - sun_nio_ch_SctpResultContainer_SEND_FAILED); -} - -void handleAssocChange - (JNIEnv* env, jobject resultContainerObj, struct sctp_assoc_change *sac) { - jobject resultObj; - int state = 0; - - switch (sac->sac_state) { - case SCTP_COMM_UP : - state = sun_nio_ch_SctpAssocChange_SCTP_COMM_UP; - break; - case SCTP_COMM_LOST : - state = sun_nio_ch_SctpAssocChange_SCTP_COMM_LOST; - break; - case SCTP_RESTART : - state = sun_nio_ch_SctpAssocChange_SCTP_RESTART; - break; - case SCTP_SHUTDOWN_COMP : - state = sun_nio_ch_SctpAssocChange_SCTP_SHUTDOWN; - break; - case SCTP_CANT_STR_ASSOC : - state = sun_nio_ch_SctpAssocChange_SCTP_CANT_START; - } - - /* create SctpAssociationChanged */ - resultObj = (*env)->NewObject(env, sac_class, sac_ctrID, sac->sac_assoc_id, - state, sac->sac_outbound_streams, sac->sac_inbound_streams); - CHECK_NULL(resultObj); - (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); - (*env)->SetIntField(env, resultContainerObj, src_typeID, - sun_nio_ch_SctpResultContainer_ASSOCIATION_CHANGED); -} - -void handleShutdown - (JNIEnv* env, jobject resultContainerObj, struct sctp_shutdown_event* sse) { - /* create SctpShutdown */ - jobject resultObj = (*env)->NewObject(env, ss_class, ss_ctrID, sse->sse_assoc_id); - CHECK_NULL(resultObj); - (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); - (*env)->SetIntField(env, resultContainerObj, src_typeID, - sun_nio_ch_SctpResultContainer_SHUTDOWN); -} - -void handlePeerAddrChange - (JNIEnv* env, jobject resultContainerObj, struct sctp_paddr_change* spc) { - int event = 0; - jobject addressObj, resultObj; - unsigned int state = spc->spc_state; - - switch (state) { - case SCTP_ADDR_AVAILABLE : - event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_AVAILABLE; - break; - case SCTP_ADDR_UNREACHABLE : - event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_UNREACHABLE; - break; - case SCTP_ADDR_REMOVED : - event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_REMOVED; - break; - case SCTP_ADDR_ADDED : - event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_ADDED; - break; - case SCTP_ADDR_MADE_PRIM : - event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_MADE_PRIM; -#ifdef __linux__ /* Solaris currently doesn't support SCTP_ADDR_CONFIRMED */ - break; - case SCTP_ADDR_CONFIRMED : - event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_CONFIRMED; -#endif /* __linux__ */ - } - - addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr); - - /* create SctpPeerAddressChanged */ - resultObj = (*env)->NewObject(env, spc_class, spc_ctrID, spc->spc_assoc_id, - addressObj, event); - CHECK_NULL(resultObj); - (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); - (*env)->SetIntField(env, resultContainerObj, src_typeID, - sun_nio_ch_SctpResultContainer_PEER_ADDRESS_CHANGED); -} - -void handleUninteresting - (union sctp_notification *snp) { - //fprintf(stdout,"\nNative: handleUninterestingNotification: Receive notification type [%u]", snp->sn_header.sn_type); -} - -/** - * Handle notifications from the SCTP stack. - * Returns JNI_TRUE if the notification is one that is of interest to the - * Java API, otherwise JNI_FALSE. - */ -jboolean handleNotification - (JNIEnv* env, int fd, jobject resultContainerObj, union sctp_notification* snp, - int read, jboolean isEOR, struct sockaddr* sap) { - switch (snp->sn_header.sn_type) { - case SCTP_SEND_FAILED: - handleSendFailed(env, fd, resultContainerObj, &snp->sn_send_failed, - read, isEOR, sap); - return JNI_TRUE; - case SCTP_ASSOC_CHANGE: - handleAssocChange(env, resultContainerObj, &snp->sn_assoc_change); - return JNI_TRUE; - case SCTP_SHUTDOWN_EVENT: - handleShutdown(env, resultContainerObj, &snp->sn_shutdown_event); - return JNI_TRUE; - case SCTP_PEER_ADDR_CHANGE: - handlePeerAddrChange(env, resultContainerObj, &snp->sn_paddr_change); - return JNI_TRUE; - default : - /* the Java API is not interested in this event, maybe we are? */ - handleUninteresting(snp); - } - return JNI_FALSE; -} - -void handleMessage - (JNIEnv* env, jobject resultContainerObj, struct msghdr* msg,int read, - jboolean isEOR, struct sockaddr* sap) { - jobject isa, resultObj; - struct controlData cdata[1]; - - if (read == 0) { - /* we reached EOF */ - read = -1; - } - - isa = SockAddrToInetSocketAddress(env, sap); - getControlData(msg, cdata); - - /* create SctpMessageInfoImpl */ - resultObj = (*env)->NewObject(env, smi_class, smi_ctrID, cdata->assocId, - isa, read, cdata->streamNumber, - isEOR ? JNI_TRUE : JNI_FALSE, - cdata->unordered, cdata->ppid); - CHECK_NULL(resultObj); - (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); - (*env)->SetIntField(env, resultContainerObj, src_typeID, - sun_nio_ch_SctpResultContainer_MESSAGE); -} - -/* - * Class: sun_nio_ch_SctpChannelImpl - * Method: receive0 - * Signature: (ILsun/nio/ch/SctpResultContainer;JIZ)I - */ -JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_receive0 - (JNIEnv *env, jclass klass, jint fd, jobject resultContainerObj, - jlong address, jint length, jboolean peek) { - SOCKADDR sa; - int sa_len = sizeof(sa); - ssize_t rv = 0; - jlong *addr = jlong_to_ptr(address); - struct iovec iov[1]; - struct msghdr msg[1]; - char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))]; - int flags = peek == JNI_TRUE ? MSG_PEEK : 0; - - /* Set up the msghdr structure for receiving */ - memset(msg, 0, sizeof (*msg)); - msg->msg_name = &sa; - msg->msg_namelen = sa_len; - iov->iov_base = addr; - iov->iov_len = length; - msg->msg_iov = iov; - msg->msg_iovlen = 1; - msg->msg_control = cbuf; - msg->msg_controllen = sizeof(cbuf); - msg->msg_flags = 0; - - do { - if ((rv = recvmsg(fd, msg, flags)) < 0) { - if (errno == EWOULDBLOCK) { - return IOS_UNAVAILABLE; - } else if (errno == EINTR) { - return IOS_INTERRUPTED; - -#ifdef __linux__ - } else if (errno == ENOTCONN) { - /* ENOTCONN when EOF reached */ - rv = 0; - /* there will be no control data */ - msg->msg_controllen = 0; -#endif /* __linux__ */ - - } else { - handleSocketError(env, errno); - return 0; - } - } - - if (msg->msg_flags & MSG_NOTIFICATION) { - char *bufp = (char*)addr; - union sctp_notification *snp; - - if (!(msg->msg_flags & MSG_EOR) && length < NOTIFICATION_BUFFER_SIZE) { - char buf[NOTIFICATION_BUFFER_SIZE]; - int rvSAVE = rv; - memcpy(buf, addr, rv); - iov->iov_base = buf + rv; - iov->iov_len = NOTIFICATION_BUFFER_SIZE - rv; - if ((rv = recvmsg(fd, msg, flags)) < 0) { - handleSocketError(env, errno); - return 0; - } - bufp = buf; - rv += rvSAVE; - } - snp = (union sctp_notification *) bufp; - if (handleNotification(env, fd, resultContainerObj, snp, rv, - (msg->msg_flags & MSG_EOR), - (struct sockaddr*)&sa ) == JNI_TRUE) { - /* We have received a notification that is of interest to - to the Java API. The appropriate notification will be - set in the result container. */ - return 0; - } - - // set iov back to addr, and reset msg_controllen - iov->iov_base = addr; - iov->iov_len = length; - msg->msg_control = cbuf; - msg->msg_controllen = sizeof(cbuf); - } - } while (msg->msg_flags & MSG_NOTIFICATION); - - handleMessage(env, resultContainerObj, msg, rv, - (msg->msg_flags & MSG_EOR), (struct sockaddr*)&sa); - return rv; -} - -/* - * Class: sun_nio_ch_SctpChannelImpl - * Method: send0 - * Signature: (IJILjava/net/SocketAddress;IIZI)I - */ -JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_send0 - (JNIEnv *env, jclass klass, jint fd, jlong address, jint length, - jobject saTarget, jint assocId, jint streamNumber, jboolean unordered, - jint ppid) { - SOCKADDR sa; - int sa_len = sizeof(sa); - ssize_t rv = 0; - jlong *addr = jlong_to_ptr(address); - struct iovec iov[1]; - struct msghdr msg[1]; - int cbuf_size = CMSG_SPACE(sizeof (struct sctp_sndrcvinfo)); - char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))]; - struct controlData cdata[1]; - - /* SctpChannel: - * saTarget may contain the preferred address or NULL to use primary, - * assocId will always be -1 - * SctpMultiChannell: - * Setup new association, saTarget will contain address, assocId = -1 - * Association already existing, assocId != -1, saTarget = preferred addr - */ - if (saTarget != NULL /*&& assocId <= 0*/) { - - jobject targetAddress = (*env)->GetObjectField(env, saTarget, isa_addrID); - jint targetPort = (*env)->GetIntField(env, saTarget, isa_portID); - - if (NET_InetAddressToSockaddr(env, targetAddress, targetPort, - (struct sockaddr *)&sa, - &sa_len, JNI_TRUE) != 0) { - return IOS_THROWN; - } - } else { - memset(&sa, '\x0', sa_len); - sa_len = 0; - } - - /* Set up the msghdr structure for sending */ - memset(msg, 0, sizeof (*msg)); - memset(cbuf, 0, cbuf_size); - msg->msg_name = &sa; - msg->msg_namelen = sa_len; - iov->iov_base = addr; - iov->iov_len = length; - msg->msg_iov = iov; - msg->msg_iovlen = 1; - msg->msg_control = cbuf; - msg->msg_controllen = cbuf_size; - msg->msg_flags = 0; - - cdata->streamNumber = streamNumber; - cdata->assocId = assocId; - cdata->unordered = unordered; - cdata->ppid = ppid; - setControlData(msg, cdata); - - if ((rv = sendmsg(fd, msg, 0)) < 0) { - if (errno == EWOULDBLOCK) { - return IOS_UNAVAILABLE; - } else if (errno == EINTR) { - return IOS_INTERRUPTED; - } else if (errno == EPIPE) { - JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", - "Socket is shutdown for writing"); - } else { - handleSocketError(env, errno); - return 0; - } - } - - return rv; -} - -/* - * Class: sun_nio_ch_SctpChannelImpl - * Method: checkConnect - * Signature: (Ljava/io/FileDescriptor;ZZ)I - */ -JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_checkConnect - (JNIEnv* env, jobject this, jobject fdo, jboolean block, jboolean ready) { - return Java_sun_nio_ch_SocketChannelImpl_checkConnect(env, this, - fdo, block, ready); -} -
--- a/src/solaris/native/sun/nio/ch/SctpNet.c Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,753 +0,0 @@ -/* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#include <stdlib.h> -#include <string.h> -#include <dlfcn.h> - -#include "Sctp.h" -#include "jni.h" -#include "jni_util.h" -#include "nio_util.h" -#include "nio.h" -#include "net_util.h" -#include "net_util_md.h" -#include "sun_nio_ch_SctpNet.h" -#include "sun_nio_ch_SctpStdSocketOption.h" - -static jclass isaCls = 0; -static jmethodID isaCtrID = 0; - -static const char* nativeSctpLib = "libsctp.so.1"; -static jboolean funcsLoaded = JNI_FALSE; - -JNIEXPORT jint JNICALL JNI_OnLoad - (JavaVM *vm, void *reserved) { - return JNI_VERSION_1_2; -} - -static int preCloseFD = -1; /* File descriptor to which we dup other fd's - before closing them for real */ - -/** - * Loads the native sctp library that contains the socket extension - * functions, as well as locating the individual functions. - * There will be a pending exception if this method returns false. - */ -jboolean loadSocketExtensionFuncs - (JNIEnv* env) { - if (dlopen(nativeSctpLib, RTLD_GLOBAL | RTLD_LAZY) == NULL) { - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - dlerror()); - return JNI_FALSE; - } - - if ((nio_sctp_getladdrs = (sctp_getladdrs_func*) - dlsym(RTLD_DEFAULT, "sctp_getladdrs")) == NULL) { - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - dlerror()); - return JNI_FALSE; - } - - if ((nio_sctp_freeladdrs = (sctp_freeladdrs_func*) - dlsym(RTLD_DEFAULT, "sctp_freeladdrs")) == NULL) { - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - dlerror()); - return JNI_FALSE; - } - - if ((nio_sctp_getpaddrs = (sctp_getpaddrs_func*) - dlsym(RTLD_DEFAULT, "sctp_getpaddrs")) == NULL) { - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - dlerror()); - return JNI_FALSE; - } - - if ((nio_sctp_freepaddrs = (sctp_freepaddrs_func*) - dlsym(RTLD_DEFAULT, "sctp_freepaddrs")) == NULL) { - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - dlerror()); - return JNI_FALSE; - } - - if ((nio_sctp_bindx = (sctp_bindx_func*) - dlsym(RTLD_DEFAULT, "sctp_bindx")) == NULL) { - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - dlerror()); - return JNI_FALSE; - } - - if ((nio_sctp_peeloff = (sctp_peeloff_func*) - dlsym(RTLD_DEFAULT, "sctp_peeloff")) == NULL) { - JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", - dlerror()); - return JNI_FALSE; - } - - funcsLoaded = JNI_TRUE; - return JNI_TRUE; -} - -jint -handleSocketError(JNIEnv *env, jint errorValue) -{ - char *xn; - switch (errorValue) { - case EINPROGRESS: /* Non-blocking connect */ - return 0; - case EPROTO: - xn= JNU_JAVANETPKG "ProtocolException"; - break; - case ECONNREFUSED: - xn = JNU_JAVANETPKG "ConnectException"; - break; - case ETIMEDOUT: - xn = JNU_JAVANETPKG "ConnectException"; - break; - case EHOSTUNREACH: - xn = JNU_JAVANETPKG "NoRouteToHostException"; - break; - case EADDRINUSE: /* Fall through */ - case EADDRNOTAVAIL: - xn = JNU_JAVANETPKG "BindException"; - break; - default: - xn = JNU_JAVANETPKG "SocketException"; - break; - } - errno = errorValue; - JNU_ThrowByNameWithLastError(env, xn, "NioSocketError"); - return IOS_THROWN; -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: init - * Signature: ()V - */ -JNIEXPORT void JNICALL -Java_sun_nio_ch_SctpNet_init - (JNIEnv *env, jclass cl) { - int sp[2]; - if (socketpair(PF_UNIX, SOCK_STREAM, 0, sp) < 0) { - JNU_ThrowIOExceptionWithLastError(env, "socketpair failed"); - return; - } - preCloseFD = sp[0]; - close(sp[1]); -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: socket0 - * Signature: (Z)I - */ -JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpNet_socket0 - (JNIEnv *env, jclass klass, jboolean oneToOne) { - int fd; - struct sctp_event_subscribe event; -#ifdef AF_INET6 - int domain = ipv6_available() ? AF_INET6 : AF_INET; -#else - int domain = AF_INET; -#endif - - /* Try to load the socket API extension functions */ - if (!funcsLoaded && !loadSocketExtensionFuncs(env)) { - return 0; - } - - fd = socket(domain, (oneToOne ? SOCK_STREAM : SOCK_SEQPACKET), IPPROTO_SCTP); - - if (fd < 0) { - return handleSocketError(env, errno); - } - - /* Enable events */ - memset(&event, 0, sizeof(event)); - event.sctp_data_io_event = 1; - event.sctp_association_event = 1; - event.sctp_address_event = 1; - event.sctp_send_failure_event = 1; - //event.sctp_peer_error_event = 1; - event.sctp_shutdown_event = 1; - //event.sctp_partial_delivery_event = 1; - //event.sctp_adaptation_layer_event = 1; - if (setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event, sizeof(event)) != 0) { - handleSocketError(env, errno); - } - return fd; -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: bindx - * Signature: (I[Ljava/net/InetAddress;IIZ)V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_bindx - (JNIEnv *env, jclass klass, jint fd, jobjectArray addrs, jint port, - jint addrsLength, jboolean add, jboolean preferIPv6) { - SOCKADDR *sap, *tmpSap; - int i, sa_len = sizeof(SOCKADDR); - jobject ia; - - if (addrsLength < 1) - return; - - if ((sap = calloc(addrsLength, sa_len)) == NULL) { - JNU_ThrowOutOfMemoryError(env, "heap allocation failure"); - return; - } - - tmpSap = sap; - for (i=0; i<addrsLength; i++) { - ia = (*env)->GetObjectArrayElement(env, addrs, i); - if (NET_InetAddressToSockaddr(env, ia, port, (struct sockaddr*)tmpSap, - &sa_len, preferIPv6) != 0) { - free(sap); - return; - } - tmpSap++; - } - - if (nio_sctp_bindx(fd, (void*)sap, addrsLength, add ? SCTP_BINDX_ADD_ADDR : - SCTP_BINDX_REM_ADDR) != 0) { - handleSocketError(env, errno); - } - - free(sap); -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: listen0 - * Signature: (II)V - */ -JNIEXPORT void JNICALL -Java_sun_nio_ch_SctpNet_listen0 - (JNIEnv *env, jclass cl, jint fd, jint backlog) { - if (listen(fd, backlog) < 0) - handleSocketError(env, errno); -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: connect0 - * Signature: (ILjava/net/InetAddress;I)I - */ -JNIEXPORT jint JNICALL -Java_sun_nio_ch_SctpNet_connect0 - (JNIEnv *env, jclass clazz, int fd, jobject iao, jint port) { - SOCKADDR sa; - int sa_len = SOCKADDR_LEN; - int rv; - - if (NET_InetAddressToSockaddr(env, iao, port, (struct sockaddr *) &sa, - &sa_len, JNI_TRUE) != 0) { - return IOS_THROWN; - } - - rv = connect(fd, (struct sockaddr *)&sa, sa_len); - if (rv != 0) { - if (errno == EINPROGRESS) { - return IOS_UNAVAILABLE; - } else if (errno == EINTR) { - return IOS_INTERRUPTED; - } - return handleSocketError(env, errno); - } - return 1; -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: close0 - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_sun_nio_ch_SctpNet_close0 - (JNIEnv *env, jclass clazz, jint fd) { - if (fd != -1) { - int rv = close(fd); - if (rv < 0) - JNU_ThrowIOExceptionWithLastError(env, "Close failed"); - } -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: preClose0 - * Signature: (I)V - */ -JNIEXPORT void JNICALL -Java_sun_nio_ch_SctpNet_preClose0 - (JNIEnv *env, jclass clazz, jint fd) { - if (preCloseFD >= 0) { - if (dup2(preCloseFD, fd) < 0) - JNU_ThrowIOExceptionWithLastError(env, "dup2 failed"); - } -} - -void initializeISA - (JNIEnv* env) { - if (isaCls == 0) { - jclass c = (*env)->FindClass(env, "java/net/InetSocketAddress"); - CHECK_NULL(c); - isaCls = (*env)->NewGlobalRef(env, c); - CHECK_NULL(isaCls); - (*env)->DeleteLocalRef(env, c); - isaCtrID = (*env)->GetMethodID(env, isaCls, "<init>", - "(Ljava/net/InetAddress;I)V"); - } -} - -jobject SockAddrToInetSocketAddress - (JNIEnv *env, struct sockaddr* sap) { - int port = 0; - - jobject ia = NET_SockaddrToInetAddress(env, sap, &port); - if (ia == NULL) - return NULL; - - if (isaCls == 0) { - initializeISA(env); - CHECK_NULL_RETURN(isaCls, NULL); - } - - return (*env)->NewObject(env, isaCls, isaCtrID, ia, port); -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: getLocalAddresses0 - * Signature: (I)[Ljava/net/SocketAddress; - */ -JNIEXPORT jobjectArray JNICALL Java_sun_nio_ch_SctpNet_getLocalAddresses0 - (JNIEnv *env, jclass klass, jint fd) { - void *addr_buf, *laddr; - struct sockaddr* sap; - int i, addrCount; - jobjectArray isaa; - -#ifdef __solaris__ - if ((addrCount = nio_sctp_getladdrs(fd, 0, (void **)&addr_buf)) == -1) { -#else /* __linux__ */ - if ((addrCount = nio_sctp_getladdrs(fd, 0, (struct sockaddr **)&addr_buf)) == -1) { -#endif - handleSocketError(env, errno); - return NULL; - } - - if (addrCount < 1) - return NULL; - - if (isaCls == 0) { - initializeISA(env); - CHECK_NULL_RETURN(isaCls, NULL); - } - - isaa = (*env)->NewObjectArray(env, addrCount, isaCls, NULL); - if (isaa == NULL) { - nio_sctp_freeladdrs(addr_buf); - return NULL; - } - - laddr = addr_buf; - for (i=0; i<addrCount; i++) { - int port = 0; - jobject isa = NULL, ia; - sap = (struct sockaddr*)addr_buf; - ia = NET_SockaddrToInetAddress(env, sap, &port); - if (ia != NULL) - isa = (*env)->NewObject(env, isaCls, isaCtrID, ia, port); - if (isa != NULL) - (*env)->SetObjectArrayElement(env, isaa, i, isa); - - if (sap->sa_family == AF_INET) - addr_buf = ((struct sockaddr_in*)addr_buf) + 1; - else - addr_buf = ((struct sockaddr_in6*)addr_buf) + 1; - } - - nio_sctp_freeladdrs(laddr); - return isaa; -} - -jobjectArray getRemoteAddresses - (JNIEnv *env, jint fd, sctp_assoc_t id) { - void *addr_buf, *paddr; - struct sockaddr* sap; - int i, addrCount; - jobjectArray isaa; - -#if __solaris__ - if ((addrCount = nio_sctp_getpaddrs(fd, id, (void **)&addr_buf)) == -1) { -#else /* __linux__ */ - if ((addrCount = nio_sctp_getpaddrs(fd, id, (struct sockaddr**)&addr_buf)) == -1) { -#endif - handleSocketError(env, errno); - return NULL; - } - - if (addrCount < 1) - return NULL; - - if (isaCls == 0) { - initializeISA(env); - CHECK_NULL_RETURN(isaCls, NULL); - } - - isaa = (*env)->NewObjectArray(env, addrCount, isaCls, NULL); - if (isaa == NULL) { - nio_sctp_freepaddrs(addr_buf); - return NULL; - } - - paddr = addr_buf; - for (i=0; i<addrCount; i++) { - jobject ia, isa = NULL; - int port; - sap = (struct sockaddr*)addr_buf; - ia = NET_SockaddrToInetAddress(env, sap, &port); - if (ia != NULL) - isa = (*env)->NewObject(env, isaCls, isaCtrID, ia, port); - if (isa != NULL) - (*env)->SetObjectArrayElement(env, isaa, i, isa); - - if (sap->sa_family == AF_INET) - addr_buf = ((struct sockaddr_in*)addr_buf) + 1; - else - addr_buf = ((struct sockaddr_in6*)addr_buf) + 1; - } - - nio_sctp_freepaddrs(paddr); - - return isaa; -} - - /* - * Class: sun_nio_ch_SctpNet - * Method: getRemoteAddresses0 - * Signature: (II)[Ljava/net/SocketAddress; - */ -JNIEXPORT jobjectArray JNICALL Java_sun_nio_ch_SctpNet_getRemoteAddresses0 - (JNIEnv *env, jclass klass, jint fd, jint assocId) { - return getRemoteAddresses(env, fd, assocId); -} - -/* Map the Java level option to the native level */ -int mapSocketOption - (jint cmd, int *level, int *optname) { - static struct { - jint cmd; - int level; - int optname; - } const opts[] = { - { sun_nio_ch_SctpStdSocketOption_SCTP_DISABLE_FRAGMENTS, IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS }, - { sun_nio_ch_SctpStdSocketOption_SCTP_EXPLICIT_COMPLETE, IPPROTO_SCTP, SCTP_EXPLICIT_EOR }, - { sun_nio_ch_SctpStdSocketOption_SCTP_FRAGMENT_INTERLEAVE, IPPROTO_SCTP, SCTP_FRAGMENT_INTERLEAVE }, - { sun_nio_ch_SctpStdSocketOption_SCTP_NODELAY, IPPROTO_SCTP, SCTP_NODELAY }, - { sun_nio_ch_SctpStdSocketOption_SO_SNDBUF, SOL_SOCKET, SO_SNDBUF }, - { sun_nio_ch_SctpStdSocketOption_SO_RCVBUF, SOL_SOCKET, SO_RCVBUF }, - { sun_nio_ch_SctpStdSocketOption_SO_LINGER, SOL_SOCKET, SO_LINGER } }; - - int i; - for (i=0; i<(int)(sizeof(opts) / sizeof(opts[0])); i++) { - if (cmd == opts[i].cmd) { - *level = opts[i].level; - *optname = opts[i].optname; - return 0; - } - } - - /* not found */ - return -1; -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: setIntOption0 - * Signature: (III)V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setIntOption0 - (JNIEnv *env, jclass klass, jint fd, jint opt, int arg) { - int klevel, kopt; - int result; - struct linger linger; - void *parg; - int arglen; - - if (mapSocketOption(opt, &klevel, &kopt) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "Unsupported socket option"); - return; - } - - if (opt == sun_nio_ch_SctpStdSocketOption_SO_LINGER) { - parg = (void *)&linger; - arglen = sizeof(linger); - if (arg >= 0) { - linger.l_onoff = 1; - linger.l_linger = arg; - } else { - linger.l_onoff = 0; - linger.l_linger = 0; - } - } else { - parg = (void *)&arg; - arglen = sizeof(arg); - } - - if (NET_SetSockOpt(fd, klevel, kopt, parg, arglen) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "sun_nio_ch_SctpNet.setIntOption0"); - } -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: getIntOption0 - * Signature: (II)I - */ -JNIEXPORT int JNICALL Java_sun_nio_ch_SctpNet_getIntOption0 - (JNIEnv *env, jclass klass, jint fd, jint opt) { - int klevel, kopt; - int result; - struct linger linger; - void *arg; - int arglen; - - if (mapSocketOption(opt, &klevel, &kopt) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "Unsupported socket option"); - return -1; - } - - if (opt == sun_nio_ch_SctpStdSocketOption_SO_LINGER) { - arg = (void *)&linger; - arglen = sizeof(linger); - } else { - arg = (void *)&result; - arglen = sizeof(result); - } - - if (NET_GetSockOpt(fd, klevel, kopt, arg, &arglen) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "sun.nio.ch.Net.getIntOption"); - return -1; - } - - if (opt == sun_nio_ch_SctpStdSocketOption_SO_LINGER) - return linger.l_onoff ? linger.l_linger : -1; - else - return result; -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: getPrimAddrOption0 - * Signature: (II)Ljava/net/SocketAddress; - */ -JNIEXPORT jobject JNICALL Java_sun_nio_ch_SctpNet_getPrimAddrOption0 - (JNIEnv *env, jclass klass, jint fd, jint assocId) { - struct sctp_setprim prim; - unsigned int prim_len = sizeof(prim); - struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr; - - prim.ssp_assoc_id = assocId; - - if (getsockopt(fd, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &prim, &prim_len) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "sun.nio.ch.SctpNet.getPrimAddrOption0"); - return NULL; - } - - return SockAddrToInetSocketAddress(env, sap); -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: setPrimAddrOption0 - * Signature: (IILjava/net/InetAddress;I)V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setPrimAddrOption0 - (JNIEnv *env, jclass klass, jint fd, jint assocId, jobject iaObj, jint port) { - struct sctp_setprim prim; - struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr; - int sap_len; - - if (NET_InetAddressToSockaddr(env, iaObj, port, sap, - &sap_len, JNI_TRUE) != 0) { - return; - } - - prim.ssp_assoc_id = assocId; - - if (setsockopt(fd, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &prim, sizeof(prim)) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "sun.nio.ch.SctpNet.setPrimAddrOption0"); - } -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: setPeerPrimAddrOption0 - * Signature: (IILjava/net/InetAddress;I)V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setPeerPrimAddrOption0 - (JNIEnv *env, jclass klass, jint fd, jint assocId, - jobject iaObj, jint port, jboolean preferIPv6) { - struct sctp_setpeerprim prim; - struct sockaddr* sap = (struct sockaddr*)&prim.sspp_addr; - int sap_len; - - if (NET_InetAddressToSockaddr(env, iaObj, port, sap, - &sap_len, preferIPv6) != 0) { - return; - } - - prim.sspp_assoc_id = assocId; - - if (setsockopt(fd, IPPROTO_SCTP, SCTP_SET_PEER_PRIMARY_ADDR, &prim, - sizeof(prim)) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "sun.nio.ch.SctpNet.setPeerPrimAddrOption0"); - } -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: getInitMsgOption0 - * Signature: (I[I)V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_getInitMsgOption0 - (JNIEnv *env, jclass klass, jint fd, jintArray retVal) { - struct sctp_initmsg sctp_initmsg; - unsigned int sim_len = sizeof(sctp_initmsg); - int vals[2]; - - if (getsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &sctp_initmsg, - &sim_len) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "sun.nio.ch.SctpNet.getInitMsgOption0"); - return; - } - - vals[0] = sctp_initmsg.sinit_max_instreams; - vals[1] = sctp_initmsg.sinit_num_ostreams; - (*env)->SetIntArrayRegion(env, retVal, 0, 2, vals); -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: setInitMsgOption0 - * Signature: (III)V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setInitMsgOption0 - (JNIEnv *env, jclass klass, jint fd, jint inArg, jint outArg) { - struct sctp_initmsg sctp_initmsg; - - sctp_initmsg.sinit_max_instreams = (unsigned int)inArg; - sctp_initmsg.sinit_num_ostreams = (unsigned int)outArg; - sctp_initmsg.sinit_max_attempts = 0; // default - sctp_initmsg.sinit_max_init_timeo = 0; // default - - if (setsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &sctp_initmsg, - sizeof(sctp_initmsg)) < 0) { - JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "sun.nio.ch.SctpNet.setInitMsgOption0"); - } -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: shutdown0 - * Signature: (II)V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_shutdown0 - (JNIEnv *env, jclass klass, jint fd, jint assocId) { - int rv; - struct msghdr msg[1]; - struct iovec iov[1]; - int cbuf_size = CMSG_SPACE(sizeof (struct sctp_sndrcvinfo)); - char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))]; - struct cmsghdr* cmsg; - struct sctp_sndrcvinfo *sri; - - /* SctpSocketChannel */ - if (assocId < 0) { - shutdown(fd, SHUT_WR); - return; - } - - memset(msg, 0, sizeof (*msg)); - memset(cbuf, 0, cbuf_size); - msg->msg_name = NULL; - msg->msg_namelen = 0; - iov->iov_base = NULL; - iov->iov_len = 0; - msg->msg_iov = iov; - msg->msg_iovlen = 1; - msg->msg_control = cbuf; - msg->msg_controllen = cbuf_size; - msg->msg_flags = 0; - - cmsg = CMSG_FIRSTHDR(msg); - cmsg->cmsg_level = IPPROTO_SCTP; - cmsg->cmsg_type = SCTP_SNDRCV; - cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo)); - - /* Initialize the payload: */ - sri = (struct sctp_sndrcvinfo*) CMSG_DATA(cmsg); - memset(sri, 0, sizeof (*sri)); - - if (assocId > 0) { - sri->sinfo_assoc_id = assocId; - } - - sri->sinfo_flags = sri->sinfo_flags | SCTP_EOF; - - /* Sum of the length of all control messages in the buffer. */ - msg->msg_controllen = cmsg->cmsg_len; - - if ((rv = sendmsg(fd, msg, 0)) < 0) { - handleSocketError(env, errno); - } -} - -/* - * Class: sun_nio_ch_SctpNet - * Method: branch - * Signature: (II)I - */ -JNIEXPORT int JNICALL Java_sun_nio_ch_SctpNet_branch0 - (JNIEnv *env, jclass klass, jint fd, jint assocId) { - int newfd = 0; - if ((newfd = nio_sctp_peeloff(fd, assocId)) < 0) { - handleSocketError(env, errno); - } - - return newfd; -}
--- a/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#include "sun_nio_ch_SctpServerChannelImpl.h" - -extern void Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(JNIEnv* env, - jclass c); - -extern jint Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv* env, - jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa); - -/* - * Class: sun_nio_ch_SctpServerChannelImpl - * Method: initIDs - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_sun_nio_ch_SctpServerChannelImpl_initIDs - (JNIEnv* env, jclass c) { - Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(env, c); -} - -/* - * Class: sun_nio_ch_SctpServerChannelImpl - * Method: accept0 - * Signature: (Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;[Ljava/net/InetSocketAddress;)I - */ -JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpServerChannelImpl_accept0 - (JNIEnv* env, jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa) { - return Java_sun_nio_ch_ServerSocketChannelImpl_accept0(env, this, - ssfdo, newfdo, isaa); -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,334 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef SUN_NIO_CH_SCTP_H +#define SUN_NIO_CH_SCTP_H + +#ifdef __solaris__ + +#define _XPG4_2 +#define __EXTENSIONS__ +#include <sys/socket.h> +#include <netinet/sctp.h> +#include "jni.h" + +/* Current Solaris headers don't comply with draft rfc */ +#ifndef SCTP_EOF +#define SCTP_EOF MSG_EOF +#endif + +#ifndef SCTP_UNORDERED +#define SCTP_UNORDERED MSG_UNORDERED +#endif + +/* The current version of the socket API extension shipped with Solaris does + * not define the following options that the Java API (optionally) supports */ +#ifndef SCTP_EXPLICIT_EOR +#define SCTP_EXPLICIT_EOR -1 +#endif +#ifndef SCTP_FRAGMENT_INTERLEAVE +#define SCTP_FRAGMENT_INTERLEAVE -1 +#endif +#ifndef SCTP_SET_PEER_PRIMARY_ADDR +#define SCTP_SET_PEER_PRIMARY_ADDR -1 +#endif + +/* Function types to support dynamic linking of socket API extension functions + * for SCTP. This is so that there is no linkage depandancy during build or + * runtime for libsctp.*/ +typedef int sctp_getladdrs_func(int sock, sctp_assoc_t id, void **addrs); +typedef int sctp_freeladdrs_func(void* addrs); +typedef int sctp_getpaddrs_func(int sock, sctp_assoc_t id, void **addrs); +typedef int sctp_freepaddrs_func(void *addrs); +typedef int sctp_bindx_func(int sock, void *addrs, int addrcnt, int flags); +typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); + + + +#else /* __linux__ */ +#include <stdint.h> +#include <linux/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include "jni.h" + +//Causes compiler error if not found, should make warning and uncomment +/*#include <netinet/sctp.h>*/ + +#ifndef IPPROTO_SCTP +#define IPPROTO_SCTP 132 +#endif + +/* The current version of lksctp does + * not define the following option that the Java API (optionally) supports */ +#ifndef SCTP_EXPLICIT_EOR +#define SCTP_EXPLICIT_EOR -1 +#endif + +/* Definitions taken from lksctp-tools-1.0.8/src/include/netinet/sctp.h */ +#ifndef SCTP_INITMSG + +enum sctp_optname { + SCTP_RTOINFO, +#define SCTP_RTOINFO SCTP_RTOINFO + SCTP_ASSOCINFO, +#define SCTP_ASSOCINFO SCTP_ASSOCINFO + SCTP_INITMSG, +#define SCTP_INITMSG SCTP_INITMSG + SCTP_NODELAY, /* Get/set nodelay option. */ +#define SCTP_NODELAY SCTP_NODELAY + SCTP_AUTOCLOSE, +#define SCTP_AUTOCLOSE SCTP_AUTOCLOSE + SCTP_SET_PEER_PRIMARY_ADDR, +#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR + SCTP_PRIMARY_ADDR, +#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR + SCTP_ADAPTATION_LAYER, +#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER + SCTP_DISABLE_FRAGMENTS, +#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS + SCTP_PEER_ADDR_PARAMS, +#define SCTP_PEER_ADDR_PARAMS SCTP_PEER_ADDR_PARAMS + SCTP_DEFAULT_SEND_PARAM, +#define SCTP_DEFAULT_SEND_PARAM SCTP_DEFAULT_SEND_PARAM + SCTP_EVENTS, +#define SCTP_EVENTS SCTP_EVENTS + SCTP_I_WANT_MAPPED_V4_ADDR, /* Turn on/off mapped v4 addresses */ +#define SCTP_I_WANT_MAPPED_V4_ADDR SCTP_I_WANT_MAPPED_V4_ADDR + SCTP_MAXSEG, /* Get/set maximum fragment. */ +#define SCTP_MAXSEG SCTP_MAXSEG + SCTP_STATUS, +#define SCTP_STATUS SCTP_STATUS + SCTP_GET_PEER_ADDR_INFO, +#define SCTP_GET_PEER_ADDR_INFO SCTP_GET_PEER_ADDR_INFO + SCTP_DELAYED_ACK_TIME, +#define SCTP_DELAYED_ACK_TIME SCTP_DELAYED_ACK_TIME + SCTP_CONTEXT, /* Receive Context */ +#define SCTP_CONTEXT SCTP_CONTEXT + SCTP_FRAGMENT_INTERLEAVE, +#define SCTP_FRAGMENT_INTERLEAVE SCTP_FRAGMENT_INTERLEAVE + SCTP_PARTIAL_DELIVERY_POINT, /* Set/Get partial delivery point */ +#define SCTP_PARTIAL_DELIVERY_POINT SCTP_PARTIAL_DELIVERY_POINT + SCTP_MAX_BURST, /* Set/Get max burst */ +#define SCTP_MAX_BURST SCTP_MAX_BURST +}; + +enum sctp_sac_state { + SCTP_COMM_UP, + SCTP_COMM_LOST, + SCTP_RESTART, + SCTP_SHUTDOWN_COMP, + SCTP_CANT_STR_ASSOC, +}; + +enum sctp_spc_state { + SCTP_ADDR_AVAILABLE, + SCTP_ADDR_UNREACHABLE, + SCTP_ADDR_REMOVED, + SCTP_ADDR_ADDED, + SCTP_ADDR_MADE_PRIM, + SCTP_ADDR_CONFIRMED, +}; + +enum sctp_sinfo_flags { + SCTP_UNORDERED = 1, /* Send/receive message unordered. */ + SCTP_ADDR_OVER = 2, /* Override the primary destination. */ + SCTP_ABORT=4, /* Send an ABORT message to the peer. */ + SCTP_EOF=MSG_FIN, /* Initiate graceful shutdown process. */ +}; + +enum sctp_sn_type { + SCTP_SN_TYPE_BASE = (1<<15), + SCTP_ASSOC_CHANGE, + SCTP_PEER_ADDR_CHANGE, + SCTP_SEND_FAILED, + SCTP_REMOTE_ERROR, + SCTP_SHUTDOWN_EVENT, + SCTP_PARTIAL_DELIVERY_EVENT, + SCTP_ADAPTATION_INDICATION, +}; + +typedef enum sctp_cmsg_type { + SCTP_INIT, /* 5.2.1 SCTP Initiation Structure */ +#define SCTP_INIT SCTP_INIT + SCTP_SNDRCV, /* 5.2.2 SCTP Header Information Structure */ +#define SCTP_SNDRCV SCTP_SNDRCV +} sctp_cmsg_t; + +enum sctp_msg_flags { + MSG_NOTIFICATION = 0x8000, +#define MSG_NOTIFICATION MSG_NOTIFICATION +}; + +#define SCTP_BINDX_ADD_ADDR 0x01 +#define SCTP_BINDX_REM_ADDR 0x02 + +typedef __s32 sctp_assoc_t; + +struct sctp_initmsg { + __u16 sinit_num_ostreams; + __u16 sinit_max_instreams; + __u16 sinit_max_attempts; + __u16 sinit_max_init_timeo; +}; + +struct sctp_sndrcvinfo { + __u16 sinfo_stream; + __u16 sinfo_ssn; + __u16 sinfo_flags; + __u32 sinfo_ppid; + __u32 sinfo_context; + __u32 sinfo_timetolive; + __u32 sinfo_tsn; + __u32 sinfo_cumtsn; + sctp_assoc_t sinfo_assoc_id; +}; + +struct sctp_event_subscribe { + __u8 sctp_data_io_event; + __u8 sctp_association_event; + __u8 sctp_address_event; + __u8 sctp_send_failure_event; + __u8 sctp_peer_error_event; + __u8 sctp_shutdown_event; + __u8 sctp_partial_delivery_event; + __u8 sctp_adaptation_layer_event; +}; + +struct sctp_send_failed { + __u16 ssf_type; + __u16 ssf_flags; + __u32 ssf_length; + __u32 ssf_error; + struct sctp_sndrcvinfo ssf_info; + sctp_assoc_t ssf_assoc_id; + __u8 ssf_data[0]; +}; + +struct sctp_assoc_change { + __u16 sac_type; + __u16 sac_flags; + __u32 sac_length; + __u16 sac_state; + __u16 sac_error; + __u16 sac_outbound_streams; + __u16 sac_inbound_streams; + sctp_assoc_t sac_assoc_id; + __u8 sac_info[0]; +}; + +struct sctp_shutdown_event { + __u16 sse_type; + __u16 sse_flags; + __u32 sse_length; + sctp_assoc_t sse_assoc_id; +}; + +struct sctp_paddr_change { + __u16 spc_type; + __u16 spc_flags; + __u32 spc_length; + struct sockaddr_storage spc_aaddr; + int spc_state; + int spc_error; + sctp_assoc_t spc_assoc_id; +} __attribute__((packed, aligned(4))); + +struct sctp_remote_error { + __u16 sre_type; + __u16 sre_flags; + __u32 sre_length; + __u16 sre_error; + sctp_assoc_t sre_assoc_id; + __u8 sre_data[0]; +}; + +struct sctp_adaptation_event { + __u16 sai_type; + __u16 sai_flags; + __u32 sai_length; + __u32 sai_adaptation_ind; + sctp_assoc_t sai_assoc_id; +}; + +struct sctp_setprim { + sctp_assoc_t ssp_assoc_id; + struct sockaddr_storage ssp_addr; +} __attribute__((packed, aligned(4))); + +struct sctp_setpeerprim { + sctp_assoc_t sspp_assoc_id; + struct sockaddr_storage sspp_addr; +} __attribute__((packed, aligned(4))); + + +struct sctp_pdapi_event { + __u16 pdapi_type; + __u16 pdapi_flags; + __u32 pdapi_length; + __u32 pdapi_indication; + sctp_assoc_t pdapi_assoc_id; +}; + +union sctp_notification { + struct { + __u16 sn_type; /* Notification type. */ + __u16 sn_flags; + __u32 sn_length; + } sn_header; + struct sctp_assoc_change sn_assoc_change; + struct sctp_paddr_change sn_paddr_change; + struct sctp_remote_error sn_remote_error; + struct sctp_send_failed sn_send_failed; + struct sctp_shutdown_event sn_shutdown_event; + struct sctp_adaptation_event sn_adaptation_event; + struct sctp_pdapi_event sn_pdapi_event; +}; + +#endif /* SCTP_INITMSG */ + +/* Function types to support dynamic linking of socket API extension functions + * for SCTP. This is so that there is no linkage depandancy during build or + * runtime for libsctp.*/ +typedef int sctp_getladdrs_func(int sd, sctp_assoc_t id, struct sockaddr **addrs); +typedef int sctp_freeladdrs_func(struct sockaddr *addrs); +typedef int sctp_getpaddrs_func(int sd, sctp_assoc_t id, struct sockaddr **addrs); +typedef int sctp_freepaddrs_func(struct sockaddr *addrs); +typedef int sctp_bindx_func(int sd, struct sockaddr *addrs, int addrcnt, int flags); +typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); + + +#endif /* __linux__ */ + +sctp_getladdrs_func* nio_sctp_getladdrs; +sctp_freeladdrs_func* nio_sctp_freeladdrs; +sctp_getpaddrs_func* nio_sctp_getpaddrs; +sctp_freepaddrs_func* nio_sctp_freepaddrs; +sctp_bindx_func* nio_sctp_bindx; +sctp_peeloff_func* nio_sctp_peeloff; + +jboolean loadSocketExtensionFuncs(JNIEnv* env); + +#endif /* !SUN_NIO_CH_SCTP_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,596 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include <stdlib.h> +#include <string.h> +#include "Sctp.h" + +#include "jni.h" +#include "nio_util.h" +#include "nio.h" +#include "net_util.h" +#include "net_util_md.h" +#include "sun_nio_ch_sctp_SctpNet.h" +#include "sun_nio_ch_sctp_SctpChannelImpl.h" +#include "sun_nio_ch_sctp_AssociationChange.h" +#include "sun_nio_ch_sctp_ResultContainer.h" +#include "sun_nio_ch_sctp_PeerAddrChange.h" + +/* sizeof(union sctp_notification */ +#define NOTIFICATION_BUFFER_SIZE 280 + +#define MESSAGE_IMPL_CLASS "sun/nio/ch/sctp/MessageInfoImpl" +#define RESULT_CONTAINER_CLASS "sun/nio/ch/sctp/ResultContainer" +#define SEND_FAILED_CLASS "sun/nio/ch/sctp/SendFailed" +#define ASSOC_CHANGE_CLASS "sun/nio/ch/sctp/AssociationChange" +#define PEER_CHANGE_CLASS "sun/nio/ch/sctp/PeerAddrChange" +#define SHUTDOWN_CLASS "sun/nio/ch/sctp/Shutdown" + +struct controlData { + int assocId; + unsigned short streamNumber; + jboolean unordered; + unsigned int ppid; +}; + +static jclass smi_class; /* sun.nio.ch.sctp.MessageInfoImpl */ +static jmethodID smi_ctrID; /* sun.nio.ch.sctp.MessageInfoImpl.<init> */ +static jfieldID src_valueID; /* sun.nio.ch.sctp.ResultContainer.value */ +static jfieldID src_typeID; /* sun.nio.ch.sctp.ResultContainer.type */ +static jclass ssf_class; /* sun.nio.ch.sctp.SendFailed */ +static jmethodID ssf_ctrID; /* sun.nio.ch.sctp.SendFailed.<init> */ +static jclass sac_class; /* sun.nio.ch.sctp.AssociationChange */ +static jmethodID sac_ctrID; /* sun.nio.ch.sctp.AssociationChange.<init> */ +static jclass spc_class; /* sun.nio.ch.sctp.PeerAddressChanged */ +static jmethodID spc_ctrID; /* sun.nio.ch.sctp.PeerAddressChanged.<init> */ +static jclass ss_class; /* sun.nio.ch.sctp.Shutdown */ +static jmethodID ss_ctrID; /* sun.nio.ch.sctp.Shutdown.<init> */ +static jfieldID isa_addrID; /* java.net.InetSocketAddress.addr */ +static jfieldID isa_portID; /* java.net.InetSocketAddress.port */ + +/* defined in SctpNet.c */ +jobject SockAddrToInetSocketAddress(JNIEnv* env, struct sockaddr* addr); + +jint handleSocketError(JNIEnv *env, jint errorValue); + +/* use SocketChannelImpl's checkConnect implementation */ +extern jint Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv* env, + jobject this, jobject fdo, jboolean block, jboolean ready); + +/* + * Class: sun_nio_ch_sctp_SctpChannelImpl + * Method: initIDs + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_initIDs + (JNIEnv *env, jclass klass) { + jclass cls; + + /* MessageInfoImpl */ + cls = (*env)->FindClass(env, MESSAGE_IMPL_CLASS); + CHECK_NULL(cls); + smi_class = (*env)->NewGlobalRef(env, cls); + CHECK_NULL(smi_class); + smi_ctrID = (*env)->GetMethodID(env, cls, "<init>", + "(ILjava/net/SocketAddress;IIZZI)V"); + CHECK_NULL(smi_ctrID); + + /* ResultContainer */ + cls = (*env)->FindClass(env, RESULT_CONTAINER_CLASS); + CHECK_NULL(cls); + src_valueID = (*env)->GetFieldID(env, cls, "value", "Ljava/lang/Object;"); + CHECK_NULL(src_valueID); + src_typeID = (*env)->GetFieldID(env, cls, "type", "I"); + CHECK_NULL(src_typeID); + + /* SendFailed */ + cls = (*env)->FindClass(env, SEND_FAILED_CLASS); + CHECK_NULL(cls); + ssf_class = (*env)->NewGlobalRef(env, cls); + CHECK_NULL(ssf_class); + ssf_ctrID = (*env)->GetMethodID(env, cls, "<init>", + "(ILjava/net/SocketAddress;Ljava/nio/ByteBuffer;II)V"); + CHECK_NULL(ssf_ctrID); + + /* AssociationChange */ + cls = (*env)->FindClass(env, ASSOC_CHANGE_CLASS); + CHECK_NULL(cls); + sac_class = (*env)->NewGlobalRef(env, cls); + CHECK_NULL(sac_class); + sac_ctrID = (*env)->GetMethodID(env, cls, "<init>", "(IIII)V"); + CHECK_NULL(sac_ctrID); + + /* PeerAddrChange */ + cls = (*env)->FindClass(env, PEER_CHANGE_CLASS); + CHECK_NULL(cls); + spc_class = (*env)->NewGlobalRef(env, cls); + CHECK_NULL(spc_class); + spc_ctrID = (*env)->GetMethodID(env, cls, "<init>", + "(ILjava/net/SocketAddress;I)V"); + CHECK_NULL(spc_ctrID); + + /* Shutdown */ + cls = (*env)->FindClass(env, SHUTDOWN_CLASS); + CHECK_NULL(cls); + ss_class = (*env)->NewGlobalRef(env, cls); + CHECK_NULL(ss_class); + ss_ctrID = (*env)->GetMethodID(env, cls, "<init>", "(I)V"); + CHECK_NULL(ss_ctrID); + + /* InetSocketAddress */ + cls = (*env)->FindClass(env, "java/net/InetSocketAddress"); + CHECK_NULL(cls); + isa_addrID = (*env)->GetFieldID(env, cls, "addr", "Ljava/net/InetAddress;"); + CHECK_NULL(isa_addrID); + isa_portID = (*env)->GetFieldID(env, cls, "port", "I"); +} + +void getControlData + (struct msghdr* msg, struct controlData* cdata) { + struct cmsghdr* cmsg; + + for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) { + if (cmsg->cmsg_level == IPPROTO_SCTP && cmsg->cmsg_type == SCTP_SNDRCV) { + struct sctp_sndrcvinfo *sri; + + sri = (struct sctp_sndrcvinfo *) CMSG_DATA(cmsg); + cdata->assocId = sri->sinfo_assoc_id; + cdata->streamNumber = sri->sinfo_stream; + cdata->unordered = (sri->sinfo_flags & SCTP_UNORDERED) ? JNI_TRUE : + JNI_FALSE; + cdata->ppid = ntohl(sri->sinfo_ppid); + + return; + } + } + return; +} + +void setControlData + (struct msghdr* msg, struct controlData* cdata) { + struct cmsghdr* cmsg; + struct sctp_sndrcvinfo *sri; + + cmsg = CMSG_FIRSTHDR(msg); + cmsg->cmsg_level = IPPROTO_SCTP; + cmsg->cmsg_type = SCTP_SNDRCV; + cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo)); + + /* Initialize the payload */ + sri = (struct sctp_sndrcvinfo*) CMSG_DATA(cmsg); + memset(sri, 0, sizeof (*sri)); + + if (cdata->streamNumber > 0) { + sri->sinfo_stream = cdata->streamNumber; + } + if (cdata->assocId > 0) { + sri->sinfo_assoc_id = cdata->assocId; + } + if (cdata->unordered == JNI_TRUE) { + sri->sinfo_flags = sri->sinfo_flags | SCTP_UNORDERED; + } + + if (cdata->ppid > 0) { + sri->sinfo_ppid = htonl(cdata->ppid); + } + + /* Sum of the length of all control messages in the buffer. */ + msg->msg_controllen = cmsg->cmsg_len; +} + +// TODO: test: can create send failed without any data? if so need to +// update API so that buffer can be null if no data. +void handleSendFailed + (JNIEnv* env, int fd, jobject resultContainerObj, struct sctp_send_failed *ssf, + int read, jboolean isEOR, struct sockaddr* sap) { + jobject bufferObj = NULL, resultObj, isaObj; + char *addressP; + struct sctp_sndrcvinfo *sri; + int remaining, dataLength; + + /* the actual undelivered message data is directly after the ssf */ + int dataOffset = sizeof(struct sctp_send_failed); + + sri = (struct sctp_sndrcvinfo*) &ssf->ssf_info; + + /* the number of bytes remaining to be read in the sctp_send_failed notif*/ + remaining = ssf->ssf_length - read; + + /* the size of the actual undelivered message */ + dataLength = ssf->ssf_length - dataOffset; + + /* retrieved address from sockaddr */ + isaObj = SockAddrToInetSocketAddress(env, sap); + + /* data retrieved from sff_data */ + if (dataLength > 0) { + struct iovec iov[1]; + struct msghdr msg[1]; + int rv, alreadyRead; + char *dataP = (char*) ssf; + dataP += dataOffset; + + if ((addressP = malloc(dataLength)) == NULL) { + JNU_ThrowOutOfMemoryError(env, "handleSendFailed"); + return; + } + + memset(msg, 0, sizeof (*msg)); + msg->msg_iov = iov; + msg->msg_iovlen = 1; + + bufferObj = (*env)->NewDirectByteBuffer(env, addressP, dataLength); + CHECK_NULL(bufferObj); + + alreadyRead = read - dataOffset; + if (alreadyRead > 0) { + memcpy(addressP, /*ssf->ssf_data*/ dataP, alreadyRead); + iov->iov_base = addressP + alreadyRead; + iov->iov_len = dataLength - alreadyRead; + } else { + iov->iov_base = addressP; + iov->iov_len = dataLength; + } + + if (remaining > 0) { + if ((rv = recvmsg(fd, msg, 0)) < 0) { + handleSocketError(env, errno); + return; + } + + if (rv != (dataLength - alreadyRead) || !(msg->msg_flags & MSG_EOR)) { + //TODO: assert false: "should not reach here"; + return; + } + // TODO: Set and document (in API) buffers position. + } + } + + /* create SendFailed */ + resultObj = (*env)->NewObject(env, ssf_class, ssf_ctrID, ssf->ssf_assoc_id, + isaObj, bufferObj, ssf->ssf_error, sri->sinfo_stream); + CHECK_NULL(resultObj); + (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); + (*env)->SetIntField(env, resultContainerObj, src_typeID, + sun_nio_ch_sctp_ResultContainer_SEND_FAILED); +} + +void handleAssocChange + (JNIEnv* env, jobject resultContainerObj, struct sctp_assoc_change *sac) { + jobject resultObj; + int state = 0; + + switch (sac->sac_state) { + case SCTP_COMM_UP : + state = sun_nio_ch_sctp_AssociationChange_SCTP_COMM_UP; + break; + case SCTP_COMM_LOST : + state = sun_nio_ch_sctp_AssociationChange_SCTP_COMM_LOST; + break; + case SCTP_RESTART : + state = sun_nio_ch_sctp_AssociationChange_SCTP_RESTART; + break; + case SCTP_SHUTDOWN_COMP : + state = sun_nio_ch_sctp_AssociationChange_SCTP_SHUTDOWN; + break; + case SCTP_CANT_STR_ASSOC : + state = sun_nio_ch_sctp_AssociationChange_SCTP_CANT_START; + } + + /* create AssociationChange */ + resultObj = (*env)->NewObject(env, sac_class, sac_ctrID, sac->sac_assoc_id, + state, sac->sac_outbound_streams, sac->sac_inbound_streams); + CHECK_NULL(resultObj); + (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); + (*env)->SetIntField(env, resultContainerObj, src_typeID, + sun_nio_ch_sctp_ResultContainer_ASSOCIATION_CHANGED); +} + +void handleShutdown + (JNIEnv* env, jobject resultContainerObj, struct sctp_shutdown_event* sse) { + /* create Shutdown */ + jobject resultObj = (*env)->NewObject(env, ss_class, ss_ctrID, sse->sse_assoc_id); + CHECK_NULL(resultObj); + (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); + (*env)->SetIntField(env, resultContainerObj, src_typeID, + sun_nio_ch_sctp_ResultContainer_SHUTDOWN); +} + +void handlePeerAddrChange + (JNIEnv* env, jobject resultContainerObj, struct sctp_paddr_change* spc) { + int event = 0; + jobject addressObj, resultObj; + unsigned int state = spc->spc_state; + + switch (state) { + case SCTP_ADDR_AVAILABLE : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_AVAILABLE; + break; + case SCTP_ADDR_UNREACHABLE : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_UNREACHABLE; + break; + case SCTP_ADDR_REMOVED : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_REMOVED; + break; + case SCTP_ADDR_ADDED : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_ADDED; + break; + case SCTP_ADDR_MADE_PRIM : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_MADE_PRIM; +#ifdef __linux__ /* Solaris currently doesn't support SCTP_ADDR_CONFIRMED */ + break; + case SCTP_ADDR_CONFIRMED : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_CONFIRMED; +#endif /* __linux__ */ + } + + addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr); + + /* create PeerAddressChanged */ + resultObj = (*env)->NewObject(env, spc_class, spc_ctrID, spc->spc_assoc_id, + addressObj, event); + CHECK_NULL(resultObj); + (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); + (*env)->SetIntField(env, resultContainerObj, src_typeID, + sun_nio_ch_sctp_ResultContainer_PEER_ADDRESS_CHANGED); +} + +void handleUninteresting + (union sctp_notification *snp) { + //fprintf(stdout,"\nNative: handleUninterestingNotification: Receive notification type [%u]", snp->sn_header.sn_type); +} + +/** + * Handle notifications from the SCTP stack. + * Returns JNI_TRUE if the notification is one that is of interest to the + * Java API, otherwise JNI_FALSE. + */ +jboolean handleNotification + (JNIEnv* env, int fd, jobject resultContainerObj, union sctp_notification* snp, + int read, jboolean isEOR, struct sockaddr* sap) { + switch (snp->sn_header.sn_type) { + case SCTP_SEND_FAILED: + handleSendFailed(env, fd, resultContainerObj, &snp->sn_send_failed, + read, isEOR, sap); + return JNI_TRUE; + case SCTP_ASSOC_CHANGE: + handleAssocChange(env, resultContainerObj, &snp->sn_assoc_change); + return JNI_TRUE; + case SCTP_SHUTDOWN_EVENT: + handleShutdown(env, resultContainerObj, &snp->sn_shutdown_event); + return JNI_TRUE; + case SCTP_PEER_ADDR_CHANGE: + handlePeerAddrChange(env, resultContainerObj, &snp->sn_paddr_change); + return JNI_TRUE; + default : + /* the Java API is not interested in this event, maybe we are? */ + handleUninteresting(snp); + } + return JNI_FALSE; +} + +void handleMessage + (JNIEnv* env, jobject resultContainerObj, struct msghdr* msg,int read, + jboolean isEOR, struct sockaddr* sap) { + jobject isa, resultObj; + struct controlData cdata[1]; + + if (read == 0) { + /* we reached EOF */ + read = -1; + } + + isa = SockAddrToInetSocketAddress(env, sap); + getControlData(msg, cdata); + + /* create MessageInfoImpl */ + resultObj = (*env)->NewObject(env, smi_class, smi_ctrID, cdata->assocId, + isa, read, cdata->streamNumber, + isEOR ? JNI_TRUE : JNI_FALSE, + cdata->unordered, cdata->ppid); + CHECK_NULL(resultObj); + (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj); + (*env)->SetIntField(env, resultContainerObj, src_typeID, + sun_nio_ch_sctp_ResultContainer_MESSAGE); +} + +/* + * Class: sun_nio_ch_sctp_SctpChannelImpl + * Method: receive0 + * Signature: (ILsun/nio/ch/sctp/ResultContainer;JIZ)I + */ +JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_receive0 + (JNIEnv *env, jclass klass, jint fd, jobject resultContainerObj, + jlong address, jint length, jboolean peek) { + SOCKADDR sa; + int sa_len = sizeof(sa); + ssize_t rv = 0; + jlong *addr = jlong_to_ptr(address); + struct iovec iov[1]; + struct msghdr msg[1]; + char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))]; + int flags = peek == JNI_TRUE ? MSG_PEEK : 0; + + /* Set up the msghdr structure for receiving */ + memset(msg, 0, sizeof (*msg)); + msg->msg_name = &sa; + msg->msg_namelen = sa_len; + iov->iov_base = addr; + iov->iov_len = length; + msg->msg_iov = iov; + msg->msg_iovlen = 1; + msg->msg_control = cbuf; + msg->msg_controllen = sizeof(cbuf); + msg->msg_flags = 0; + + do { + if ((rv = recvmsg(fd, msg, flags)) < 0) { + if (errno == EWOULDBLOCK) { + return IOS_UNAVAILABLE; + } else if (errno == EINTR) { + return IOS_INTERRUPTED; + +#ifdef __linux__ + } else if (errno == ENOTCONN) { + /* ENOTCONN when EOF reached */ + rv = 0; + /* there will be no control data */ + msg->msg_controllen = 0; +#endif /* __linux__ */ + + } else { + handleSocketError(env, errno); + return 0; + } + } + + if (msg->msg_flags & MSG_NOTIFICATION) { + char *bufp = (char*)addr; + union sctp_notification *snp; + + if (!(msg->msg_flags & MSG_EOR) && length < NOTIFICATION_BUFFER_SIZE) { + char buf[NOTIFICATION_BUFFER_SIZE]; + int rvSAVE = rv; + memcpy(buf, addr, rv); + iov->iov_base = buf + rv; + iov->iov_len = NOTIFICATION_BUFFER_SIZE - rv; + if ((rv = recvmsg(fd, msg, flags)) < 0) { + handleSocketError(env, errno); + return 0; + } + bufp = buf; + rv += rvSAVE; + } + snp = (union sctp_notification *) bufp; + if (handleNotification(env, fd, resultContainerObj, snp, rv, + (msg->msg_flags & MSG_EOR), + (struct sockaddr*)&sa ) == JNI_TRUE) { + /* We have received a notification that is of interest to + to the Java API. The appropriate notification will be + set in the result container. */ + return 0; + } + + // set iov back to addr, and reset msg_controllen + iov->iov_base = addr; + iov->iov_len = length; + msg->msg_control = cbuf; + msg->msg_controllen = sizeof(cbuf); + } + } while (msg->msg_flags & MSG_NOTIFICATION); + + handleMessage(env, resultContainerObj, msg, rv, + (msg->msg_flags & MSG_EOR), (struct sockaddr*)&sa); + return rv; +} + +/* + * Class: sun_nio_ch_sctp_SctpChannelImpl + * Method: send0 + * Signature: (IJILjava/net/SocketAddress;IIZI)I + */ +JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_send0 + (JNIEnv *env, jclass klass, jint fd, jlong address, jint length, + jobject saTarget, jint assocId, jint streamNumber, jboolean unordered, + jint ppid) { + SOCKADDR sa; + int sa_len = sizeof(sa); + ssize_t rv = 0; + jlong *addr = jlong_to_ptr(address); + struct iovec iov[1]; + struct msghdr msg[1]; + int cbuf_size = CMSG_SPACE(sizeof (struct sctp_sndrcvinfo)); + char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))]; + struct controlData cdata[1]; + + /* SctpChannel: + * saTarget may contain the preferred address or NULL to use primary, + * assocId will always be -1 + * SctpMultiChannell: + * Setup new association, saTarget will contain address, assocId = -1 + * Association already existing, assocId != -1, saTarget = preferred addr + */ + if (saTarget != NULL /*&& assocId <= 0*/) { + + jobject targetAddress = (*env)->GetObjectField(env, saTarget, isa_addrID); + jint targetPort = (*env)->GetIntField(env, saTarget, isa_portID); + + if (NET_InetAddressToSockaddr(env, targetAddress, targetPort, + (struct sockaddr *)&sa, + &sa_len, JNI_TRUE) != 0) { + return IOS_THROWN; + } + } else { + memset(&sa, '\x0', sa_len); + sa_len = 0; + } + + /* Set up the msghdr structure for sending */ + memset(msg, 0, sizeof (*msg)); + memset(cbuf, 0, cbuf_size); + msg->msg_name = &sa; + msg->msg_namelen = sa_len; + iov->iov_base = addr; + iov->iov_len = length; + msg->msg_iov = iov; + msg->msg_iovlen = 1; + msg->msg_control = cbuf; + msg->msg_controllen = cbuf_size; + msg->msg_flags = 0; + + cdata->streamNumber = streamNumber; + cdata->assocId = assocId; + cdata->unordered = unordered; + cdata->ppid = ppid; + setControlData(msg, cdata); + + if ((rv = sendmsg(fd, msg, 0)) < 0) { + if (errno == EWOULDBLOCK) { + return IOS_UNAVAILABLE; + } else if (errno == EINTR) { + return IOS_INTERRUPTED; + } else if (errno == EPIPE) { + JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", + "Socket is shutdown for writing"); + } else { + handleSocketError(env, errno); + return 0; + } + } + + return rv; +} + +/* + * Class: sun_nio_ch_sctp_SctpChannelImpl + * Method: checkConnect + * Signature: (Ljava/io/FileDescriptor;ZZ)I + */ +JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_checkConnect + (JNIEnv* env, jobject this, jobject fdo, jboolean block, jboolean ready) { + return Java_sun_nio_ch_SocketChannelImpl_checkConnect(env, this, + fdo, block, ready); +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,753 @@ +/* + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include <stdlib.h> +#include <string.h> +#include <dlfcn.h> + +#include "Sctp.h" +#include "jni.h" +#include "jni_util.h" +#include "nio_util.h" +#include "nio.h" +#include "net_util.h" +#include "net_util_md.h" +#include "sun_nio_ch_sctp_SctpNet.h" +#include "sun_nio_ch_sctp_SctpStdSocketOption.h" + +static jclass isaCls = 0; +static jmethodID isaCtrID = 0; + +static const char* nativeSctpLib = "libsctp.so.1"; +static jboolean funcsLoaded = JNI_FALSE; + +JNIEXPORT jint JNICALL JNI_OnLoad + (JavaVM *vm, void *reserved) { + return JNI_VERSION_1_2; +} + +static int preCloseFD = -1; /* File descriptor to which we dup other fd's + before closing them for real */ + +/** + * Loads the native sctp library that contains the socket extension + * functions, as well as locating the individual functions. + * There will be a pending exception if this method returns false. + */ +jboolean loadSocketExtensionFuncs + (JNIEnv* env) { + if (dlopen(nativeSctpLib, RTLD_GLOBAL | RTLD_LAZY) == NULL) { + JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", + dlerror()); + return JNI_FALSE; + } + + if ((nio_sctp_getladdrs = (sctp_getladdrs_func*) + dlsym(RTLD_DEFAULT, "sctp_getladdrs")) == NULL) { + JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", + dlerror()); + return JNI_FALSE; + } + + if ((nio_sctp_freeladdrs = (sctp_freeladdrs_func*) + dlsym(RTLD_DEFAULT, "sctp_freeladdrs")) == NULL) { + JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", + dlerror()); + return JNI_FALSE; + } + + if ((nio_sctp_getpaddrs = (sctp_getpaddrs_func*) + dlsym(RTLD_DEFAULT, "sctp_getpaddrs")) == NULL) { + JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", + dlerror()); + return JNI_FALSE; + } + + if ((nio_sctp_freepaddrs = (sctp_freepaddrs_func*) + dlsym(RTLD_DEFAULT, "sctp_freepaddrs")) == NULL) { + JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", + dlerror()); + return JNI_FALSE; + } + + if ((nio_sctp_bindx = (sctp_bindx_func*) + dlsym(RTLD_DEFAULT, "sctp_bindx")) == NULL) { + JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", + dlerror()); + return JNI_FALSE; + } + + if ((nio_sctp_peeloff = (sctp_peeloff_func*) + dlsym(RTLD_DEFAULT, "sctp_peeloff")) == NULL) { + JNU_ThrowByName(env, "java/lang/UnsupportedOperationException", + dlerror()); + return JNI_FALSE; + } + + funcsLoaded = JNI_TRUE; + return JNI_TRUE; +} + +jint +handleSocketError(JNIEnv *env, jint errorValue) +{ + char *xn; + switch (errorValue) { + case EINPROGRESS: /* Non-blocking connect */ + return 0; + case EPROTO: + xn= JNU_JAVANETPKG "ProtocolException"; + break; + case ECONNREFUSED: + xn = JNU_JAVANETPKG "ConnectException"; + break; + case ETIMEDOUT: + xn = JNU_JAVANETPKG "ConnectException"; + break; + case EHOSTUNREACH: + xn = JNU_JAVANETPKG "NoRouteToHostException"; + break; + case EADDRINUSE: /* Fall through */ + case EADDRNOTAVAIL: + xn = JNU_JAVANETPKG "BindException"; + break; + default: + xn = JNU_JAVANETPKG "SocketException"; + break; + } + errno = errorValue; + JNU_ThrowByNameWithLastError(env, xn, "NioSocketError"); + return IOS_THROWN; +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: init + * Signature: ()V + */ +JNIEXPORT void JNICALL +Java_sun_nio_ch_sctp_SctpNet_init + (JNIEnv *env, jclass cl) { + int sp[2]; + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sp) < 0) { + JNU_ThrowIOExceptionWithLastError(env, "socketpair failed"); + return; + } + preCloseFD = sp[0]; + close(sp[1]); +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: socket0 + * Signature: (Z)I + */ +JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpNet_socket0 + (JNIEnv *env, jclass klass, jboolean oneToOne) { + int fd; + struct sctp_event_subscribe event; +#ifdef AF_INET6 + int domain = ipv6_available() ? AF_INET6 : AF_INET; +#else + int domain = AF_INET; +#endif + + /* Try to load the socket API extension functions */ + if (!funcsLoaded && !loadSocketExtensionFuncs(env)) { + return 0; + } + + fd = socket(domain, (oneToOne ? SOCK_STREAM : SOCK_SEQPACKET), IPPROTO_SCTP); + + if (fd < 0) { + return handleSocketError(env, errno); + } + + /* Enable events */ + memset(&event, 0, sizeof(event)); + event.sctp_data_io_event = 1; + event.sctp_association_event = 1; + event.sctp_address_event = 1; + event.sctp_send_failure_event = 1; + //event.sctp_peer_error_event = 1; + event.sctp_shutdown_event = 1; + //event.sctp_partial_delivery_event = 1; + //event.sctp_adaptation_layer_event = 1; + if (setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event, sizeof(event)) != 0) { + handleSocketError(env, errno); + } + return fd; +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: bindx + * Signature: (I[Ljava/net/InetAddress;IIZ)V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_bindx + (JNIEnv *env, jclass klass, jint fd, jobjectArray addrs, jint port, + jint addrsLength, jboolean add, jboolean preferIPv6) { + SOCKADDR *sap, *tmpSap; + int i, sa_len = sizeof(SOCKADDR); + jobject ia; + + if (addrsLength < 1) + return; + + if ((sap = calloc(addrsLength, sa_len)) == NULL) { + JNU_ThrowOutOfMemoryError(env, "heap allocation failure"); + return; + } + + tmpSap = sap; + for (i=0; i<addrsLength; i++) { + ia = (*env)->GetObjectArrayElement(env, addrs, i); + if (NET_InetAddressToSockaddr(env, ia, port, (struct sockaddr*)tmpSap, + &sa_len, preferIPv6) != 0) { + free(sap); + return; + } + tmpSap++; + } + + if (nio_sctp_bindx(fd, (void*)sap, addrsLength, add ? SCTP_BINDX_ADD_ADDR : + SCTP_BINDX_REM_ADDR) != 0) { + handleSocketError(env, errno); + } + + free(sap); +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: listen0 + * Signature: (II)V + */ +JNIEXPORT void JNICALL +Java_sun_nio_ch_sctp_SctpNet_listen0 + (JNIEnv *env, jclass cl, jint fd, jint backlog) { + if (listen(fd, backlog) < 0) + handleSocketError(env, errno); +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: connect0 + * Signature: (ILjava/net/InetAddress;I)I + */ +JNIEXPORT jint JNICALL +Java_sun_nio_ch_sctp_SctpNet_connect0 + (JNIEnv *env, jclass clazz, int fd, jobject iao, jint port) { + SOCKADDR sa; + int sa_len = SOCKADDR_LEN; + int rv; + + if (NET_InetAddressToSockaddr(env, iao, port, (struct sockaddr *) &sa, + &sa_len, JNI_TRUE) != 0) { + return IOS_THROWN; + } + + rv = connect(fd, (struct sockaddr *)&sa, sa_len); + if (rv != 0) { + if (errno == EINPROGRESS) { + return IOS_UNAVAILABLE; + } else if (errno == EINTR) { + return IOS_INTERRUPTED; + } + return handleSocketError(env, errno); + } + return 1; +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: close0 + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_sun_nio_ch_sctp_SctpNet_close0 + (JNIEnv *env, jclass clazz, jint fd) { + if (fd != -1) { + int rv = close(fd); + if (rv < 0) + JNU_ThrowIOExceptionWithLastError(env, "Close failed"); + } +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: preClose0 + * Signature: (I)V + */ +JNIEXPORT void JNICALL +Java_sun_nio_ch_sctp_SctpNet_preClose0 + (JNIEnv *env, jclass clazz, jint fd) { + if (preCloseFD >= 0) { + if (dup2(preCloseFD, fd) < 0) + JNU_ThrowIOExceptionWithLastError(env, "dup2 failed"); + } +} + +void initializeISA + (JNIEnv* env) { + if (isaCls == 0) { + jclass c = (*env)->FindClass(env, "java/net/InetSocketAddress"); + CHECK_NULL(c); + isaCls = (*env)->NewGlobalRef(env, c); + CHECK_NULL(isaCls); + (*env)->DeleteLocalRef(env, c); + isaCtrID = (*env)->GetMethodID(env, isaCls, "<init>", + "(Ljava/net/InetAddress;I)V"); + } +} + +jobject SockAddrToInetSocketAddress + (JNIEnv *env, struct sockaddr* sap) { + int port = 0; + + jobject ia = NET_SockaddrToInetAddress(env, sap, &port); + if (ia == NULL) + return NULL; + + if (isaCls == 0) { + initializeISA(env); + CHECK_NULL_RETURN(isaCls, NULL); + } + + return (*env)->NewObject(env, isaCls, isaCtrID, ia, port); +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: getLocalAddresses0 + * Signature: (I)[Ljava/net/SocketAddress; + */ +JNIEXPORT jobjectArray JNICALL Java_sun_nio_ch_sctp_SctpNet_getLocalAddresses0 + (JNIEnv *env, jclass klass, jint fd) { + void *addr_buf, *laddr; + struct sockaddr* sap; + int i, addrCount; + jobjectArray isaa; + +#ifdef __solaris__ + if ((addrCount = nio_sctp_getladdrs(fd, 0, (void **)&addr_buf)) == -1) { +#else /* __linux__ */ + if ((addrCount = nio_sctp_getladdrs(fd, 0, (struct sockaddr **)&addr_buf)) == -1) { +#endif + handleSocketError(env, errno); + return NULL; + } + + if (addrCount < 1) + return NULL; + + if (isaCls == 0) { + initializeISA(env); + CHECK_NULL_RETURN(isaCls, NULL); + } + + isaa = (*env)->NewObjectArray(env, addrCount, isaCls, NULL); + if (isaa == NULL) { + nio_sctp_freeladdrs(addr_buf); + return NULL; + } + + laddr = addr_buf; + for (i=0; i<addrCount; i++) { + int port = 0; + jobject isa = NULL, ia; + sap = (struct sockaddr*)addr_buf; + ia = NET_SockaddrToInetAddress(env, sap, &port); + if (ia != NULL) + isa = (*env)->NewObject(env, isaCls, isaCtrID, ia, port); + if (isa != NULL) + (*env)->SetObjectArrayElement(env, isaa, i, isa); + + if (sap->sa_family == AF_INET) + addr_buf = ((struct sockaddr_in*)addr_buf) + 1; + else + addr_buf = ((struct sockaddr_in6*)addr_buf) + 1; + } + + nio_sctp_freeladdrs(laddr); + return isaa; +} + +jobjectArray getRemoteAddresses + (JNIEnv *env, jint fd, sctp_assoc_t id) { + void *addr_buf, *paddr; + struct sockaddr* sap; + int i, addrCount; + jobjectArray isaa; + +#if __solaris__ + if ((addrCount = nio_sctp_getpaddrs(fd, id, (void **)&addr_buf)) == -1) { +#else /* __linux__ */ + if ((addrCount = nio_sctp_getpaddrs(fd, id, (struct sockaddr**)&addr_buf)) == -1) { +#endif + handleSocketError(env, errno); + return NULL; + } + + if (addrCount < 1) + return NULL; + + if (isaCls == 0) { + initializeISA(env); + CHECK_NULL_RETURN(isaCls, NULL); + } + + isaa = (*env)->NewObjectArray(env, addrCount, isaCls, NULL); + if (isaa == NULL) { + nio_sctp_freepaddrs(addr_buf); + return NULL; + } + + paddr = addr_buf; + for (i=0; i<addrCount; i++) { + jobject ia, isa = NULL; + int port; + sap = (struct sockaddr*)addr_buf; + ia = NET_SockaddrToInetAddress(env, sap, &port); + if (ia != NULL) + isa = (*env)->NewObject(env, isaCls, isaCtrID, ia, port); + if (isa != NULL) + (*env)->SetObjectArrayElement(env, isaa, i, isa); + + if (sap->sa_family == AF_INET) + addr_buf = ((struct sockaddr_in*)addr_buf) + 1; + else + addr_buf = ((struct sockaddr_in6*)addr_buf) + 1; + } + + nio_sctp_freepaddrs(paddr); + + return isaa; +} + + /* + * Class: sun_nio_ch_sctp_SctpNet + * Method: getRemoteAddresses0 + * Signature: (II)[Ljava/net/SocketAddress; + */ +JNIEXPORT jobjectArray JNICALL Java_sun_nio_ch_sctp_SctpNet_getRemoteAddresses0 + (JNIEnv *env, jclass klass, jint fd, jint assocId) { + return getRemoteAddresses(env, fd, assocId); +} + +/* Map the Java level option to the native level */ +int mapSocketOption + (jint cmd, int *level, int *optname) { + static struct { + jint cmd; + int level; + int optname; + } const opts[] = { + { sun_nio_ch_sctp_SctpStdSocketOption_SCTP_DISABLE_FRAGMENTS, IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS }, + { sun_nio_ch_sctp_SctpStdSocketOption_SCTP_EXPLICIT_COMPLETE, IPPROTO_SCTP, SCTP_EXPLICIT_EOR }, + { sun_nio_ch_sctp_SctpStdSocketOption_SCTP_FRAGMENT_INTERLEAVE, IPPROTO_SCTP, SCTP_FRAGMENT_INTERLEAVE }, + { sun_nio_ch_sctp_SctpStdSocketOption_SCTP_NODELAY, IPPROTO_SCTP, SCTP_NODELAY }, + { sun_nio_ch_sctp_SctpStdSocketOption_SO_SNDBUF, SOL_SOCKET, SO_SNDBUF }, + { sun_nio_ch_sctp_SctpStdSocketOption_SO_RCVBUF, SOL_SOCKET, SO_RCVBUF }, + { sun_nio_ch_sctp_SctpStdSocketOption_SO_LINGER, SOL_SOCKET, SO_LINGER } }; + + int i; + for (i=0; i<(int)(sizeof(opts) / sizeof(opts[0])); i++) { + if (cmd == opts[i].cmd) { + *level = opts[i].level; + *optname = opts[i].optname; + return 0; + } + } + + /* not found */ + return -1; +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: setIntOption0 + * Signature: (III)V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_setIntOption0 + (JNIEnv *env, jclass klass, jint fd, jint opt, int arg) { + int klevel, kopt; + int result; + struct linger linger; + void *parg; + int arglen; + + if (mapSocketOption(opt, &klevel, &kopt) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "Unsupported socket option"); + return; + } + + if (opt == sun_nio_ch_sctp_SctpStdSocketOption_SO_LINGER) { + parg = (void *)&linger; + arglen = sizeof(linger); + if (arg >= 0) { + linger.l_onoff = 1; + linger.l_linger = arg; + } else { + linger.l_onoff = 0; + linger.l_linger = 0; + } + } else { + parg = (void *)&arg; + arglen = sizeof(arg); + } + + if (NET_SetSockOpt(fd, klevel, kopt, parg, arglen) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "sun_nio_ch_sctp_SctpNet.setIntOption0"); + } +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: getIntOption0 + * Signature: (II)I + */ +JNIEXPORT int JNICALL Java_sun_nio_ch_sctp_SctpNet_getIntOption0 + (JNIEnv *env, jclass klass, jint fd, jint opt) { + int klevel, kopt; + int result; + struct linger linger; + void *arg; + int arglen; + + if (mapSocketOption(opt, &klevel, &kopt) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "Unsupported socket option"); + return -1; + } + + if (opt == sun_nio_ch_sctp_SctpStdSocketOption_SO_LINGER) { + arg = (void *)&linger; + arglen = sizeof(linger); + } else { + arg = (void *)&result; + arglen = sizeof(result); + } + + if (NET_GetSockOpt(fd, klevel, kopt, arg, &arglen) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "sun.nio.ch.Net.getIntOption"); + return -1; + } + + if (opt == sun_nio_ch_sctp_SctpStdSocketOption_SO_LINGER) + return linger.l_onoff ? linger.l_linger : -1; + else + return result; +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: getPrimAddrOption0 + * Signature: (II)Ljava/net/SocketAddress; + */ +JNIEXPORT jobject JNICALL Java_sun_nio_ch_sctp_SctpNet_getPrimAddrOption0 + (JNIEnv *env, jclass klass, jint fd, jint assocId) { + struct sctp_setprim prim; + unsigned int prim_len = sizeof(prim); + struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr; + + prim.ssp_assoc_id = assocId; + + if (getsockopt(fd, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &prim, &prim_len) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "sun.nio.ch.SctpNet.getPrimAddrOption0"); + return NULL; + } + + return SockAddrToInetSocketAddress(env, sap); +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: setPrimAddrOption0 + * Signature: (IILjava/net/InetAddress;I)V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_setPrimAddrOption0 + (JNIEnv *env, jclass klass, jint fd, jint assocId, jobject iaObj, jint port) { + struct sctp_setprim prim; + struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr; + int sap_len; + + if (NET_InetAddressToSockaddr(env, iaObj, port, sap, + &sap_len, JNI_TRUE) != 0) { + return; + } + + prim.ssp_assoc_id = assocId; + + if (setsockopt(fd, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &prim, sizeof(prim)) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "sun.nio.ch.SctpNet.setPrimAddrOption0"); + } +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: setPeerPrimAddrOption0 + * Signature: (IILjava/net/InetAddress;I)V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_setPeerPrimAddrOption0 + (JNIEnv *env, jclass klass, jint fd, jint assocId, + jobject iaObj, jint port, jboolean preferIPv6) { + struct sctp_setpeerprim prim; + struct sockaddr* sap = (struct sockaddr*)&prim.sspp_addr; + int sap_len; + + if (NET_InetAddressToSockaddr(env, iaObj, port, sap, + &sap_len, preferIPv6) != 0) { + return; + } + + prim.sspp_assoc_id = assocId; + + if (setsockopt(fd, IPPROTO_SCTP, SCTP_SET_PEER_PRIMARY_ADDR, &prim, + sizeof(prim)) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "sun.nio.ch.SctpNet.setPeerPrimAddrOption0"); + } +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: getInitMsgOption0 + * Signature: (I[I)V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_getInitMsgOption0 + (JNIEnv *env, jclass klass, jint fd, jintArray retVal) { + struct sctp_initmsg sctp_initmsg; + unsigned int sim_len = sizeof(sctp_initmsg); + int vals[2]; + + if (getsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &sctp_initmsg, + &sim_len) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "sun.nio.ch.SctpNet.getInitMsgOption0"); + return; + } + + vals[0] = sctp_initmsg.sinit_max_instreams; + vals[1] = sctp_initmsg.sinit_num_ostreams; + (*env)->SetIntArrayRegion(env, retVal, 0, 2, vals); +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: setInitMsgOption0 + * Signature: (III)V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_setInitMsgOption0 + (JNIEnv *env, jclass klass, jint fd, jint inArg, jint outArg) { + struct sctp_initmsg sctp_initmsg; + + sctp_initmsg.sinit_max_instreams = (unsigned int)inArg; + sctp_initmsg.sinit_num_ostreams = (unsigned int)outArg; + sctp_initmsg.sinit_max_attempts = 0; // default + sctp_initmsg.sinit_max_init_timeo = 0; // default + + if (setsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &sctp_initmsg, + sizeof(sctp_initmsg)) < 0) { + JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", + "sun.nio.ch.SctpNet.setInitMsgOption0"); + } +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: shutdown0 + * Signature: (II)V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpNet_shutdown0 + (JNIEnv *env, jclass klass, jint fd, jint assocId) { + int rv; + struct msghdr msg[1]; + struct iovec iov[1]; + int cbuf_size = CMSG_SPACE(sizeof (struct sctp_sndrcvinfo)); + char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))]; + struct cmsghdr* cmsg; + struct sctp_sndrcvinfo *sri; + + /* SctpSocketChannel */ + if (assocId < 0) { + shutdown(fd, SHUT_WR); + return; + } + + memset(msg, 0, sizeof (*msg)); + memset(cbuf, 0, cbuf_size); + msg->msg_name = NULL; + msg->msg_namelen = 0; + iov->iov_base = NULL; + iov->iov_len = 0; + msg->msg_iov = iov; + msg->msg_iovlen = 1; + msg->msg_control = cbuf; + msg->msg_controllen = cbuf_size; + msg->msg_flags = 0; + + cmsg = CMSG_FIRSTHDR(msg); + cmsg->cmsg_level = IPPROTO_SCTP; + cmsg->cmsg_type = SCTP_SNDRCV; + cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo)); + + /* Initialize the payload: */ + sri = (struct sctp_sndrcvinfo*) CMSG_DATA(cmsg); + memset(sri, 0, sizeof (*sri)); + + if (assocId > 0) { + sri->sinfo_assoc_id = assocId; + } + + sri->sinfo_flags = sri->sinfo_flags | SCTP_EOF; + + /* Sum of the length of all control messages in the buffer. */ + msg->msg_controllen = cmsg->cmsg_len; + + if ((rv = sendmsg(fd, msg, 0)) < 0) { + handleSocketError(env, errno); + } +} + +/* + * Class: sun_nio_ch_sctp_SctpNet + * Method: branch + * Signature: (II)I + */ +JNIEXPORT int JNICALL Java_sun_nio_ch_sctp_SctpNet_branch0 + (JNIEnv *env, jclass klass, jint fd, jint assocId) { + int newfd = 0; + if ((newfd = nio_sctp_peeloff(fd, assocId)) < 0) { + handleSocketError(env, errno); + } + + return newfd; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#include "sun_nio_ch_sctp_SctpServerChannelImpl.h" + +extern void Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(JNIEnv* env, + jclass c); + +extern jint Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv* env, + jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa); + +/* + * Class: sun_nio_ch_sctp_SctpServerChannelImpl + * Method: initIDs + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpServerChannelImpl_initIDs + (JNIEnv* env, jclass c) { + Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(env, c); +} + +/* + * Class: sun_nio_ch_sctp_SctpServerChannelImpl + * Method: accept0 + * Signature: (Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;[Ljava/net/InetSocketAddress;)I + */ +JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpServerChannelImpl_accept0 + (JNIEnv* env, jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa) { + return Java_sun_nio_ch_ServerSocketChannelImpl_accept0(env, this, + ssfdo, newfdo, isaa); +}
--- a/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c Thu Feb 16 13:01:36 2012 -0800 +++ b/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c Sat Feb 18 16:11:47 2012 -0800 @@ -605,9 +605,12 @@ JNIEXPORT jbyteArray JNICALL Java_sun_nio_fs_UnixNativeDispatcher_readdir(JNIEnv* env, jclass this, jlong value) { - char entry[sizeof(struct dirent64) + PATH_MAX + 1]; - struct dirent64* ptr = (struct dirent64*)&entry; struct dirent64* result; + struct { + struct dirent64 buf; + char name_extra[PATH_MAX + 1 - sizeof result->d_name]; + } entry; + struct dirent64* ptr = &entry.buf; int res; DIR* dirp = jlong_to_ptr(value);
--- a/src/windows/classes/sun/nio/ch/SctpChannelImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.SocketAddress; -import java.net.InetAddress; -import java.io.IOException; -import java.util.Set; -import java.nio.ByteBuffer; -import java.nio.channels.spi.SelectorProvider; -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.MessageInfo; -import com.sun.nio.sctp.NotificationHandler; -import com.sun.nio.sctp.SctpChannel; -import com.sun.nio.sctp.SctpSocketOption; - -/** - * Unimplemented. - */ -public class SctpChannelImpl extends SctpChannel -{ - private static final String message = "SCTP not supported on this platform"; - - public SctpChannelImpl(SelectorProvider provider) { - super(provider); - throw new UnsupportedOperationException(message); - } - - @Override - public Association association() { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpChannel bind(SocketAddress local) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpChannel bindAddress(InetAddress address) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpChannel unbindAddress(InetAddress address) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public boolean connect(SocketAddress remote) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public boolean connect(SocketAddress remote, int maxOutStreams, - int maxInStreams) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public boolean isConnectionPending() { - throw new UnsupportedOperationException(message); - } - - @Override - public boolean finishConnect() throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SocketAddress> getAllLocalAddresses() - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SocketAddress> getRemoteAddresses() - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpChannel shutdown() throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> T getOption(SctpSocketOption<T> name) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> SctpChannel setOption(SctpSocketOption<T> name, T value) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SctpSocketOption<?>> supportedOptions() { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> MessageInfo receive(ByteBuffer dst, T attachment, - NotificationHandler<T> handler) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public int send(ByteBuffer src, MessageInfo messageInfo) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - protected void implConfigureBlocking(boolean block) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public void implCloseSelectableChannel() throws IOException { - throw new UnsupportedOperationException(message); - } -}
--- a/src/windows/classes/sun/nio/ch/SctpMultiChannelImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,137 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.SocketAddress; -import java.net.InetAddress; -import java.io.IOException; -import java.util.Set; -import java.nio.ByteBuffer; -import java.nio.channels.spi.SelectorProvider; -import com.sun.nio.sctp.Association; -import com.sun.nio.sctp.SctpChannel; -import com.sun.nio.sctp.MessageInfo; -import com.sun.nio.sctp.NotificationHandler; -import com.sun.nio.sctp.SctpMultiChannel; -import com.sun.nio.sctp.SctpSocketOption; - -/** - * Unimplemented. - */ -public class SctpMultiChannelImpl extends SctpMultiChannel -{ - private static final String message = "SCTP not supported on this platform"; - - public SctpMultiChannelImpl(SelectorProvider provider) { - super(provider); - throw new UnsupportedOperationException(message); - } - - @Override - public Set<Association> associations() { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpMultiChannel bind(SocketAddress local, - int backlog) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpMultiChannel bindAddress(InetAddress address) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpMultiChannel unbindAddress(InetAddress address) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SocketAddress> getAllLocalAddresses() - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SocketAddress> getRemoteAddresses - (Association association) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpMultiChannel shutdown(Association association) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> T getOption(SctpSocketOption<T> name, - Association association) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> SctpMultiChannel setOption(SctpSocketOption<T> name, - T value, Association association) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SctpSocketOption<?>> supportedOptions() { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> MessageInfo receive(ByteBuffer buffer, T attachment, - NotificationHandler<T> handler) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public int send(ByteBuffer buffer, MessageInfo messageInfo) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpChannel branch(Association association) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - protected void implConfigureBlocking(boolean block) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public void implCloseSelectableChannel() throws IOException { - throw new UnsupportedOperationException(message); - } -}
--- a/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package sun.nio.ch; - -import java.net.SocketAddress; -import java.net.InetAddress; -import java.io.IOException; -import java.util.Set; -import java.nio.channels.spi.SelectorProvider; -import com.sun.nio.sctp.SctpChannel; -import com.sun.nio.sctp.SctpServerChannel; -import com.sun.nio.sctp.SctpSocketOption; - -/** - * Unimplemented. - */ -public class SctpServerChannelImpl extends SctpServerChannel -{ - private static final String message = "SCTP not supported on this platform"; - - public SctpServerChannelImpl(SelectorProvider provider) { - super(provider); - throw new UnsupportedOperationException(message); - } - - @Override - public SctpChannel accept() throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpServerChannel bind(SocketAddress local, - int backlog) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpServerChannel bindAddress(InetAddress address) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public SctpServerChannel unbindAddress(InetAddress address) - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SocketAddress> getAllLocalAddresses() - throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> T getOption(SctpSocketOption<T> name) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public <T> SctpServerChannel setOption(SctpSocketOption<T> name, - T value) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public Set<SctpSocketOption<?>> supportedOptions() { - throw new UnsupportedOperationException(message); - } - - @Override - protected void implConfigureBlocking(boolean block) throws IOException { - throw new UnsupportedOperationException(message); - } - - @Override - public void implCloseSelectableChannel() throws IOException { - throw new UnsupportedOperationException(message); - } -}
--- a/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Thu Feb 16 13:01:36 2012 -0800 +++ b/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -585,7 +585,7 @@ ((SelChImpl)selch).kill(); } - void putEventOps(SelectionKeyImpl sk, int ops) { + public void putEventOps(SelectionKeyImpl sk, int ops) { synchronized (closeLock) { if (pollWrapper == null) throw new ClosedSelectorException();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.SocketAddress; +import java.net.InetAddress; +import java.io.IOException; +import java.util.Set; +import java.nio.ByteBuffer; +import java.nio.channels.spi.SelectorProvider; +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.MessageInfo; +import com.sun.nio.sctp.NotificationHandler; +import com.sun.nio.sctp.SctpChannel; +import com.sun.nio.sctp.SctpSocketOption; + +/** + * Unimplemented. + */ +public class SctpChannelImpl extends SctpChannel +{ + private static final String message = "SCTP not supported on this platform"; + + public SctpChannelImpl(SelectorProvider provider) { + super(provider); + throw new UnsupportedOperationException(message); + } + + @Override + public Association association() { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpChannel bind(SocketAddress local) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpChannel bindAddress(InetAddress address) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpChannel unbindAddress(InetAddress address) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public boolean connect(SocketAddress remote) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public boolean connect(SocketAddress remote, int maxOutStreams, + int maxInStreams) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public boolean isConnectionPending() { + throw new UnsupportedOperationException(message); + } + + @Override + public boolean finishConnect() throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SocketAddress> getAllLocalAddresses() + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SocketAddress> getRemoteAddresses() + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpChannel shutdown() throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> T getOption(SctpSocketOption<T> name) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> SctpChannel setOption(SctpSocketOption<T> name, T value) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SctpSocketOption<?>> supportedOptions() { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> MessageInfo receive(ByteBuffer dst, T attachment, + NotificationHandler<T> handler) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public int send(ByteBuffer src, MessageInfo messageInfo) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + protected void implConfigureBlocking(boolean block) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public void implCloseSelectableChannel() throws IOException { + throw new UnsupportedOperationException(message); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,137 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.SocketAddress; +import java.net.InetAddress; +import java.io.IOException; +import java.util.Set; +import java.nio.ByteBuffer; +import java.nio.channels.spi.SelectorProvider; +import com.sun.nio.sctp.Association; +import com.sun.nio.sctp.SctpChannel; +import com.sun.nio.sctp.MessageInfo; +import com.sun.nio.sctp.NotificationHandler; +import com.sun.nio.sctp.SctpMultiChannel; +import com.sun.nio.sctp.SctpSocketOption; + +/** + * Unimplemented. + */ +public class SctpMultiChannelImpl extends SctpMultiChannel +{ + private static final String message = "SCTP not supported on this platform"; + + public SctpMultiChannelImpl(SelectorProvider provider) { + super(provider); + throw new UnsupportedOperationException(message); + } + + @Override + public Set<Association> associations() { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpMultiChannel bind(SocketAddress local, + int backlog) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpMultiChannel bindAddress(InetAddress address) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpMultiChannel unbindAddress(InetAddress address) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SocketAddress> getAllLocalAddresses() + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SocketAddress> getRemoteAddresses + (Association association) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpMultiChannel shutdown(Association association) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> T getOption(SctpSocketOption<T> name, + Association association) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> SctpMultiChannel setOption(SctpSocketOption<T> name, + T value, Association association) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SctpSocketOption<?>> supportedOptions() { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> MessageInfo receive(ByteBuffer buffer, T attachment, + NotificationHandler<T> handler) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public int send(ByteBuffer buffer, MessageInfo messageInfo) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpChannel branch(Association association) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + protected void implConfigureBlocking(boolean block) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public void implCloseSelectableChannel() throws IOException { + throw new UnsupportedOperationException(message); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch.sctp; + +import java.net.SocketAddress; +import java.net.InetAddress; +import java.io.IOException; +import java.util.Set; +import java.nio.channels.spi.SelectorProvider; +import com.sun.nio.sctp.SctpChannel; +import com.sun.nio.sctp.SctpServerChannel; +import com.sun.nio.sctp.SctpSocketOption; + +/** + * Unimplemented. + */ +public class SctpServerChannelImpl extends SctpServerChannel +{ + private static final String message = "SCTP not supported on this platform"; + + public SctpServerChannelImpl(SelectorProvider provider) { + super(provider); + throw new UnsupportedOperationException(message); + } + + @Override + public SctpChannel accept() throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpServerChannel bind(SocketAddress local, + int backlog) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpServerChannel bindAddress(InetAddress address) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public SctpServerChannel unbindAddress(InetAddress address) + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SocketAddress> getAllLocalAddresses() + throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> T getOption(SctpSocketOption<T> name) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public <T> SctpServerChannel setOption(SctpSocketOption<T> name, + T value) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public Set<SctpSocketOption<?>> supportedOptions() { + throw new UnsupportedOperationException(message); + } + + @Override + protected void implConfigureBlocking(boolean block) throws IOException { + throw new UnsupportedOperationException(message); + } + + @Override + public void implCloseSelectableChannel() throws IOException { + throw new UnsupportedOperationException(message); + } +}
--- a/test/Makefile Thu Feb 16 13:01:36 2012 -0800 +++ b/test/Makefile Sat Feb 18 16:11:47 2012 -0800 @@ -517,14 +517,14 @@ JDK_ALL_TARGETS += jdk_nio2 JDK_DEFAULT_TARGETS += jdk_nio2 jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \ - java/nio/channels java/nio/MappedByteBuffer) + java/nio/channels java/nio/MappedByteBuffer sun/nio/ch) $(call SharedLibraryPermissions,java/nio/channels) $(call RunAgentvmBatch) # Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_nio3 JDK_DEFAULT_TARGETS += jdk_nio3 -jdk_nio3: $(call TestDirs, sun/nio) +jdk_nio3: $(call TestDirs, java/nio/charset sun/nio/cs) $(call RunAgentvmBatch) # All nio tests
--- a/test/ProblemList.txt Thu Feb 16 13:01:36 2012 -0800 +++ b/test/ProblemList.txt Sat Feb 18 16:11:47 2012 -0800 @@ -211,78 +211,9 @@ # jdk_management -# Failing, bug was filed: 6959636 -javax/management/loading/LibraryLoader/LibraryLoaderTest.java generic-all - -# Access denied messages on windows/mks, filed 6954450 -sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh windows-all - -# Fails on linux: KO: StringMonitor notification missed or not emitted -javax/management/monitor/NonComparableAttributeValueTest.java generic-all - -# Port conflict? Fails with communication error -sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh generic-all - -# Fails on Windows 2000, Test failed for iiop java.lang.NullPointerException -# at org.omg.stub.javax.management.remote.rmi._RMIConnectionImpl_Tie._invoke(Unknown Source) -# at com.sun.corba.se.impl.protocol.CorbaServerRequestDispatcherImpl.dispatchToServant(CorbaServerRequestDispatcherImpl.java:653) -javax/management/remote/mandatory/connection/ReconnectTest.java generic-all - -# Solaris 10 sparc, NPE from org.omg.stub.javax.management.remote.rmi._RMIConnectionImpl_Tie._invoke -javax/management/remote/mandatory/threads/ExecutorTest.java generic-all - -# Linux 32bit Fedora 9, IllegalStateException -javax/management/monitor/RuntimeExceptionTest.java generic-all - -# Problems with rmi connection, othervm -javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java generic-all - -# Fails with port already in use -sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh generic-all - -# Fails with port already in use -sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh generic-all - -# Windows, connection can't last that long -javax/management/eventService/LeaseTest.java generic-all - -# Linux othervm, X64, java.lang.Exception: Failed: ratio=102.4027795593753 -javax/management/remote/mandatory/notif/ListenerScaleTest.java generic-all - -# Windows run seems to have triggered a hotspot gc error (see 6801625) -com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh generic-all - -# rmi problem? othervm, java.lang.reflect.UndeclaredThrowableException -javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java generic-all - -# Linux Fedora 9 32bit NPE in rmi server somehere??? othervm -javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java generic-all - -# Times out on solaris sparc, with othervm -javax/management/eventService/AddRemoveListenerTest.java generic-all - -# Linux i586 and x64 -server, timed out waiting for threads to expire? othervm -javax/management/eventService/EventClientThreadTest.java generic-all - -# Linux i586 -server, Expected to receive 20, but got 21, othervm -# Fails on Linux X64 -server 20!=21 -javax/management/eventService/FetchingTest.java generic-all - -# NPE on windows 2000 i586 -client and -server -javax/management/eventService/CustomForwarderTest.java windows-all - -# Windows i586 failure, callback did not complete -javax/management/eventService/LeaseManagerDeadlockTest.java windows-all - -# Port already in use -sun/management/jmxremote/bootstrap/LocalManagementTest.sh generic-all - -# Failed to initialize connector (also overflowing jtreg io buffers) -sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh generic-all -sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh generic-all - -# Windows X64, java.lang.IllegalStateException -javax/management/monitor/AttributeArbitraryDataTypeTest.java generic-all +# 7073626 +sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh windows-all +sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh windows-all ############################################################################ @@ -410,71 +341,11 @@ # jdk_rmi -# Port already in use, fails on sparc, othervm -java/rmi/reliability/benchmark/runRmiBench.sh generic-all - -# Already in use port issues? othervm solaris -java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java generic-all -java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java generic-all - -java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java generic-all -java/rmi/transport/dgcDeadLock/TestImpl_Stub.java generic-all - -# Address already in use, othervm mode, solaris -java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java generic-all -java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java generic-all - -# Registry already running on port, solaris -java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java generic-all - -# Fails on Linux 32 and 64bit -server?, impl not garbage collected??? -java/rmi/transport/pinLastArguments/PinLastArguments.java generic-all - -# Times out on solaris sparc -java/rmi/server/RemoteServer/AddrInUse.java generic-all - -# Connection error on Windows i586 -server -# Also connection errors in othervm on Solaris 10 sparc, same port??? -sun/rmi/transport/tcp/DeadCachedConnection.java generic-all +# 7140992 +java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java generic-all -# Connection errors in othervm on Solaris 10 sparc, same port??? -java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java generic-all -java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java generic-all -java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java generic-all -java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java generic-all -java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java generic-all -java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java generic-all -java/rmi/activation/Activatable/extLoadedImpl/ext.sh generic-all -java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java generic-all -java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java generic-all -java/rmi/activation/Activatable/nestedActivate/NestedActivate.java generic-all -java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java generic-all -java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java generic-all -java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java generic-all -java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java generic-all -java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java generic-all -java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java generic-all -java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java generic-all -java/rmi/reliability/juicer/AppleUserImpl.java generic-all -java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java generic-all -java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java generic-all -java/rmi/transport/handshakeTimeout/HandshakeTimeout.java generic-all -java/rmi/activation/Activatable/restartService/RestartService.java generic-all -java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java generic-all -java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java generic-all -java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java generic-all -java/rmi/activation/CommandEnvironment/SetChildEnv.java generic-all -java/rmi/registry/classPathCodebase/ClassPathCodebase.java generic-all -java/rmi/registry/reexport/Reexport.java generic-all -java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java generic-all -java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java generic-all -java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java generic-all -java/rmi/server/useCustomRef/UseCustomRef.java generic-all -java/rmi/transport/checkFQDN/CheckFQDN.java generic-all -java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java generic-all -java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java generic-all -java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java generic-all -java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java generic-all +# 6948101 +java/rmi/transport/pinLastArguments/PinLastArguments.java generic-all # 7132247 java/rmi/registry/readTest/readTest.sh windows-all @@ -557,6 +428,9 @@ # jdk_tools +# 6461635 +com/sun/tools/attach/BasicTests.sh generic-all + # Filed 6952105 com/sun/jdi/SuspendThreadTest.java generic-all @@ -572,15 +446,16 @@ # Filed 6402201 com/sun/jdi/ProcessAttachTest.sh generic-all -# Filed 6986875 -sun/tools/jps/jps-Vvml.sh generic-all - # Filed 6979016 sun/tools/jconsole/ResourceCheckTest.sh generic-all # 7132203 sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all +# Tests take too long +tools/pack200/CommandLineTests.java generic-all +tools/pack200/Pack200Test.java generic-all + ############################################################################ # jdk_util @@ -588,11 +463,6 @@ # Filed 6933803 java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java generic-all -# Filed 7022325 -# Fails with assertion error on windows -# 11 separate stacktraces created... file reuse problem? -java/util/zip/ZipFile/ReadLongZipFileName.java generic-all - # Filed 6772009 java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java generic-all
--- a/test/TEST.ROOT Thu Feb 16 13:01:36 2012 -0800 +++ b/test/TEST.ROOT Sat Feb 18 16:11:47 2012 -0800 @@ -4,3 +4,9 @@ # The list of keywords supported in the entire test suite keys=2d dnd i18n + +# Tests that must run in othervm mode +othervm.dirs=java/rmi sun/rmi javax/management + +# Tests that cannot run concurrently +exclusiveAccess.dirs=java/rmi sun/rmi sun/management/jmxremote sun/tools/jstatd
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 7104647 - * @summary Basic Test for HotSpotDiagnosticMXBean.execute() - * @author Frederic Parain - * - * @run main ExecuteDiagnosticCommand - */ - -import com.sun.management.HotSpotDiagnosticMXBean; -import com.sun.management.VMOption; -import java.lang.management.ManagementFactory; -import java.util.List; -import javax.management.MBeanServer; - -public class ExecuteDiagnosticCommand { - private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME = - "com.sun.management:type=HotSpotDiagnostic"; - - public static void main(String[] args) throws Exception { - HotSpotDiagnosticMXBean mbean = - ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class); - executeDiagnosticCommand(mbean); - - MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - mbean = ManagementFactory.newPlatformMXBeanProxy(mbs, - HOTSPOT_DIAGNOSTIC_MXBEAN_NAME, - HotSpotDiagnosticMXBean.class); - executeDiagnosticCommand(mbean); - } - - private static void executeDiagnosticCommand(HotSpotDiagnosticMXBean mbean) { - String s = mbean.execute("help help"); - System.out.println(s); - s = mbean.execute("help", "help"); - System.out.println(s); - String tab[] = { "help"}; - s = mbean.execute("help", tab); - System.out.println(s); - } -}
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 7104647 - * @summary Basic Test for HotSpotDiagnosticMXBean.getDiagnosticCommandInfo() - * @author Frederic Parain - * - * @run main GetDiagnosticCommandInfo - */ - -import com.sun.management.HotSpotDiagnosticMXBean; -import com.sun.management.DiagnosticCommandInfo; -import com.sun.management.DiagnosticCommandArgumentInfo; -import com.sun.management.VMOption; -import java.lang.management.ManagementFactory; -import java.util.List; -import javax.management.MBeanServer; - -public class GetDiagnosticCommandInfo { - private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME = - "com.sun.management:type=HotSpotDiagnostic"; - - public static void main(String[] args) throws Exception { - HotSpotDiagnosticMXBean mbean = - ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class); - checkDiagnosticCommandArguments(mbean); - - MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - mbean = ManagementFactory.newPlatformMXBeanProxy(mbs, - HOTSPOT_DIAGNOSTIC_MXBEAN_NAME, - HotSpotDiagnosticMXBean.class); - checkDiagnosticCommandArguments(mbean); - } - - private static void checkDiagnosticCommandArguments(HotSpotDiagnosticMXBean mbean) { - // check getDiagnosticCommandInfo() - StringBuilder sb = new StringBuilder(); - List<DiagnosticCommandInfo> infoList = mbean.getDiagnosticCommandInfo(); - for(DiagnosticCommandInfo info : infoList) { - printCommandInfo(info,sb); - } - // check getDiagnosticCommandInfo(List<String>) - List<String> commands = mbean.getDiagnosticCommands(); - List<DiagnosticCommandInfo> list2 = - mbean.getDiagnosticCommandInfo(commands); - for(DiagnosticCommandInfo info : list2) { - printCommandInfo(info,sb); - } - // check getDiagnosticCommandInfo(String) - for(String cmd : commands) { - DiagnosticCommandInfo info2 = mbean.getDiagnosticCommandInfo(cmd); - printCommandInfo(info2,sb); - } - System.out.println(sb.toString()); - } - - private static void printCommandInfo(DiagnosticCommandInfo info, - StringBuilder sb) { - sb.append("\t").append(info.getName()).append(":\n"); - sb.append("\t\tDescription=").append(info.getDescription()).append("\n"); - sb.append("\t\tImpact=").append(info.getImpact()).append("\n"); - sb.append("\t\tStatus="); - if (info.isEnabled()) { - sb.append("Enabled\n"); - } else { - sb.append("Disbled\n"); - } - sb.append("\t\tArguments="); - for(DiagnosticCommandArgumentInfo arg : info.getArgumentsInfo()) { - printArgumentInfo(arg,sb); - } - } - - private static void printArgumentInfo(DiagnosticCommandArgumentInfo info, - StringBuilder sb) { - sb.append("\t\t\t").append(info.getName()).append(":\n"); - sb.append("\t\t\t\tType=").append(info.getType()).append("\n"); - sb.append("\t\t\t\tDescription=").append(info.getDescription()).append("\n"); - if(info.getDefault() != null) { - sb.append("\t\t\t\tDefault=").append(info.getDefault()).append("\n"); - } - if(info.isMandatory()) { - sb.append("\t\t\t\tMandatory\n"); - } else { - sb.append("\t\t\t\tOptional\n"); - } - if(info.isOption()) { - sb.append("\t\t\t\tIs an option\n"); - } else { - sb.append("\t\t\t\tIs an argument expected at position"); - sb.append(info.getPosition()); - sb.append("\n"); - } - } -}
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java Thu Feb 16 13:01:36 2012 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 7104647 - * @summary Basic Test for HotSpotDiagnosticMXBean.getDiagnosticCommands() - * @author Frederic Parain - * - * @run main GetDiagnosticCommands - */ - -import com.sun.management.HotSpotDiagnosticMXBean; -import com.sun.management.VMOption; -import java.lang.management.ManagementFactory; -import java.util.List; -import javax.management.MBeanServer; - -public class GetDiagnosticCommands { - private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME = - "com.sun.management:type=HotSpotDiagnostic"; - - public static void main(String[] args) throws Exception { - HotSpotDiagnosticMXBean mbean = - ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class); - checkDiagnosticCommands(mbean); - - MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - mbean = ManagementFactory.newPlatformMXBeanProxy(mbs, - HOTSPOT_DIAGNOSTIC_MXBEAN_NAME, - HotSpotDiagnosticMXBean.class); - checkDiagnosticCommands(mbean); - } - - private static void checkDiagnosticCommands(HotSpotDiagnosticMXBean mbean) { - List<String> commands = mbean.getDiagnosticCommands(); - System.out.println("Commands:"); - for (String cmd : commands) { - System.out.println(cmd); - } - } -}
--- a/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java Sat Feb 18 16:11:47 2012 -0800 @@ -96,7 +96,10 @@ // Test mouse wheel over the choice String name = Toolkit.getDefaultToolkit().getClass().getName(); - if(!name.equals("sun.awt.X11.XToolkit")) { // mouse wheel doesn't work for the choice on X11, so skip it + + // mouse wheel doesn't work for the choice on X11 and Mac, so skip it + if(!name.equals("sun.awt.X11.XToolkit") + && !name.equals("sun.lwawt.macosx.LWCToolkit")) { robot.mouseWheel(1); Util.waitForIdle(robot);
--- a/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java Sat Feb 18 16:11:47 2012 -0800 @@ -54,9 +54,12 @@ Util.clickOnComp(frame.button, robot); } - frame.panel.stop(); + boolean ret = frame.panel.stop(); frame.dispose(); + if (!ret) { + throw new RuntimeException("Test failed!"); + } System.out.println("Test passed."); } @@ -140,17 +143,19 @@ } } - public void stop() { + public boolean stop() { active = false; try { - synchronized (sync) { - sync.notify(); - } - synchronized (thread) { - thread.wait(); + sync(); + thread.join(1000); + if (thread.isAlive()) { + thread.interrupt(); + return false; } } catch (InterruptedException ex) { + return false; } + return true; } public void draw() {
--- a/test/java/nio/file/WatchService/Basic.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/java/nio/file/WatchService/Basic.java Sat Feb 18 16:11:47 2012 -0800 @@ -25,7 +25,7 @@ * @bug 4313887 6838333 7017446 * @summary Unit test for java.nio.file.WatchService * @library .. - * @run main/timeout=120 Basic + * @run main Basic */ import java.nio.file.*; @@ -281,11 +281,11 @@ System.out.println("poll with timeout..."); try { - long start = System.currentTimeMillis(); + long start = System.nanoTime(); key = watcher.poll(3000, TimeUnit.MILLISECONDS); if (key != null) throw new RuntimeException("no keys registered"); - long waited = System.currentTimeMillis() - start; + long waited = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start); if (waited < 2900) throw new RuntimeException("poll was too short"); } catch (InterruptedException x) { @@ -358,14 +358,14 @@ } // assume that poll throws exception immediately - long start = System.currentTimeMillis(); + long start = System.nanoTime(); try { watcher.poll(10000, TimeUnit.MILLISECONDS); throw new RuntimeException("ClosedWatchServiceException not thrown"); } catch (InterruptedException x) { throw new RuntimeException(x); } catch (ClosedWatchServiceException x) { - long waited = System.currentTimeMillis() - start; + long waited = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start); if (waited > 5000) throw new RuntimeException("poll was too long"); }
--- a/test/java/nio/file/WatchService/SensitivityModifier.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/java/nio/file/WatchService/SensitivityModifier.java Sat Feb 18 16:11:47 2012 -0800 @@ -23,9 +23,9 @@ /* @test * @bug 4313887 - * @summary Sanity test for Sun-specific sensitivyt level watch event modifier + * @summary Sanity test for Sun-specific sensitivity level watch event modifier * @library .. - * @run main/timeout=330 Basic + * @run main/timeout=240 SensitivityModifier */ import java.nio.file.*; @@ -96,6 +96,7 @@ // drain events (to avoid interference) do { + key.pollEvents(); key.reset(); key = watcher.poll(1, TimeUnit.SECONDS); } while (key != null);
--- a/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java Sat Feb 18 16:11:47 2012 -0800 @@ -75,10 +75,10 @@ throw new Error("Executor stuck"); // Wait for the invocation thread to complete. - thread.join(1000); + thread.join(5000); if (thread.isAlive()) { thread.interrupt(); - thread.join(1000); + thread.join(5000); throw new Error("invokeAll stuck"); } }
--- a/test/java/util/concurrent/ThreadPoolExecutor/Custom.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/java/util/concurrent/ThreadPoolExecutor/Custom.java Sat Feb 18 16:11:47 2012 -0800 @@ -100,8 +100,8 @@ equal(countExecutorThreads(), threadCount); equal(CustomTask.births.get(), threadCount); tpe.shutdown(); - tpe.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); - Thread.sleep(10); + tpe.awaitTermination(120, TimeUnit.SECONDS); + Thread.sleep(1000); equal(countExecutorThreads(), 0); CustomSTPE stpe = new CustomSTPE(); @@ -110,8 +110,8 @@ equal(CustomSTPE.decorations.get(), threadCount); equal(countExecutorThreads(), threadCount); stpe.shutdown(); - stpe.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); - Thread.sleep(10); + stpe.awaitTermination(120, TimeUnit.SECONDS); + Thread.sleep(1000); equal(countExecutorThreads(), 0); System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
--- a/test/java/util/concurrent/locks/Lock/FlakyMutex.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/java/util/concurrent/locks/Lock/FlakyMutex.java Sat Feb 18 16:11:47 2012 -0800 @@ -86,7 +86,7 @@ } catch (Throwable t) { unexpected(t); }}});} barrier.await(); es.shutdown(); - check(es.awaitTermination(10, TimeUnit.SECONDS)); + check(es.awaitTermination(30, TimeUnit.SECONDS)); } private static class FlakySync extends AbstractQueuedLongSynchronizer {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/crypto/CipherSpi/DirectBBRemaining.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 7142509 + * @summary Cipher.doFinal(ByteBuffer,ByteBuffer) fails to + * process when in.remaining() == 0 + */ + +import java.nio.ByteBuffer; +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.Random; + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + +/* + * Simple test case to show that Cipher.doFinal(ByteBuffer, ByteBuffer) fails to + * process the data internally buffered inBB the cipher when input.remaining() + * == 0 and at least one buffer is a direct buffer. + */ +public class DirectBBRemaining { + + private static Random random = new SecureRandom(); + private static int testSizes = 40; + private static int outputFrequency = 5; + + public static void main(String args[]) throws Exception { + boolean failedOnce = false; + Exception failedReason = null; + + byte[] keyBytes = new byte[8]; + random.nextBytes(keyBytes); + SecretKey key = new SecretKeySpec(keyBytes, "DES"); + + Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding", "SunJCE"); + cipher.init(Cipher.ENCRYPT_MODE, key); + + /* + * Iterate through various sizes to make sure that the code does empty + * blocks, single partial blocks, 1 full block, full + partial blocks, + * multiple full blocks, etc. 5 blocks (using DES) is probably overkill + * but will feel more confident the fix isn't breaking anything. + */ + System.out.println("Output test results for every " + + outputFrequency + " tests..."); + + for (int size = 0; size <= testSizes; size++) { + boolean output = (size % outputFrequency) == 0; + if (output) { + System.out.print("\nTesting buffer size: " + size + ":"); + } + + int outSize = cipher.getOutputSize(size); + + try { + encrypt(cipher, size, + ByteBuffer.allocate(size), + ByteBuffer.allocate(outSize), + ByteBuffer.allocateDirect(size), + ByteBuffer.allocateDirect(outSize), + output); + } catch (Exception e) { + System.out.print("\n Failed with size " + size); + failedOnce = true; + failedReason = e; + + // If we got an exception, let's be safe for future + // testing and reset the cipher to a known good state. + cipher.init(Cipher.ENCRYPT_MODE, key); + } + } + if (failedOnce) { + throw failedReason; + } + System.out.println("\nTest Passed..."); + } + + private enum TestVariant { + + HEAP_HEAP, HEAP_DIRECT, DIRECT_HEAP, DIRECT_DIRECT + }; + + private static void encrypt(Cipher cipher, int size, + ByteBuffer heapIn, ByteBuffer heapOut, + ByteBuffer directIn, ByteBuffer directOut, + boolean output) throws Exception { + + ByteBuffer inBB = null; + ByteBuffer outBB = null; + + // Set up data and encrypt to known/expected values. + byte[] testdata = new byte[size]; + random.nextBytes(testdata); + byte[] expected = cipher.doFinal(testdata); + + for (TestVariant tv : TestVariant.values()) { + if (output) { + System.out.print(" " + tv); + } + + switch (tv) { + case HEAP_HEAP: + inBB = heapIn; + outBB = heapOut; + break; + case HEAP_DIRECT: + inBB = heapIn; + outBB = directOut; + break; + case DIRECT_HEAP: + inBB = directIn; + outBB = heapOut; + break; + case DIRECT_DIRECT: + inBB = directIn; + outBB = directOut; + break; + } + + inBB.clear(); + outBB.clear(); + + inBB.put(testdata); + inBB.flip(); + + // Process all data in one shot, but don't call doFinal() yet. + // May store up to n-1 bytes (w/block size n) internally. + cipher.update(inBB, outBB); + if (inBB.hasRemaining()) { + throw new Exception("buffer not empty"); + } + + // finish encryption and process all data buffered + cipher.doFinal(inBB, outBB); + outBB.flip(); + + // validate output size + if (outBB.remaining() != expected.length) { + throw new Exception( + "incomplete encryption output, expected " + + expected.length + " bytes but was only " + + outBB.remaining() + " bytes"); + } + + // validate output data + byte[] encrypted = new byte[outBB.remaining()]; + outBB.get(encrypted); + if (!Arrays.equals(expected, encrypted)) { + throw new Exception("bad encryption output"); + } + + if (!Arrays.equals(cipher.doFinal(), cipher.doFinal())) { + throw new Exception("Internal buffers still held data!"); + } + } + } +}
--- a/test/javax/security/auth/x500/X500Principal/Parse.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/javax/security/auth/x500/X500Principal/Parse.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 7024771 + * @bug 7024771 7024604 * @summary various X500Principal DN parsing tests */ @@ -32,12 +32,18 @@ public class Parse { private static TestCase[] testCases = { - new TestCase("CN=prefix\\<>suffix", false) + new TestCase("CN=prefix\\<>suffix", false), + new TestCase("OID.1=value", false), + new TestCase("oid.1=value", false), + new TestCase("OID.1.2=value", true), + new TestCase("oid.1.2=value", true), + new TestCase("1=value", false), + new TestCase("1.2=value", true) }; public static void main(String args[]) throws Exception { - for (int i = 0; i < testCases.length; i++) { - testCases[i].run(); + for (TestCase testCase : testCases) { + testCase.run(); } System.out.println("Test completed ok."); }
--- a/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,28 +26,29 @@ * @bug 6396844 * @summary Tests memory leak for 20000 files * @author Sergey Malenkov - * @run main/othervm/timeout=1000 -mx256m TwentyThousandTest + * @library ../../regtesthelpers + * @build Util + * @run main/othervm/timeout=1000 -mx128m TwentyThousandTest */ +import sun.java2d.Disposer; +import sun.java2d.DisposerRecord; + import javax.swing.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; +import java.awt.event.HierarchyEvent; +import java.awt.event.HierarchyListener; import java.io.File; import java.io.FileWriter; -public class TwentyThousandTest implements ActionListener, Runnable { +public class TwentyThousandTest { private static final int FILES = 20000; - private static final int ATTEMPTS = 100; + private static final int ATTEMPTS = 20; private static final int INTERVAL = 100; - private static final boolean ALWAYS_NEW_INSTANCE = false; - private static final boolean UPDATE_UI_EACH_INTERVAL = true; - private static final boolean AUTO_CLOSE_DIALOG = true; + private static String tmpDir; - private static JFileChooser CHOOSER; - - private static String tmpDir; + private static volatile boolean disposerComplete; public static void main(String[] args) throws Exception { tmpDir = System.getProperty("java.io.tmpdir"); @@ -77,15 +78,13 @@ System.out.println("Do " + ATTEMPTS + " attempts for " + laf.getClassName()); - for ( int i = 0; i < ATTEMPTS; i++ ) { + for (int i = 0; i < ATTEMPTS; i++) { System.out.print(i + " "); doAttempt(); } System.out.println(); - - CHOOSER = null; } System.out.println("Removing " + FILES + " files"); @@ -94,7 +93,7 @@ getTempFile(i).delete(); } - System.out.println( "Test passed successfully" ); + System.out.println("Test passed successfully"); } private static File getTempFile(int i) { @@ -104,48 +103,55 @@ private static void doAttempt() throws Exception { SwingUtilities.invokeAndWait(new Runnable() { public void run() { - if ( ALWAYS_NEW_INSTANCE || ( CHOOSER == null ) ) - CHOOSER = new JFileChooser(tmpDir); + final JFileChooser chooser = new JFileChooser(tmpDir); + + chooser.updateUI(); - if ( UPDATE_UI_EACH_INTERVAL ) - CHOOSER.updateUI(); + // Postpone JFileChooser closing until it becomes visible + chooser.addHierarchyListener(new HierarchyListener() { + @Override + public void hierarchyChanged(HierarchyEvent e) { + if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0) { + if (chooser.isShowing()) { + Thread thread = new Thread(new Runnable() { + public void run() { + try { + Thread.sleep(INTERVAL); - if ( AUTO_CLOSE_DIALOG ) { - Thread t = new Thread( new TwentyThousandTest( CHOOSER ) ); - t.start(); - CHOOSER.showOpenDialog( null ); - } else { - CHOOSER.showOpenDialog( null ); - } + // Close JFileChooser + SwingUtilities.invokeLater(new Runnable() { + public void run() { + chooser.cancelSelection(); + } + }); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + }); + + thread.start(); + } + } + } + }); + + chooser.showOpenDialog(null); } }); - // Allow to collect garbage by GC - Thread.sleep(1000); - - System.gc(); - } - - private final JFileChooser chooser; - - TwentyThousandTest( JFileChooser chooser ) { - this.chooser = chooser; - } + DisposerRecord disposerRecord = new DisposerRecord() { + public void dispose() { + disposerComplete = true; + } + }; - public void run() { - while ( !this.chooser.isShowing() ) { - try { - Thread.sleep( 30 ); - } catch ( InterruptedException exception ) { - exception.printStackTrace(); - } + disposerComplete = false; + + Disposer.addRecord(new Object(), disposerRecord); + + while (!disposerComplete) { + Util.generateOOME(); } - Timer timer = new Timer( INTERVAL, this ); - timer.setRepeats( false ); - timer.start(); - } - - public void actionPerformed( ActionEvent event ) { - this.chooser.cancelSelection(); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JOptionPane/7138665/bug7138665.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + @bug 7138665 + @summary JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7 + @author Pavel Porvatov +*/ + +import sun.awt.SunToolkit; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.KeyEvent; + +public class bug7138665 { + public static void main(String[] args) throws Exception { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + JOptionPane pane = new JOptionPane("Enter value", JOptionPane.QUESTION_MESSAGE, + JOptionPane.OK_CANCEL_OPTION, null, null, null); + pane.setWantsInput(true); + + JDialog dialog = pane.createDialog(null, "My Dialog"); + dialog.setVisible(true); + + Object result = pane.getValue(); + + if (result == null || ((Integer) result).intValue() != JOptionPane.OK_OPTION) { + throw new RuntimeException("Invalid result: " + result); + } + + System.out.println("Test bug7138665 passed"); + } + }); + + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + + toolkit.realSync(); + + Robot robot = new Robot(); + + robot.setAutoDelay(100); + robot.keyPress(KeyEvent.VK_ENTER); + robot.keyRelease(KeyEvent.VK_ENTER); + + toolkit.realSync(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JProgressBar/7141573/bug7141573.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + @bug 7141573 + @summary JProgressBar resize exception, if setStringPainted in Windows LAF + @author Pavel Porvatov +*/ + +import javax.swing.*; +import java.awt.image.BufferedImage; + +public class bug7141573 { + public static void main(String[] args) throws Exception { + try { + UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); + } catch (Exception e) { + System.out.println("WindowsLookAndFeel is not supported. The test bug7141573 is skipped."); + + return; + } + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + BufferedImage image = new BufferedImage(200, 200, BufferedImage.TYPE_INT_ARGB); + + JProgressBar bar = new JProgressBar(); + + bar.setStringPainted(true); + + bar.setSize(100, 1); + bar.paint(image.getGraphics()); + + bar.setSize(1, 100); + bar.paint(image.getGraphics()); + + System.out.println("The test bug7141573 is passed."); + } + }); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JTree/4314199/bug4314199.html Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,8 @@ +<html> +<body> +Select the last tree node (marked "Here") and click on the menu. +Look at the vertical line connecting nodes "Bug" and "Here". If +this line disappears when the menu drops down, test fails. +<applet code="bug4314199.class" width=200 height=200></applet> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JTree/4314199/bug4314199.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * @test + * @bug 4314199 + * @summary Tests that JTree repaints correctly in a container with a JMenu + * @author Peter Zhelezniakov + * @run applet/manual=yesno bug4314199.html + */ + +import javax.swing.*; +import javax.swing.tree.*; + +public class bug4314199 extends JApplet { + + public void init() { + + try { + UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); + SwingUtilities.invokeAndWait(new Runnable() { + + public void run() { + createAndShowGUI(); + } + }); + } catch (final Exception e) { + SwingUtilities.invokeLater(new Runnable() { + + public void run() { + createAndShowMessage("Test fails because of exception: " + + e.getMessage()); + } + }); + } + + } + + private void createAndShowMessage(String message) { + getContentPane().add(new JLabel(message)); + } + + private void createAndShowGUI() { + JMenuBar mb = new JMenuBar(); + + // needed to exactly align left edge of menu and angled line of tree + mb.add(Box.createHorizontalStrut(27)); + + JMenu mn = new JMenu("Menu"); + JMenuItem mi = new JMenuItem("MenuItem"); + mn.add(mi); + mb.add(mn); + setJMenuBar(mb); + + DefaultMutableTreeNode n1 = new DefaultMutableTreeNode("Root"); + DefaultMutableTreeNode n2 = new DefaultMutableTreeNode("Duke"); + n1.add(n2); + DefaultMutableTreeNode n3 = new DefaultMutableTreeNode("Bug"); + n2.add(n3); + n3.add(new DefaultMutableTreeNode("Blah")); + n3.add(new DefaultMutableTreeNode("Blah")); + n3.add(new DefaultMutableTreeNode("Blah")); + DefaultMutableTreeNode n4 = new DefaultMutableTreeNode("Here"); + n2.add(n4); + + JTree tree = new JTree(new DefaultTreeModel(n1)); + tree.putClientProperty("JTree.lineStyle", "Angled"); + tree.expandPath(new TreePath(new Object[]{n1, n2, n3})); + setContentPane(tree); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + @bug 7142955 + @summary DefaultTreeCellRenderer doesn't honor 'Tree.rendererFillBackground' LAF property + @author Pavel Porvatov +*/ + +import javax.swing.*; +import javax.swing.tree.DefaultTreeCellRenderer; +import java.awt.*; +import java.awt.image.BufferedImage; + +public class bug7142955 { + private static final Color TEST_COLOR = Color.RED; + + public static void main(String[] args) throws Exception { + UIManager.put("Tree.rendererFillBackground", Boolean.FALSE); + UIManager.put("Tree.textBackground", TEST_COLOR); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + int w = 200; + int h = 100; + + BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB); + + Graphics g = image.getGraphics(); + + g.setColor(Color.WHITE); + g.fillRect(0, 0, image.getWidth(), image.getHeight()); + + DefaultTreeCellRenderer renderer = new DefaultTreeCellRenderer(); + + renderer.setSize(w, h); + renderer.paint(g); + + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) { + if (image.getRGB(x, y) == TEST_COLOR.getRGB()) { + throw new RuntimeException("Test bug7142955 failed"); + } + } + } + + System.out.println("Test bug7142955 passed."); + } + }); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sun/net/www/protocol/http/NoCache.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 7133367 + * @summary ResponseCache.put should not be called when setUseCaches(false) + */ + +import java.net.*; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; + +public class NoCache +{ + public static void main(String[] args) throws IOException { + ResponseCache.setDefault(new ThrowingCache()); + + HttpServer server = startHttpServer(); + try { + URL url = new URL("http://" + InetAddress.getLocalHost().getHostAddress() + + ":" + server.getAddress().getPort() + "/NoCache/"); + URLConnection uc = url.openConnection(); + uc.setUseCaches(false); + uc.getInputStream().close(); + } finally { + server.stop(0); + // clear the system-wide cache handler, samevm/agentvm mode + ResponseCache.setDefault(null); + } + } + + static class ThrowingCache extends ResponseCache { + @Override + public CacheResponse get(URI uri, String rqstMethod, + Map<String,List<String>> rqstHeaders) { + throw new RuntimeException("ResponseCache.get should not be called"); + } + + @Override + public CacheRequest put(URI uri, URLConnection conn) { + throw new RuntimeException("ResponseCache.put should not be called"); + } + } + + // HTTP Server + static HttpServer startHttpServer() throws IOException { + HttpServer httpServer = HttpServer.create(new InetSocketAddress(0), 0); + httpServer.createContext("/NoCache/", new SimpleHandler()); + httpServer.start(); + return httpServer; + } + + static class SimpleHandler implements HttpHandler { + @Override + public void handle(HttpExchange t) throws IOException { + t.sendResponseHeaders(200, -1); + t.close(); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sun/security/krb5/auto/EmptyPassword.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 6879540 + * @summary enable empty password for kerberos 5 + * @compile -XDignore.symbol.file EmptyPassword.java + * @run main/othervm EmptyPassword + */ + +public class EmptyPassword { + + public static void main(String[] args) + throws Exception { + + OneKDC kdc = new OneKDC("aes128-cts"); + kdc.addPrincipal("empty", "".toCharArray()); + + Context c = Context.fromUserPass("empty", "".toCharArray(), false); + c.status(); + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sun/security/pkcs12/Bug6415637.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,313 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 6415637 + * @summary Support PKCS#12 key stores protected with an empty password + */ + +import java.io.ByteArrayInputStream; +import java.math.BigInteger; +import java.security.KeyStore; +import java.security.cert.X509Certificate; +import java.security.interfaces.RSAPrivateCrtKey; + +public class Bug6415637 { + + public static void main(String[] args) throws Exception { + check(WITH_NULL); + check(WITHOUT_NULL); + } + + private static void check(String encodedBlob) throws Exception { + byte[] blob = new byte[encodedBlob.length() * 2]; + for (int i = 0; i < blob.length; ) { + final char ch = encodedBlob.charAt(i / 2); + blob[i++] = (byte) (ch >> 8); + blob[i++] = (byte) ch; + } + KeyStore store = KeyStore.getInstance("PKCS12"); + store.load(new ByteArrayInputStream(blob), new char[0]); + if (!store.aliases().nextElement().equals("test")) + throw new Exception("test alias not found"); + KeyStore.PrivateKeyEntry e = + (KeyStore.PrivateKeyEntry) store.getEntry("test", + new KeyStore.PasswordProtection(new char[0])); + X509Certificate cert = (X509Certificate) e.getCertificateChain()[0]; + if (!cert.getSubjectDN().toString().equals("CN=Test Key")) + throw new Exception("invalid certificate subject DN"); + RSAPrivateCrtKey key = (RSAPrivateCrtKey) e.getPrivateKey(); + if (!key.getPublicExponent().equals(BigInteger.valueOf(65537))) + throw new Exception("invalid public exponent"); + } + + private static final String WITH_NULL = + "\u3082\u097c\u0201\u0330\u8209\u3606\u092a\u8648\u86f7\u0d01" + + "\u0701\ua082\u0927\u0482\u0923\u3082\u091f\u3082\u0564\u0609" + + "\u2a86\u4886\uf70d\u0107\u01a0\u8205\u5504\u8205\u5130\u8205" + + "\u4d30\u8205\u4906\u0b2a\u8648\u86f7\u0d01\u0c0a\u0102\ua082" + + "\u04fa\u3082\u04f6\u3028\u060a\u2a86\u4886\uf70d\u010c\u0103" + + "\u301a\u0414\u8317\ucfd6\u89ab\uc03b\u79d6\u4c45\u1b10\uc3bd" + + "\u3923\ub806\u0202\u0400\u0482\u04c8\ud51d\uf953\ud79e\u92c6" + + "\u83c0\u92dc\ucd05\u69ab\ucc1b\ud538\u2ed9\u7796\ua426\uc14e" + + "\udcbf\ue541\u40be\ud264\u3b5b\uf51f\u8e1a\u892f\u2813\ucdd6" + + "\uf72e\uef55\u35ef\u4620\ude18\ued5e\ufae0\ubed4\uf84e\u276b" + + "\u3596\uc33f\ub251\ue617\u6e00\ua80f\u6c82\u4acd\u7303\u26be" + + "\uffb5\u1e49\u5fb1\uf87c\ua873\ue60a\u7415\u655c\u39f1\ucf16" + + "\u8f5c\u85c6\u4100\u4130\u565b\u649a\u60d6\u6054\u868d\u7267" + + "\u97a8\u8492\uc5a0\udb5e\u2880\udf55\ub0ee\ua641\u8224\u76d2" + + "\u9b1e\u2a67\u1e32\ue1fc\u0a77\u435b\u669f\ued00\u6c30\u963f" + + "\u7ee3\uc5c8\u198f\u8ede\u30e1\u015d\u1195\uc850\u3371\ub9e5" + + "\u6968\u84c3\ub0e4\u22b7\u2a08\u4a9d\u9166\ua9ba\ud945\u0529" + + "\ue1e7\u8aba\ub4ef\u7445\udc9a\ucf73\ud77b\ufafe\ue1df\u3180" + + "\u9585\ued73\uca40\u06b0\ufdee\u95ba\u1aa3\ubd67\ua5c1\u84b4" + + "\u4b50\uc1e1\u4547\ud837\u21bc\uac0d\u0a65\uebb5\u7281\ud9bc" + + "\u2e2c\ua9bc\u7714\u0fc0\uab41\uce09\ud5e8\u5f8c\uc35d\uba6e" + + "\u98a2\u95c3\u87ff\uba8c\u056a\udc9f\uf254\u3d38\uf40a\u77dd" + + "\u4e30\u01de\ubef7\ud288\ue59c\ua143\ub30b\ud0ae\u63b9\u138b" + + "\uc793\u3474\u18ca\udeed\u78d9\u2ae8\u63cc\ua5d1\u6779\u0229" + + "\u7b72\ucfd4\ueecb\ue167\u08c0\u7556\u181d\u8d62\uc401\ub092" + + "\u8cf5\ued71\uf29f\u843e\u13e1\u7e7b\uf589\u0329\u92bd\ud0e3" + + "\u8dcc\u7541\uf195\ueef2\u3f3a\ueb01\uf5b0\u1869\u2216\uf351" + + "\u488d\udffb\u6243\u1121\u9447\u8a3a\u006f\u008c\ue2b3\ued31" + + "\u7f57\u6492\ue02f\u6f68\u387d\u58c0\uaadf\u2ee3\uf304\u3de9" + + "\u9741\u47fa\udde8\ufe8a\u679a\u597d\u8c7c\u9c71\u570e\u1dbd" + + "\ud555\ue853\uff63\u0fcb\u4b28\u3691\u33c8\uc31f\uc510\u6cba" + + "\ud92c\u6462\u733a\u739e\uc792\ud861\u743e\u3bd3\u006b\u2276" + + "\u9fb3\u0a31\u1eb3\ub97e\u4a80\uc076\uaabc\u35a0\u678d\u17c3" + + "\ua225\ua77c\u7d9c\uef2d\u83e2\u6996\uba70\uf6f8\u79a1\u9399" + + "\uc86b\u1cc5\ub2a5\u02c1\ud676\ua274\u4933\u6c60\u6832\ub0be" + + "\u5354\u5af9\uae23\u0963\u722d\u9ad2\u4461\ub768\u2068\u0ccb" + + "\u94fd\u88ac\u0f58\u3bc0\u212d\u30c8\u8860\uf7c9\u1dde\ub6b4" + + "\u3549\u5bcd\ucf83\u9420\u3a40\u16ad\uc4d7\ucd87\ue73a\ue1c7" + + "\u21df\u7f4f\u8659\u9f79\u5b36\uf206\uac66\uc9f3\u6336\u164d" + + "\u9046\uf4d5\u285d\ufcd8\ubd55\u1fb9\ua533\u9101\u1e87\uc7b0" + + "\u64e9\u3817\u216c\u8d41\uba51\u743a\uc74e\ue4ab\u2820\u972f" + + "\ue191\u85b4\u0ea7\ud896\u23cf\u7df5\u1653\ua9f3\ub724\ucbc9" + + "\u9738\ud2f8\u464e\ucf12\u99b8\u64e0\uf03b\u8d02\u85a8\uab52" + + "\u8da3\uea34\ube99\ue5f8\u2b38\ub082\u399d\ue61e\u64a1\u7f90" + + "\u26e9\ueb74\u6107\ufe2f\u82ca\u87a5\u3028\u8e1f\ue859\u61d4" + + "\ud26d\u23a9\uaadc\u02a7\u8ab2\u43d4\uf6b9\udf7a\u8935\u45a4" + + "\ufad6\ue7e4\u92b7\u35d7\u1044\u8ed3\u74ef\uaaa9\u713f\u6ebc" + + "\u1158\u5e5c\u7522\ufe17\ua515\u59a1\u75dd\ue7ac\uafd9\u16a9" + + "\u190e\u18fc\uc041\ufc9e\u3e16\u60c4\ufe51\u6d53\ufa52\u4c08" + + "\uce2a\ue546\u017b\ud96b\ube18\u8cb9\udd50\ued40\u14b0\u7da1" + + "\u2f2c\ubf9d\uc7c7\u1b73\ua155\ucaf8\ue54d\uebb0\u160a\ubd64" + + "\u5ef7\ue1cf\u4633\u86c1\ubc91\u839d\ub148\u9f31\uf2b1\ud133" + + "\u168f\u9374\u4667\u6aa9\u0482\ua2a6\ub5c0\ud9b7\ua070\uf6bd" + + "\u16fe\u0f41\u986b\u3d33\u7cb9\u291d\u24f0\u704a\uc946\u10a2" + + "\udbcf\u6c5f\u5a83\u5507\u036e\ube9f\uf60a\u9da8\u72dd\u23c9" + + "\u8878\udd67\uf486\u1384\u751f\u4694\uee3c\udc2e\ud5d7\ud99a" + + "\u5ee2\u5455\ub82d\u1837\u336d\u5724\u635b\ubd0b\u2e7c\u92be" + + "\u2110\u9c0e\u1662\u43f6\u62ae\u32e3\uaea4\u1cc5\uadc0\u7511" + + "\u6ad4\u0228\ue399\u5741\u2050\ue31a\u7dc8\uf6db\u67bb\u994a" + + "\u5b5a\uaac6\u2210\u95b0\u462e\u0684\u335e\uac36\u7ab9\uab1e" + + "\u0b75\u0f05\u74c5\ufcb3\ua0a5\ube7e\u45f8\u92d5\u3399\u7dd6" + + "\uf96e\u7e01\u7823\u6690\u231c\u4c47\u2d10\u7e7f\u5eb8\u70dd" + + "\u98d2\u6204\u3a92\u3990\u502b\u7cdb\u952a\ufa97\uea3b\ud990" + + "\u436f\uf33a\u070d\u2aff\u7497\u2591\u37e4\ua590\ue7ba\u2c1e" + + "\u53d9\u73fa\udc53\u944f\ua3a5\u5093\u33a4\uf080\u1193\u37f2" + + "\u7642\ub033\u7f90\u9b44\uff89\ue6ef\u81be\u9e6e\u68a4\u5a00" + + "\u9232\u4372\u40aa\u2748\u229d\u534d\u316b\u6e89\ufcb7\uff2e" + + "\ub654\u1649\ucb13\u3c28\u4940\u43aa\uc07d\u247c\u313c\u3017" + + "\u0609\u2a86\u4886\uf70d\u0109\u1431\u0a1e\u0800\u7400\u6500" + + "\u7300\u7430\u2106\u092a\u8648\u86f7\u0d01\u0915\u3114\u0412" + + "\u5469\u6d65\u2031\u3330\u3833\u3132\u3234\u3236\u3437\u3082" + + "\u03b3\u0609\u2a86\u4886\uf70d\u0107\u06a0\u8203\ua430\u8203" + + "\ua002\u0100\u3082\u0399\u0609\u2a86\u4886\uf70d\u0107\u0130" + + "\u2806\u0a2a\u8648\u86f7\u0d01\u0c01\u0630\u1a04\u14de\ud8d8" + + "\ua792\uf9d9\u6875\ua51d\u98ec\udf03\uc2b6\u5100\u8a02\u0204" + + "\u0080\u8203\u6074\ub909\u3c60\ua522\ue4ac\u0f60\u2396\u7baa" + + "\ud208\ub76c\u89a5\ue4ef\u205d\u2062\u4a5b\ua684\uceae\u01b9" + + "\u1e7a\u6e03\ud996\u555a\u615b\uba70\u406f\u80a9\u901e\ua947" + + "\u5b8f\u73f3\udea3\ud8b1\u9782\uac87\u231a\udcd2\u3ef0\u3a17" + + "\u4092\u509f\u0e79\u4cd7\u8516\u5111\uebe1\u86e0\uc548\u5ffc" + + "\u9a99\u11ed\uef13\u17af\u2707\u8984\u8770\u7064\u1943\u1dd3" + + "\u45cf\u9f80\u65f8\u9b3e\u1f70\u6bd0\uc726\u5506\ufb20\u6bdc" + + "\uba8c\u0b19\ucd01\ud0f0\u7040\udf63\u48a5\udf5f\u6559\u1b33" + + "\ubdae\u8183\uc13f\ued10\ud6dc\ud0f0\u6a7f\ubc36\uc7ca\u320f" + + "\u50b8\ud422\ufd99\u8843\u65e8\ue201\u843b\u64ee\ub891\u3ba2" + + "\uecae\ufda0\u72d6\u8394\u2551\ufc44\u3778\u27c3\u061a\u6d3b" + + "\ubd80\ue010\u06df\u39e7\u3d6a\u5ae2\u93fa\u4de4\u938f\u6f27" + + "\ufd39\u4380\u60da\uf215\u79d4\uf6f1\ua02f\u959a\ua0ea\u1c38" + + "\u80e3\u2744\u7506\u54b3\u77ad\u18ce\ucfec\u555e\u7bbe\u2e2f" + + "\u9900\ub2ef\ua5b9\ubdf0\u5e15\ua681\u92c7\u4f86\u2e1a\ub893" + + "\u01fc\u01d2\ub674\uff19\u04c3\ua1a0\u2cea\u72e0\ua8f1\u1358" + + "\ube79\u7caa\u269d\u728a\ue435\u37bd\u6495\uc106\u8830\u9b17" + + "\ue16d\uef78\uae2b\u5313\u1c96\uc0ee\u3098\ud743\ucd1c\u7407" + + "\uf4f9\uee72\ub95e\u31e7\u6435\u0173\u0336\u93c5\u8a1b\u05b4" + + "\u4359\uc4be\ud92b\u8d21\u83a9\u32b7\u6433\ua9bc\u27c2\ud842" + + "\ua4f2\u81c5\ua86c\u2fd2\uba30\u53bd\uc277\u659f\u203b\u60e5" + + "\u37f7\u0984\u31c2\u838a\u2107\u5840\u6411\u1b8d\u044e\ub0b6" + + "\uf558\ue6d3\u62bb\u5464\uf83a\u4d5b\uf153\u9e18\ua353\ubd05" + + "\uf204\ud543\u037d\ue5aa\u473a\ueb13\uac19\u0494\ua08e\u76c3" + + "\ufbd7\u9f1c\u8ca9\u57ad\ud218\uc018\u67ac\u0ae9\ub559\ufe38" + + "\u5641\uec0c\ue0ee\u606c\u1989\ue5a2\uff09\u8c61\u1386\ueb51" + + "\u7cbd\u95cd\u80c5\u3532\u8605\u596d\u4cfd\u7797\u1e82\ud2fe" + + "\uad6b\ua16e\ub6cf\u8fce\ud5a9\u207f\u1d0a\udabe\uc3a6\u5633" + + "\u2023\u925f\u809f\uee7c\u5362\u5fd9\u8dfc\u6b5f\uc95b\u0ae9" + + "\u7b26\u9e5b\u97e8\u9d6e\uaf91\u6d1a\u1d19\ufc27\u0815\uccbc" + + "\u83d4\u2ce2\ue06e\u21a1\u88da\u09af\u9671\uc510\uac23\u398d" + + "\ubea2\ua9a1\uf0d3\u490d\ub94b\u7ff7\u6636\ub1fa\u9b10\u1be3" + + "\u179b\u6a8a\u4a6c\ude1f\u5da7\u7c02\u96ec\u70ac\u5045\udd2c" + + "\u9f6d\uc37d\u5ba6\u4895\ue142\u0db9\uf2dc\uba2e\ud054\ud33e" + + "\u1ed9\u144b\u5d85\u9156\u3a90\ue8cd\u0a01\u67f5\ua81b\u4f56" + + "\u99dd\u4950\ua551\uacdb\udf31\u1f05\u7169\u3231\u0071\u80ec" + + "\ua4e9\ud74e\u62cf\u8931\u11f1\uc925\u0319\uabd4\ufb86\u73c2" + + "\u1479\u005b\uf05d\u4f8d\u44e4\u942b\ud338\ud05d\u2b3b\uf6f5" + + "\udc0d\uf741\u798b\ud8e9\u36a5\u577b\u8a95\ud773\uffcb\u17b3" + + "\u7174\u9616\u9b5e\ua577\u983c\u6e7a\u6cc8\u4a04\u042b\u503e" + + "\ud744\ub65e\ue5de\ufa24\u8c71\u1127\ud47f\ud290\ufd4c\u5cbb" + + "\u0e21\u77fd\u6553\ub82b\ucb49\u41e7\u8e3d\u4539\u925d\u6ba9" + + "\uae47\u391c\ua79e\ub6e2\u7142\u7cb3\u02f5\u6495\u7a85\u2dea" + + "\u787b\u22b7\u6ec2\uea8d\uf930\u3d30\u2130\u0906\u052b\u0e03" + + "\u021a\u0500\u0414\ubfef\u99f5\u0bb0\uc9b3\uf96a\ue267\u6bc0" + + "\u0202\u6d78\ub923\u0414\u5500\u095a\u2a04\u2d7e\u708d\u9779" + + "\u9bdb\u2c4f\u82f2\uf89f\u0202\u0400"; + + private static final String WITHOUT_NULL = + "\u3082\u097c\u0201\u0330\u8209\u3606\u092a\u8648\u86f7\u0d01" + + "\u0701\ua082\u0927\u0482\u0923\u3082\u091f\u3082\u0564\u0609" + + "\u2a86\u4886\uf70d\u0107\u01a0\u8205\u5504\u8205\u5130\u8205" + + "\u4d30\u8205\u4906\u0b2a\u8648\u86f7\u0d01\u0c0a\u0102\ua082" + + "\u04fa\u3082\u04f6\u3028\u060a\u2a86\u4886\uf70d\u010c\u0103" + + "\u301a\u0414\ud258\ubbe7\ub641\ud196\u4969\u3c88\u70f1\u8c97" + + "\u95b1\u8bf3\u0202\u0400\u0482\u04c8\u096a\u4686\uf519\u61da" + + "\u1b3b\uebfd\u89b1\u044b\u3bd8\u79a7\ud022\ud880\ud173\ucde1" + + "\ud2c1\u2c5d\u8ebb\u6bd4\u46db\ub90b\u04b9\ub091\ud1f3\ud468" + + "\u3e93\u2c88\uca5a\u1c54\u5342\u1eca\u8565\ubbbd\ua022\u1ead" + + "\ud0bb\u1a8c\u69cf\uf0f4\ucbfb\u488a\ube99\uf190\ue01c\ud87d" + + "\u78ca\u9e5c\u82f9\u76ad\u811f\u37d0\u272b\u0481\u500c\u0a27" + + "\u08d3\ub637\u3e39\u6db1\ubcba\ue354\u6924\ua9d5\u3555\u20d6" + + "\u4c6b\u3189\u5f91\u382c\uf351\u4de2\ubade\u2a14\uea84\u16b6" + + "\uf7f7\u36de\ubba6\ue952\u5f5d\u8243\u2318\ucf3d\u8ac8\u33d3" + + "\u706c\ue3db\u6619\u7935\u7300\u89b3\u0bcd\uca9f\u0333\ua450" + + "\u1be1\u3e42\ub465\uced5\ub055\u5843\uf40f\ua0f2\u6fea\u94fa" + + "\ua51e\u4b5d\u93c9\ucb2e\u977e\uafd9\u2a2f\u784b\u0320\u5550" + + "\u273f\u469f\uc42b\u2ce7\uedea\u4e0d\u54a5\u1a25\u4fac\ue346" + + "\u2102\u7ab6\uea86\u554f\u7706\u8a80\uf6dd\u04f8\u3b37\u005a" + + "\u4562\u2ef8\u59f9\u32b7\u31c0\ue7dc\ucbde\ue0e1\u2fd9\u0960" + + "\u3e7a\ub4e5\u2a58\u1e2b\uef14\u9a44\u5444\u806d\uc475\u12ab" + + "\ucc3d\ua03b\ubd52\ubf1c\ua9a6\u58aa\uee8b\u96c2\ud0c9\ua029" + + "\u1db4\ub118\u4807\uecaa\ue182\uabb7\ud9ed\u66c5\u2c80\uc6a6" + + "\u3f54\ubc73\u2632\ue1b0\u0d74\u001c\u5740\uc74b\ufadb\u25b4" + + "\ua10e\u3191\u69e6\u0861\u452b\u955c\uac56\ud3c4\u86b7\u45f8" + + "\u777a\uc336\u8cc7\ud471\u76b6\u11d8\ueb84\u14e4\uf44f\uc9ff" + + "\u8929\u0d84\ubcfe\u8cc2\u9d07\u94e6\u1cf9\u19b5\u773a\u012d" + + "\u0453\u4ff3\u40f2\ub144\ufc80\u571c\u0e13\uf890\u9fed\u2045" + + "\u7baf\ufd88\u4920\u2b86\u491d\uecf8\ua5d9\u1e12\u48c7\u2c84" + + "\u3fbe\u4df5\u11ce\u7b81\u83fc\u3efa\u697d\u1f3d\u8d81\u01b0" + + "\u0bf1\u9012\u697f\u3b25\u3574\u5286\udded\u5be0\u7e92\u0a02" + + "\ua486\ud19b\ue0b5\ua05c\u5ac2\u0ad5\u0d04\ua763\ub5c8\uf7e6" + + "\u6e77\u2df3\ub9e7\uda30\ufccb\u7642\u5dc1\udf1f\uc922\uff69" + + "\u4471\u4749\u937a\ud77d\u7c0d\u917c\uf2ef\u122c\u13b2\u8943" + + "\u33aa\uad59\u86e8\u21c4\ueaa0\uf200\ue5f3\u6da0\ue8ef\uce7e" + + "\u37b2\u3ddf\u0480\u08fc\uf89a\ud927\u3f5b\u75d3\ubdfe\u6ebd" + + "\ufab1\u9f54\u1c20\u625b\u1391\u2af0\u43ba\u4395\udf22\u299e" + + "\uf3bf\u7750\u5f68\u0120\u0ee0\u6960\ud939\u621f\uf845\u0025" + + "\ue33c\u7ed9\ueadf\u0005\u6306\u7274\u5e67\ucf7a\uf3c6\u7371" + + "\u487b\u79d7\u2142\ubc1a\ubfe4\u3536\u15db\ufe23\u4352\u6321" + + "\u329d\uc251\u84c8\ufc0e\uc0ca\u5be6\uf530\u0177\ud9cb\ud132" + + "\uf752\u3f26\uda90\ud9cf\u2e46\u3e09\u5d9a\u6902\udb3e\ub06c" + + "\u722d\uf498\u3e93\u6cae\u43b5\u535a\u1cd1\uf0b2\u8d80\u9e53" + + "\ue02e\uf782\u01ce\u5063\u73d1\u5571\uf0e7\ufa22\u7e48\u0c31" + + "\u4642\u29fd\udcab\ue8d4\u7a77\u0880\u4855\u88c7\u7aa5\u0d9c" + + "\uf8b7\uc91c\u127d\u2dd7\ude53\u9d3f\u132b\u965c\ubc80\udd97" + + "\u87bf\ua0e8\ub2a2\u4e1f\u98fd\u72f3\u16ea\uc415\u5be3\ue8df" + + "\u5681\u1f11\u4e3a\uac5d\u1684\u6602\ueb14\u0a96\ufcef\uaebf" + + "\u1f2e\ud1a9\u435c\uf4e5\ub6b4\uaae2\u8244\u96a4\u0d3a\u752f" + + "\uce21\u1bc9\u219e\uf17b\ud95e\ucd12\u1b0a\ucb85\ub0cd\u4ecb" + + "\u6bb4\u5f7c\u2a93\ubb24\u9d7c\u6822\u80cd\u3f54\u78ad\u4fde" + + "\ud57f\uec1d\ub54c\u0d78\u5946\u84c1\ua9ad\u0dea\u0292\ub279" + + "\u1c76\u817e\ub910\ub1fa\ub1c0\u839d\u9eca\u6f83\u8211\u4112" + + "\u440c\u4fbd\u6ef2\u897d\udfa9\ude9e\u1aef\u0f21\u26fb\uaca4" + + "\u637e\ub072\u264f\ud24d\u9357\uc801\u0b84\u2d34\ueddf\u6063" + + "\udc5d\u90dd\u5c62\ufb48\u8c5e\u7c4e\u3bdb\ub590\u7a75\udbd1" + + "\udd78\uc8be\u5915\u7c8b\u8874\u578d\u3116\ub65a\uab8e\ud2ef" + + "\u5d35\ubf8b\u2828\u8983\ua790\uedcf\u9698\ue023\u5786\u627b" + + "\u9037\u1db7\u900e\u1f45\u0001\u7cf8\u14fd\ue437\u0dfd\ucacc" + + "\u5edf\u1742\u7f6e\u612a\ud57d\udca0\u73a4\ud601\uc7f0\uca0e" + + "\u5a44\u00b4\u233a\u84f2\u95b5\u5f16\uc291\u04fb\u369d\u6b99" + + "\ue127\u493f\u66be\u86e9\u9672\u2849\u64a7\u851b\ue420\u8491" + + "\ueb07\u6563\uc753\uc28e\ucad5\uec05\u6920\u8955\u5605\u25f6" + + "\u6193\ubee5\u7a1a\ub73d\ucc27\uc8ce\u7179\u57c1\u7a2a\u37c1" + + "\ua6c7\u2d8a\u4025\uc97d\u8c9d\u7b4b\u1ad5\uc6d7\u50fc\u246d" + + "\u91a9\ua55d\u677a\udc83\u04c7\u3e14\u9950\u420c\udf02\u749b" + + "\ude88\u5459\u2074\ua4ae\ud12d\uaf60\uba98\u630d\u313c\u3017" + + "\u0609\u2a86\u4886\uf70d\u0109\u1431\u0a1e\u0800\u7400\u6500" + + "\u7300\u7430\u2106\u092a\u8648\u86f7\u0d01\u0915\u3114\u0412" + + "\u5469\u6d65\u2031\u3330\u3833\u3132\u3431\u3138\u3238\u3082" + + "\u03b3\u0609\u2a86\u4886\uf70d\u0107\u06a0\u8203\ua430\u8203" + + "\ua002\u0100\u3082\u0399\u0609\u2a86\u4886\uf70d\u0107\u0130" + + "\u2806\u0a2a\u8648\u86f7\u0d01\u0c01\u0630\u1a04\u14af\ud4f5" + + "\u0ff4\u0ede\u0da0\u6cc5\ufd9d\u3502\uae5e\u4cef\u3102\u0204" + + "\u0080\u8203\u6028\ua7e6\u088b\u56b6\uf453\u9747\u68ec\uc064" + + "\u2254\u693f\u25c5\uaa39\u3d87\uc97c\uc558\u5194\u7553\ude3a" + + "\u4575\u9d85\ud843\u2bd0\ua2e8\u244f\u8593\uac84\u54b4\ubdc6" + + "\ucea6\uba1a\ud3da\ua510\uee9d\uaf31\ub5c2\u3329\u0fed\u0e08" + + "\u426b\u46fe\udcc5\u0979\ua9ed\u3123\u9a50\ud222\u3fc0\u771a" + + "\u6f55\u9664\ud56f\u6b03\u6020\u78a4\u63b2\ue35e\u0816\u43a7" + + "\u1909\u52e1\u8183\u1b8d\u9f5b\u19e4\uad73\u8461\ucc86\u3b49" + + "\u322e\ue9d9\u3c66\uea22\u091e\u6621\ua8bf\u0169\u72d0\u535e" + + "\u77dc\u1002\ubded\u7a91\u6cee\u58fa\uc295\uae8e\ue009\uabe9" + + "\u6638\ucaea\u8bbf\uca27\udef5\u2881\u72ec\u8aa5\u582b\u9d6e" + + "\u26bb\u3c70\u8bd6\uf5ec\u34ae\ua967\u5bb1\u22cb\u4b74\u0e50" + + "\u5062\uc6f7\u7cb4\u58a3\uf43d\u57c0\u9654\u2f9c\u9308\u4546" + + "\u6f4a\u37fe\u8d5d\u1465\u8621\u4cd8\u68d6\u0456\u96a4\ud3e2" + + "\u76d1\u2675\u7654\u7649\u10e9\u9d0e\u8b04\uffb6\u020a\u2eb4" + + "\uf24f\u150e\u7f0d\uf41b\u2c76\u538f\uc2df\u79dc\u0472\u1119" + + "\uc148\ue2e8\u1820\ucd45\u08a7\u6bcd\u6eb0\ubd0a\ufff4\uec28" + + "\u819b\u2adb\uefc8\ue8f7\ue233\u6535\uc938\u9771\u3681\u87cf" + + "\u3a24\u4c71\ue1df\u3e19\u259c\uae5b\u27ed\u8a67\uf3e6\u7af0" + + "\u48e1\uc542\uc471\ud8f4\ue317\u46e9\u0b4f\uec45\ua1d3\u2b88" + + "\u8a22\udda1\u7c1a\u273c\ua0f7\u8bac\u3771\u28d2\u6ef8\u28d2" + + "\ud83c\u196f\ue3fd\u9c79\u4305\u01b8\u3490\u0a91\ue4f3\uebc6" + + "\u25a2\u7dd2\u72db\u7531\ucfca\u432f\u2beb\uc649\uf9c5\uc533" + + "\u9f3a\ua611\u935c\ubca6\ud293\u54d6\u0dd1\u0aff\u82fb\u2d69" + + "\u3da0\u3b33\u0986\u45b3\u3353\ub968\u7348\u454f\u9117\ub3dc" + + "\ud7af\u06ca\ua34a\u9357\ue22f\uad3d\u4c76\ub386\ua8d7\u2a90" + + "\u6d17\u9321\u7b00\u21e4\u1994\u9d18\u6439\u04c8\u8282\ub269" + + "\uf786\u75c6\ua505\u983a\ua075\uffa0\ud662\u6ae5\ub126\u96d1" + + "\u9e5e\u346b\ub7ee\ub0a3\u4ee8\ud204\u77ec\u2325\u5da8\ua326" + + "\ua018\u0fd8\ue50e\u93cc\ucc40\u2d89\u2ffb\u54e0\u091a\u19fd" + + "\u45d7\uc0ab\u77a2\u66ae\u794b\u6644\u21c3\ud782\u1e9e\u53e5" + + "\u782e\u55e8\ud44e\u93e8\u379e\u5aa8\u353b\u95de\u7bc1\ucaf3" + + "\u5223\ub5e9\uacbb\ub86b\u6014\u0626\ue7ad\ufd93\ue43a\ud864" + + "\u1e6d\u14b2\ua12a\u94c5\u2ed9\ua7f7\u14f4\u0cbd\uca3b\u7c21" + + "\ua85a\uf834\u6c99\ue1aa\u3832\u2515\u8170\u3c93\u7def\u94fe" + + "\u9c3d\u4ab0\u73ed\u6c72\u8b94\ua407\uc719\uad1e\u6306\u4167" + + "\u921e\uae53\u3fd4\uf569\u6f0b\u82b0\u0ca6\ud61f\ud526\u23c9" + + "\u168d\u4baf\ucc4f\ud8a2\uc64a\ud649\u55e3\u7019\u8f20\u680c" + + "\u5581\u2cb1\ub3a4\u3e37\u5fd3\ua3ca\uc115\u979c\uf910\u3797" + + "\u05cb\u51d6\u74a4\uc5c0\u597b\uf27f\ud5e2\ue8ac\u4f3d\uc0c3" + + "\u9594\u7799\u6876\ub1a3\u059a\uff03\uc2ee\uc8c2\uf224\u3720" + + "\u9177\uabdb\u9202\u18d8\uffbe\u0516\u2a76\uedb5\ufe9e\u6d65" + + "\u4c35\ue4cb\u75aa\u02be\ud24c\ua482\ufc67\ue4f9\u70c7\u3567" + + "\ufc3f\uaa89\ue80a\u6507\u0a65\u4e18\uf919\u071d\u423c\u1756" + + "\u30e5\u37f3\u19b3\u10fb\u6c30\u3d30\u2130\u0906\u052b\u0e03" + + "\u021a\u0500\u0414\ufd05\u4444\ud347\u673c\u6da4\udb7c\u0733" + + "\ud7bf\ud263\uc6b2\u0414\udd17\u155e\u2d4c\u25cb\ua028\u1a23" + + "\ub8b0\uf6be\u925f\ude3a\u0202\u0400"; + +}
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat Feb 18 16:11:47 2012 -0800 @@ -1,7 +1,7 @@ #! /bin/sh # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it
--- a/test/sun/security/tools/jarsigner/ec.sh Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/security/tools/jarsigner/ec.sh Sat Feb 18 16:11:47 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -55,7 +55,8 @@ $KT -alias a -dname CN=a -keyalg ec -genkey -validity 300 || exit 11 $KT -alias b -dname CN=b -keyalg ec -genkey -validity 300 || exit 12 -$KT -alias c -dname CN=c -keyalg ec -genkey -validity 300 || exit 13 +# Ensure that key length is sufficient for the intended hash (SHA512withECDSA) +$KT -alias c -dname CN=c -keyalg ec -genkey -validity 300 -keysize 521 || exit 13 $KT -alias x -dname CN=x -keyalg ec -genkey -validity 300 || exit 14 $JARSIGNER -keystore $KS -storepass changeit $JFILE a -debug -strict || exit 21
--- a/test/sun/tools/jcmd/jcmd-Defaults.sh Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/tools/jcmd/jcmd-Defaults.sh Sat Feb 18 16:11:47 2012 -0800 @@ -28,6 +28,6 @@ JCMD="${TESTJAVA}/bin/jcmd" -${JCMD} 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk +${JCMD} -J-XX:+UsePerfData 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk -${JCMD} -l 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk +${JCMD} -J-XX:+UsePerfData -l 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
--- a/test/sun/tools/jcmd/jcmd-f.sh Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/tools/jcmd/jcmd-f.sh Sat Feb 18 16:11:47 2012 -0800 @@ -46,7 +46,7 @@ # -f <script> rm -f jcmd.out 2>/dev/null -${JCMD} $appJavaPid -f ${TESTSRC}/dcmd-script.txt | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1 +${JCMD} -J-XX:+UsePerfData $appJavaPid -f ${TESTSRC}/dcmd-script.txt | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1 echo jcmd.out diff -w jcmd.out ${TESTSRC}/help_help.out if [ $? != 0 ]; then
--- a/test/sun/tools/jcmd/jcmd-help-help.sh Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/tools/jcmd/jcmd-help-help.sh Sat Feb 18 16:11:47 2012 -0800 @@ -46,7 +46,7 @@ # help help rm -f jcmd.out 2>/dev/null -${JCMD} $appJavaPid help help | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1 +${JCMD} -J-XX:+UsePerfData $appJavaPid help help | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1 echo jcmd.out diff -w jcmd.out ${TESTSRC}/help_help.out if [ $? != 0 ]; then
--- a/test/sun/tools/jcmd/jcmd-help.sh Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/tools/jcmd/jcmd-help.sh Sat Feb 18 16:11:47 2012 -0800 @@ -29,7 +29,7 @@ JCMD="${TESTJAVA}/bin/jcmd" rm -f jcmd.out 2>/dev/null -${JCMD} -h > jcmd.out 2>&1 +${JCMD} -J-XX:+UsePerfData -h > jcmd.out 2>&1 diff -w jcmd.out ${TESTSRC}/usage.out if [ $? != 0 ] @@ -40,7 +40,7 @@ fi rm -f jcmd.out 2>/dev/null -${JCMD} -help > jcmd.out 2>&1 +${JCMD} -J-XX:+UsePerfData -help > jcmd.out 2>&1 diff -w jcmd.out ${TESTSRC}/usage.out if [ $? != 0 ]
--- a/test/sun/tools/jcmd/jcmd-pid.sh Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/tools/jcmd/jcmd-pid.sh Sat Feb 18 16:11:47 2012 -0800 @@ -45,11 +45,11 @@ failed=0 # help command -${JCMD} $appJavaPid help 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output1.awk +${JCMD} -J-XX:+UsePerfData $appJavaPid help 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output1.awk if [ $? != 0 ]; then failed=1; fi # PerfCounter.list option -${JCMD} $appJavaPid PerfCounter.print 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output2.awk +${JCMD} -J-XX:+UsePerfData $appJavaPid PerfCounter.print 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output2.awk if [ $? != 0 ]; then failed=1; fi set -e
--- a/test/sun/tools/jcmd/jcmd_Output1.awk Thu Feb 16 13:01:36 2012 -0800 +++ b/test/sun/tools/jcmd/jcmd_Output1.awk Sat Feb 18 16:11:47 2012 -0800 @@ -1,26 +1,26 @@ # BEGIN { - totallines=0; matched=0 + totallines=0; matched=0; current=0 } # match on a main class name followed by arbitrary arguments /^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\.]*($| .*$)/ { - matched++; + current=1; } # or match on a path name to a jar file followed by arbitraty arguments # - note, jar files ending with ".jar" is only a convention, not a requirement. #Theoretically, any valid file name could occur here. /^[0-9]+ .*\.jar($| .*$)/ { - matched++; + current=1; } # or match on the condition that the class name is not available /^[0-9]+ -- process information unavailable$/ { - matched++; + current=1; } - { totallines++; print $0 } + { totallines++; matched+=current; current=0; print $0 } END { if ((totallines > 0) && (matched == totallines)) {
--- a/test/tools/launcher/Arrrghs.java Thu Feb 16 13:01:36 2012 -0800 +++ b/test/tools/launcher/Arrrghs.java Sat Feb 18 16:11:47 2012 -0800 @@ -24,7 +24,7 @@ /** * @test * @bug 5030233 6214916 6356475 6571029 6684582 6742159 4459600 6758881 6753938 - * 6894719 6968053 7067922 + * 6894719 6968053 * @summary Argument parsing validation. * @compile -XDignore.symbol.file Arrrghs.java * @run main Arrrghs @@ -373,21 +373,6 @@ System.out.println(tr); } - /* - * a missing manifest entry 7067922, we ignore this test for locales - * which are localized, thus the testing is limited to English locales. - */ - static void test7067922() { - if (!isEnglishLocale()) { - return; - } - TestResult tr = null; - createJar("cvf", "missingmainentry.jar", "."); - tr = doExec(javaCmd, "-jar", "missingmainentry.jar"); - tr.contains("no main manifest attribute"); - System.out.println(tr); - } - /** * @param args the command line arguments * @throws java.io.FileNotFoundException @@ -400,7 +385,6 @@ runBasicErrorMessageTests(); runMainMethodTests(); test6894719(); - test7067922(); runDiagOptionTests(); if (testExitValue > 0) { System.out.println("Total of " + testExitValue + " failed");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/launcher/MainClassAttributeTest.java Sat Feb 18 16:11:47 2012 -0800 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 7067922 + * @author sogoel + * @summary Test negative scenarios for main class attribute + * @build MainClassAttributeTest + * @run main MainClassAttributeTest + */ + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/* + * This tests negative scenarios for Main class entry in a jar file. + * An error should be thrown for each of the test cases when such a + * jar is executed. + */ + +public class MainClassAttributeTest extends TestHelper { + + /* + * These tests compare messages which could be localized, therefore + * these tests compare messages only with English locales, and + * for all other locales, the exit values are checked. + */ + static void runTest(File jarFile, String expectedErrorMessage) { + TestResult tr = doExec(TestHelper.javaCmd, + "-jar", jarFile.getAbsolutePath()); + if (isEnglishLocale() && !tr.contains(expectedErrorMessage)) { + System.out.println(tr); + throw new RuntimeException("expected string not found"); + } + if (tr.isOK()) { + System.out.println(tr); + throw new RuntimeException("test exit with status 0"); + } + } + + // Missing manifest entry + static void test1() throws IOException { + File jarFile = new File("missingmainentry.jar"); + createJar("cvf", jarFile.getName(), "."); + runTest(jarFile, "no main manifest attribute"); + } + + // Entry point in manifest file has .class extension + static void test2() throws IOException { + File jarFile = new File("extensionmainentry.jar"); + createJar("Foo.class", jarFile, new File("Foo"), (String[])null); + runTest(jarFile, "Error: Could not find or load main class"); + } + + // Entry point in manifest file is misspelled + static void test3() throws IOException { + File jarFile = new File("misspelledmainentry.jar"); + createJar("FooMIS", jarFile, new File("Foo"), (String[])null); + runTest(jarFile, "Error: Could not find or load main class"); + } + + // Main-Class attribute is misspelled in manifest file + static void test4() throws IOException { + File jarFile = new File("misspelledMainAttribute.jar"); + File manifestFile = new File("manifest.txt"); + List<String> contents = new ArrayList<>(); + contents.add("MainClassName: Foo"); + createFile(manifestFile, contents); + createJar("-cmf", manifestFile.getName(), jarFile.getName()); + runTest(jarFile, "no main manifest attribute"); + } + + public static void main(String[] args) throws IOException { + test1(); + test2(); + test3(); + test4(); + } +}